From 15263bce89f9affb62e3e93651573d8a9b8def7b Mon Sep 17 00:00:00 2001 From: Fatih ERDEM <93.fatiherdem@gmail.com> Date: Fri, 24 Aug 2018 04:28:25 +0300 Subject: [PATCH] Moved hardcoded dependency versions to properties tag in pom.xml (#1583) --- .../apm-toolkit-log4j-1.x/pom.xml | 6 +++++- .../apm-toolkit-log4j-2.x/pom.xml | 6 +++++- .../apm-toolkit-logback-1.x/pom.xml | 6 +++++- .../apm-toolkit-opentracing/pom.xml | 8 ++++++-- apm-checkstyle/pom.xml | 9 +++++++-- .../collector-remote-grpc-provider/pom.xml | 9 +++++++-- .../apm-collector-thirdparty-receiver/pom.xml | 3 +-- apm-protocol/apm-network/pom.xml | 11 +++++++---- apm-protocol/apm-ui-protocol/pom.xml | 6 +++++- apm-sniffer/apm-agent-core/pom.xml | 12 ++++++++---- .../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 3 ++- apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 3 ++- .../elasticsearch-5.x-plugin/pom.xml | 3 ++- apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 3 ++- apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 3 ++- .../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 10 +++++++--- .../httpasyncclient-4.x-plugin/pom.xml | 3 ++- .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 6 +++++- .../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 8 ++++++-- .../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 6 +++++- .../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 6 +++++- .../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 6 +++++- apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 6 +++++- .../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 5 +++-- .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 3 ++- apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 13 +++++++++---- .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 3 ++- .../nutz-plugins/http-1.x-plugin/pom.xml | 6 +++++- .../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 9 +++++++-- .../apm-sdk-plugin/oracle-10.x-plugin/pom.xml | 3 ++- apm-sniffer/apm-sdk-plugin/pom.xml | 7 +++++-- .../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 3 ++- .../apm-sdk-plugin/resin-3.x-plugin/pom.xml | 6 ++++-- .../apm-sdk-plugin/resin-4.x-plugin/pom.xml | 6 ++++-- .../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 3 ++- .../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 3 ++- .../servicecomb-java-chassis-0.x-plugin/pom.xml | 6 +++++- .../servicecomb-java-chassis-1.x-plugin/pom.xml | 5 ++++- apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 3 ++- .../concurrent-util-4.x-plugin/pom.xml | 6 +++++- .../spring-plugins/core-patch/pom.xml | 6 +++++- .../mvc-annotation-3.x-plugin/pom.xml | 12 +++++++++--- .../mvc-annotation-4.x-plugin/pom.xml | 12 +++++++++--- .../spring-plugins/mvc-annotation-commons/pom.xml | 12 +++++++++--- .../spring-plugins/resttemplate-4.x-plugin/pom.xml | 6 +++++- .../spring-cloud-feign-1.x-plugin/pom.xml | 6 +++++- .../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 3 ++- .../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 9 ++++++--- .../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 6 ++++-- .../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 4 +++- .../apm-toolkit-log4j-1.x-activation/pom.xml | 6 +++++- apm-sniffer/apm-toolkit-activation/pom.xml | 7 +++++-- .../spring-annotation-plugin/pom.xml | 6 +++++- apm-sniffer/optional-plugins/pom.xml | 7 +++++-- apm-webapp/pom.xml | 14 ++++++++++---- pom.xml | 3 --- 56 files changed, 258 insertions(+), 93 deletions(-) diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml index 0b6d90bf279a..88820b978a13 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml @@ -27,11 +27,15 @@ apm-toolkit-log4j-1.x + + 1.2.17 + + log4j log4j - 1.2.17 + ${log4j.version} provided diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml index 79503b77ca36..a417d9e07bb3 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml @@ -27,11 +27,15 @@ apm-toolkit-log4j-2.x + + 2.7 + + org.apache.logging.log4j log4j-core - 2.7 + ${log4j-core.version} provided diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml index 8c58433e5b79..df9ef86abb7c 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml @@ -27,11 +27,15 @@ apm-toolkit-logback-1.x + + 1.2.3 + + ch.qos.logback logback-classic - 1.2.3 + ${logback-classic.version} provided diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml index 7e59a691dc5d..acaf1622afd1 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -27,16 +27,20 @@ apm-toolkit-opentracing + + 0.30.0 + + io.opentracing opentracing-api - 0.30.0 + ${opentracing.version} io.opentracing opentracing-noop - 0.30.0 + ${opentracing.version} diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml index c6ee3475ba42..8f9f92693c2c 100644 --- a/apm-checkstyle/pom.xml +++ b/apm-checkstyle/pom.xml @@ -30,13 +30,18 @@ 5.0.0-RC-SNAPSHOT Module to hold Checkstyle for SkyWalking. + + 0.7.9 + 4.1.0 + + org.jacoco jacoco-maven-plugin - 0.7.9 + ${jacoco-maven-plugin.version} prepare-agent @@ -49,7 +54,7 @@ org.eluder.coveralls coveralls-maven-plugin - 4.1.0 + ${coveralls-maven-plugin.version} xFwR2GqmxcMxV7tGEpW2NfwIrbCD4cQCS diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml index 52e351ec36ad..0e697c271b90 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml @@ -28,6 +28,11 @@ collector-remote-grpc-provider jar + + 1.4.1.Final + 0.5.0 + + org.apache.skywalking @@ -51,14 +56,14 @@ kr.motd.maven os-maven-plugin - 1.4.1.Final + ${os-maven-plugin.version} org.xolstice.maven.plugins protobuf-maven-plugin - 0.5.0 + ${protobuf-maven-plugin.version} com.weibo motan-core - 0.2.1 + ${motan.version} provided com.weibo motan-transport-netty - 0.2.1 + ${motan.version} provided com.weibo motan-springsupport - 0.2.1 + ${motan.version} provided org.springframework spring-context - 4.2.4.RELEASE + ${spring-context.version} test diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml index c4558a4137a5..f3ca2c1572b3 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml @@ -32,13 +32,14 @@ UTF-8 + 5.1.36 mysql mysql-connector-java - 5.1.36 + ${mysql-connector-java.version} test diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml index 58a60f200b82..924f010a2233 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml @@ -30,11 +30,15 @@ http-1.x-plugin http://maven.apache.org + + 1.r.62 + + org.nutz nutz - 1.r.62 + ${nutz.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml index 6becd07d88c9..da5dc6429a97 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml @@ -30,17 +30,22 @@ mvc-annotation-1.x-plugin http://maven.apache.org + + 1.r.62 + 3.1.0 + + org.nutz nutz - 1.r.62 + ${nutz.version} provided javax.servlet javax.servlet-api - 3.1.0 + ${javax-servlet-api.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml index 02275cde06c3..3ff2b20e47fd 100755 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml @@ -33,13 +33,14 @@ UTF-8 + 10.2.0.4.0 com.oracle ojdbc14 - 10.2.0.4.0 + ${ojdbc14.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 2b4b76339008..38cba1bf87c4 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -73,6 +73,9 @@ ${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent ${agent.package.dest.dir}/plugins + + 1.0b3 + 1.8.1 @@ -148,7 +151,7 @@ ant-contrib ant-contrib - 1.0b3 + ${ant-contrib.version} ant @@ -159,7 +162,7 @@ org.apache.ant ant-nodeps - 1.8.1 + ${ant-nodeps.version} diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml index fec2fe60a19e..b2692e2ee576 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml @@ -32,13 +32,14 @@ UTF-8 + 42.0.0 org.postgresql postgresql - 42.0.0 + ${postgresql.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml index b4b707623083..1bfcd1447578 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml @@ -36,19 +36,21 @@ UTF-8 + 3.0.9 + 3.0.1 com.caucho resin - 3.0.9 + ${resin.version} provided javax.servlet javax.servlet-api - 3.0.1 + ${javax-servlet-api.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml index 244ceb1a8cf0..616deb213395 100644 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml @@ -36,19 +36,21 @@ UTF-8 + 4.0.41 + 3.0.1 com.caucho resin - 4.0.41 + ${resin.version} provided javax.servlet javax.servlet-api - 3.0.1 + ${javax-servlet-api.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml index 218972974d0a..80f3c7cfca73 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml @@ -30,13 +30,14 @@ UTF-8 + 3.6.2.Final com.alibaba.rocketmq rocketmq-client - 3.6.2.Final + ${rocketmq-client.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml index e584a9a0fdf1..71fdc5246743 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml @@ -30,13 +30,14 @@ UTF-8 + 4.1.0-incubating org.apache.rocketmq rocketmq-client - 4.1.0-incubating + ${rocketmq-client.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml index 38c1439bfae4..db758d6d8dd1 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml @@ -30,12 +30,16 @@ servicecomb-java-chassis-0.x-plugin http://maven.apache.org + + + 0.5.0 + io.servicecomb java-chassis-core - 0.5.0 + ${java-chassis-core.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml index 99c07ca91aea..87fe7a65883e 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml @@ -31,12 +31,15 @@ servicecomb-java-chassis-1.x-plugin http://maven.apache.org + + 1.0.0-m1 + org.apache.servicecomb java-chassis-core - 1.0.0-m1 + ${java-chassis-core.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index 81fb1c93b87f..68b5eb292d8b 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml @@ -32,13 +32,14 @@ UTF-8 + 5.4.0 com.alipay.sofa sofa-rpc-all - 5.4.0 + ${sofa-rpc-all.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml index afa3bf43cb9f..402e60fadcc0 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml @@ -30,11 +30,15 @@ concurrent-util-4.x-plugin http://maven.apache.org + + 4.3.10.RELEASE + + org.springframework spring-core - 4.3.10.RELEASE + ${spring-core.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml index 0fb2f92dcc16..e04f427f2572 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml @@ -28,11 +28,15 @@ apm-spring-core-patch core-patch + + 3.2.9.RELEASE + + org.springframework spring-aop - 3.2.9.RELEASE + ${spring-aop.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml index 246f7cf2500e..b24f66afb84c 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml @@ -30,23 +30,29 @@ mvc-annotation-3.x-plugin http://maven.apache.org + + 3.2.18.RELEASE + 3.2.18.RELEASE + 3.0.1 + + org.springframework spring-core - 3.2.18.RELEASE + ${spring-core.version} provided org.springframework spring-webmvc - 3.2.18.RELEASE + ${spring-webmvc.version} provided javax.servlet javax.servlet-api - 3.0.1 + ${javax-servlet-api.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml index 117b1bfc30e2..c43435f9affd 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml @@ -30,23 +30,29 @@ mvc-annotation-4.x-plugin http://maven.apache.org + + 4.3.10.RELEASE + 4.3.8.RELEASE + 3.0.1 + + org.springframework spring-core - 4.3.10.RELEASE + ${spring-core.version} provided org.springframework spring-webmvc - 4.3.8.RELEASE + ${spring-webmvc.version} provided javax.servlet javax.servlet-api - 3.0.1 + ${javax-servlet-api.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml index 222f67e83e1d..8e802bccfd09 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml @@ -30,23 +30,29 @@ mvc-annotation-commons http://maven.apache.org + + 4.3.10.RELEASE + 4.3.8.RELEASE + 3.0.1 + + org.springframework spring-core - 4.3.10.RELEASE + ${spring-core.version} provided org.springframework spring-webmvc - 4.3.8.RELEASE + ${spring-webmvc.version} provided javax.servlet javax.servlet-api - 3.0.1 + ${javax-servlet-api.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml index 6c642c025afb..11027373d30b 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml @@ -30,11 +30,15 @@ resttemplate-4.3.x-plugin http://maven.apache.org + + 4.3.10.RELEASE + + org.springframework spring-web - 4.3.10.RELEASE + ${spring-web.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml index 49d114fe382e..969fef13c3a8 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml @@ -33,11 +33,15 @@ spring-cloud-feign-1.x-plugin http://maven.apache.org + + 1.1.0.RELEASE + + org.springframework.cloud spring-cloud-starter-feign - 1.1.0.RELEASE + ${spring-cloud-starter-feign.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml index a3951b46dba7..94b84c6fede6 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml @@ -32,6 +32,7 @@ UTF-8 2.11.1 + 2.4.1 @@ -44,7 +45,7 @@ org.apache.logging.log4j log4j-core - 2.4.1 + ${log4j-core.version} test diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml index 67e93d580448..7973b82302e8 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml @@ -32,25 +32,28 @@ UTF-8 + 2.3.1 + 3.1.0 + 2.0 org.apache.struts struts2-core - 2.3.1 + ${struts2-core.version} provided javax.servlet javax.servlet-api - 3.1.0 + ${javax-servlet-api.version} provided javax.servlet jsp-api - 2.0 + ${jsp-api.version} test diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index 8ab292ed51d5..eae8b203c20e 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -32,13 +32,15 @@ 8.0.36 + 4.12 + 4.5.2 junit junit - 4.12 + ${junit.version} test @@ -62,7 +64,7 @@ org.apache.httpcomponents httpclient - 4.5.2 + ${apache-httpclient.version} test diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml index ecf0d632b53f..f0def7888ce5 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml @@ -30,7 +30,9 @@ UTF-8 + 2.0.0 + 2.4.1 @@ -43,7 +45,7 @@ org.apache.logging.log4j log4j-core - 2.4.1 + ${log4j-core.version} test diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml index 1b4dd3a20a61..c8855451631a 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml @@ -27,11 +27,15 @@ apm-toolkit-log4j-1.x-activation + + 1.2.17 + + log4j log4j - 1.2.17 + ${log4j.version} test diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index 704159f66e8c..b081907ac408 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -39,6 +39,9 @@ UTF-8 net.bytebuddy ${shade.package}.${shade.net.bytebuddy.source} + + 1.0b3 + 1.8.1 @@ -127,7 +130,7 @@ ant-contrib ant-contrib - 1.0b3 + ${ant-contrib.version} ant @@ -138,7 +141,7 @@ org.apache.ant ant-nodeps - 1.8.1 + ${ant-nodeps.version} diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml index 6506a4f2d8b3..e8bd0efd624a 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml @@ -28,11 +28,15 @@ apm-spring-annotation-plugin + + 3.2.0.RELEASE + + org.springframework spring-context - 3.2.0.RELEASE + ${spring-context.version} provided diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index ba396430452b..34cf70549347 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -35,6 +35,9 @@ ${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent ${agent.package.dest.dir}/optional-plugins + + 1.0b3 + 1.8.1 @@ -114,7 +117,7 @@ ant-contrib ant-contrib - 1.0b3 + ${ant-contrib.version} ant @@ -125,7 +128,7 @@ org.apache.ant ant-nodeps - 1.8.1 + ${ant-nodeps.version} diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index 601fa8b0268a..cdfde64fbe0f 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -27,11 +27,17 @@ apm-webapp jar + 1.8 UTF-8 1.5.11.RELEASE 2.6.2 + 2.8.2 + 4.5.3 + Edgware.SR1 + 1.6 + ${project.parent.basedir}/skywalking-ui @@ -40,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Edgware.SR1 + ${spring-cloud-dependencies.version} pom import @@ -71,12 +77,12 @@ com.google.code.gson gson - 2.8.2 + ${gson.version} org.apache.httpcomponents httpclient - 4.5.3 + ${apache-httpclient.version} org.springframework.cloud @@ -111,7 +117,7 @@ com.github.eirslett frontend-maven-plugin - 1.6 + ${frontend-maven-plugin.version} ${ui.path} v8.9.4 diff --git a/pom.xml b/pom.xml index 25c256adbe2b..ce126141d1f4 100644 --- a/pom.xml +++ b/pom.xml @@ -135,9 +135,6 @@ 4.3.0 0.8.1 3.0.0 - - -