diff --git a/pom.xml b/pom.xml index d50deeda..ba5a9fa2 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,7 @@ ${user.dir} 1.6.7 1.5 + false @@ -236,12 +237,6 @@ 1.14 test - - org.mockito - mockito-core - 1.10.19 - test - org.jmockit jmockit-coverage @@ -384,7 +379,7 @@ org.jacoco jacoco-maven-plugin - 0.7.9 + 0.8.12 false @@ -407,13 +402,21 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.22.2 **/*Test.java + ${skipTests} + + + org.apache.maven.surefire + surefire-junit47 + 2.22.2 + + diff --git a/sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml index 9ace9229..3cec9e64 100644 --- a/sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml @@ -37,7 +37,6 @@ org.mockito mockito-core - 2.10.0 test diff --git a/sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/test/java/com/sofa/tracer/plugins/datasource/base/BaseTest.java b/sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/test/java/com/sofa/tracer/plugins/datasource/base/BaseTest.java index ca9a63c5..d7ea3004 100644 --- a/sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/test/java/com/sofa/tracer/plugins/datasource/base/BaseTest.java +++ b/sofa-tracer-plugins/sofa-tracer-datasource-plugin/src/test/java/com/sofa/tracer/plugins/datasource/base/BaseTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import javax.sql.DataSource; import java.io.File; diff --git a/sofa-tracer-plugins/sofa-tracer-dubbo-2.6.x-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-dubbo-2.6.x-plugin/pom.xml index 5371a614..19d1c8f4 100644 --- a/sofa-tracer-plugins/sofa-tracer-dubbo-2.6.x-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-dubbo-2.6.x-plugin/pom.xml @@ -11,6 +11,10 @@ 4.0.0 sofa-tracer-dubbo-2.6.x-plugin + + true + + com.alibaba diff --git a/sofa-tracer-plugins/sofa-tracer-dubbo-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-dubbo-plugin/pom.xml index 2b101495..fb87618a 100644 --- a/sofa-tracer-plugins/sofa-tracer-dubbo-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-dubbo-plugin/pom.xml @@ -22,6 +22,11 @@ com.alipay.sofa tracer-core + + org.javassist + javassist + test + junit junit diff --git a/sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml index 35a0c800..d79be46a 100644 --- a/sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml @@ -34,11 +34,6 @@ - - org.jmockit - jmockit - test - org.mockito mockito-core diff --git a/sofa-tracer-plugins/sofa-tracer-kafkamq-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-kafkamq-plugin/pom.xml index bb9319b1..23319fd7 100644 --- a/sofa-tracer-plugins/sofa-tracer-kafkamq-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-kafkamq-plugin/pom.xml @@ -45,7 +45,6 @@ org.mockito mockito-core - 2.10.0 test diff --git a/sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml index e63aa9e2..ad269d1c 100644 --- a/sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml @@ -24,11 +24,6 @@ true - - org.jmockit - jmockit - test - org.mockito mockito-core diff --git a/sofa-tracer-plugins/sofa-tracer-rabbitmq-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-rabbitmq-plugin/pom.xml index f7ce5f15..e705ddf5 100644 --- a/sofa-tracer-plugins/sofa-tracer-rabbitmq-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-rabbitmq-plugin/pom.xml @@ -45,7 +45,6 @@ org.mockito mockito-core - 2.10.0 test diff --git a/sofa-tracer-plugins/sofa-tracer-resttmplate-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-resttmplate-plugin/pom.xml index 9e34bb60..cf4f02b5 100644 --- a/sofa-tracer-plugins/sofa-tracer-resttmplate-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-resttmplate-plugin/pom.xml @@ -31,11 +31,6 @@ - - org.jmockit - jmockit - test - org.mockito mockito-core diff --git a/sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml index 409d56b9..1df40438 100644 --- a/sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml +++ b/sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml @@ -49,11 +49,6 @@ spring-context - - org.jmockit - jmockit - test - org.mockito mockito-core diff --git a/tracer-core/pom.xml b/tracer-core/pom.xml index 7558ca19..c0821664 100644 --- a/tracer-core/pom.xml +++ b/tracer-core/pom.xml @@ -34,21 +34,11 @@ - - org.jmockit - jmockit - test - org.mockito mockito-core test - - org.jmockit - jmockit-coverage - test - junit junit diff --git a/tracer-test/core-test/pom.xml b/tracer-test/core-test/pom.xml index 9b8ce78a..53a51018 100644 --- a/tracer-test/core-test/pom.xml +++ b/tracer-test/core-test/pom.xml @@ -17,24 +17,13 @@ tracer-core - - org.jmockit - jmockit - test - org.mockito mockito-core - 2.3.0 test - - org.jmockit - jmockit-coverage - test - junit junit diff --git a/tracer-test/log4j2-test/pom.xml b/tracer-test/log4j2-test/pom.xml index 7a84cb3c..8741170a 100644 --- a/tracer-test/log4j2-test/pom.xml +++ b/tracer-test/log4j2-test/pom.xml @@ -11,7 +11,7 @@ sofa-tracer-log4j2-test - 2.17.1 + 2.21.1 @@ -36,7 +36,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl ${log4j2.version} test diff --git a/tracer-test/logback-test/pom.xml b/tracer-test/logback-test/pom.xml index 2d6ab9e8..0c8dcc47 100644 --- a/tracer-test/logback-test/pom.xml +++ b/tracer-test/logback-test/pom.xml @@ -19,7 +19,6 @@ ch.qos.logback logback-classic - 1.2.0