diff --git a/test/plugin/run.sh b/test/plugin/run.sh index b11fc67d39888bfcc2885723a6e2f9a7ddca7e81..896da3a969bb6caf7bd8c84e11b405ec4adedf4a 100644 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -149,7 +149,7 @@ do cp ./config/expectedData.yaml ${case_work_base}/data # echo "build ${testcase_name}" - ${mvnw} clean package -P${testcase_name} + ${mvnw} clean package -Dtest.framework.version=${version} mv ./target/${scenario_name}.war ${case_work_base} diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml b/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml index 9241d76e8d23060560f21637e17d579c6341f922..7be002d608b64582ac740092e6a3e0e3b0f31129 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/pom.xml @@ -30,7 +30,6 @@ UTF-8 1.8 - Httpclient 4.3 @@ -61,93 +60,6 @@ - - - httpclient-4.3.x-scenario-4.3 - - 4.3 - - - - httpclient-4.3.x-scenario-4.5.3 - - 4.5.3 - - - - httpclient-4.3.x-scenario-4.5.4 - - 4.5.4 - - - - httpclient-4.3.x-scenario-4.5.2 - - 4.5.2 - - - - httpclient-4.3.x-scenario-4.5.1 - - 4.5.1 - - - - httpclient-4.3.x-scenario-4.5 - - 4.5 - - - - httpclient-4.3.x-scenario-4.4.1 - - 4.4.1 - - - - httpclient-4.3.x-scenario-4.4 - - 4.4 - - - - httpclient-4.3.x-scenario-4.3.6 - - 4.3.6 - - - - httpclient-4.3.x-scenario-4.3.5 - - 4.3.5 - - - - httpclient-4.3.x-scenario-4.3.4 - - 4.3.4 - - - - httpclient-4.3.x-scenario-4.3.3 - - 4.3.3 - - - - httpclient-4.3.x-scenario-4.3.2 - - 4.3.2 - - - - httpclient-4.3.x-scenario-4.3.1 - - 4.3.1 - - - - httpclient-4.3.x-scenario diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/CaseServlet.java b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java similarity index 97% rename from test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/CaseServlet.java rename to test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java index 33e7cc129e3cedfec2eecabef7ddb39bf35ab0ea..574fdcfbf4ed8a7f6926ca16b709cbda872d1c13 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/CaseServlet.java +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java @@ -16,7 +16,7 @@ * */ -package test.apache.skywalking.apm.testcase.httpclient; +package org.apache.skywalking.apm.testcase.httpclient; import java.io.IOException; import java.io.PrintWriter; diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java similarity index 96% rename from test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java rename to test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java index 0731aa788b8561ae71144a78b76a473bcd68d14c..1d39d0a2ab29e30968d8192460cad1891a043c49 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package test.apache.skywalking.apm.testcase.httpclient; +package org.apache.skywalking.apm.testcase.httpclient; import java.io.IOException; import java.io.PrintWriter; diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java similarity index 96% rename from test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java rename to test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java index 734d80f0e5f2fcbcc1049e3addff1d304cb8213e..2a3f2a3203f31d18ab1f3d80708402f4a0b0d67c 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java @@ -16,7 +16,7 @@ * */ -package test.apache.skywalking.apm.testcase.httpclient; +package org.apache.skywalking.apm.testcase.httpclient; import java.io.IOException; import java.io.PrintWriter; diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml index 3484a78446d40efd9e2fefbe4103b5eb02319484..363f2244c94aaceefcb83516d6eb1c4bd3136d62 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/src/main/webapp/WEB-INF/web.xml @@ -24,12 +24,12 @@ caseServlet - test.apache.skywalking.apm.testcase.httpclient.CaseServlet + org.apache.skywalking.apm.testcase.httpclient.CaseServlet healthCheck - test.apache.skywalking.apm.testcase.httpclient.HealthCheckServlet + org.apache.skywalking.apm.testcase.httpclient.HealthCheckServlet @@ -44,7 +44,7 @@ servletForContextPropagate - test.apache.skywalking.apm.testcase.httpclient.ServletForContextPropagate + org.apache.skywalking.apm.testcase.httpclient.ServletForContextPropagate