diff --git a/CHANGES.md b/CHANGES.md index bda8d71a4..3b402986a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,18 +11,20 @@ Release Notes. * Support set instance properties in json format. * Upgrade grpc-java to 1.42.1 and protoc to 3.17.3 to allow using native Mac osx-aarch_64 artifacts. * Add doc about system environment variables to configurations.md -* Avoid `ProfileTaskChannelService.addProfilingSnapshot` throw IllegalStateException(Queue full) +* Avoid `ProfileTaskChannelService.addProfilingSnapshot` throw IllegalStateException(Queue full) * Increase `ProfileTaskChannelService.snapshotQueue` default size from 50 to 4500 * Support 2.8 and 2.9 of pulsar client. * Add dubbo 3.x plugin. * Fix TracePathMatcher should match pattern "**" with paths end by "/" * Add support `returnedObj` expression for apm-customize-enhance-plugin -* Fix the bug that httpasyncclient-4.x-plugin puts the dirty tracing context in the connection context +* Fix the bug that httpasyncclient-4.x-plugin puts the dirty tracing context in the connection context * Compatible with the versions after dubbo-2.7.14 * Follow protocol grammar fix `GCPhrase -> GCPhase`. * Support ZGC GC time and count metric collect. (Require 9.0.0 OAP) * Support configuration for collecting redis parameters for jedis-2.x and redisson-3.x plugin. * Migrate base images to Temurin and add images for ARM. +* (Plugin Test) Fix compiling issues in many plugin tests due to they didn't lock the Spring version, and Spring 3 is + incompatible with 2.x APIs and JDK8 compiling. #### Documentation diff --git a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/pom.xml b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/pom.xml index 66869ee8d..d534048d7 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/pom.xml +++ b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 YOUR VERSION - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/activemq-scenario/pom.xml b/test/plugin/scenarios/activemq-scenario/pom.xml index 9addfa4fe..76f9efc0f 100644 --- a/test/plugin/scenarios/activemq-scenario/pom.xml +++ b/test/plugin/scenarios/activemq-scenario/pom.xml @@ -33,7 +33,7 @@ 5.14.5 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-activemq-scenario @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml b/test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml index 4ddb6b501..e4af908cc 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml @@ -72,6 +72,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/avro-scenario/avro-client/pom.xml b/test/plugin/scenarios/avro-scenario/avro-client/pom.xml index 9cab4f0a9..cec79a8fe 100644 --- a/test/plugin/scenarios/avro-scenario/avro-client/pom.xml +++ b/test/plugin/scenarios/avro-scenario/avro-client/pom.xml @@ -35,7 +35,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -87,7 +87,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/avro-scenario/pom.xml b/test/plugin/scenarios/avro-scenario/pom.xml index 630259d83..b4e48d0d8 100644 --- a/test/plugin/scenarios/avro-scenario/pom.xml +++ b/test/plugin/scenarios/avro-scenario/pom.xml @@ -42,7 +42,7 @@ 1.7.6 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE diff --git a/test/plugin/scenarios/baidu-brpc-scenario/pom.xml b/test/plugin/scenarios/baidu-brpc-scenario/pom.xml index 05b296370..f840f5b11 100644 --- a/test/plugin/scenarios/baidu-brpc-scenario/pom.xml +++ b/test/plugin/scenarios/baidu-brpc-scenario/pom.xml @@ -68,6 +68,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/canal-scenario/pom.xml b/test/plugin/scenarios/canal-scenario/pom.xml index 03ee7fe6a..17045ad8b 100644 --- a/test/plugin/scenarios/canal-scenario/pom.xml +++ b/test/plugin/scenarios/canal-scenario/pom.xml @@ -34,7 +34,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -97,17 +97,17 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -117,6 +117,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/pom.xml b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/pom.xml index 36e6e6256..9d586f92c 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/pom.xml @@ -33,7 +33,7 @@ 3.7.2 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-cassandra-java-driver-3.x-scenario @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -100,6 +100,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/clickhouse-0.3.x-scenario/pom.xml b/test/plugin/scenarios/clickhouse-0.3.x-scenario/pom.xml index ab2cec73c..be9db88e7 100644 --- a/test/plugin/scenarios/clickhouse-0.3.x-scenario/pom.xml +++ b/test/plugin/scenarios/clickhouse-0.3.x-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 0.3.1-patch - 2.5.1 + 2.5.1 skywalking-clickhouse-0.3.x-scenario @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -77,6 +77,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/correlation-autotag-scenario/pom.xml b/test/plugin/scenarios/correlation-autotag-scenario/pom.xml index 8c90a9839..b1022871c 100644 --- a/test/plugin/scenarios/correlation-autotag-scenario/pom.xml +++ b/test/plugin/scenarios/correlation-autotag-scenario/pom.xml @@ -34,7 +34,7 @@ 1.6.0 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-correlation-autotag-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -100,6 +100,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/customize-scenario/pom.xml b/test/plugin/scenarios/customize-scenario/pom.xml index da45cf030..661c22386 100644 --- a/test/plugin/scenarios/customize-scenario/pom.xml +++ b/test/plugin/scenarios/customize-scenario/pom.xml @@ -61,6 +61,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/cxf-scenario/pom.xml b/test/plugin/scenarios/cxf-scenario/pom.xml index 29565144e..3b4709c3f 100644 --- a/test/plugin/scenarios/cxf-scenario/pom.xml +++ b/test/plugin/scenarios/cxf-scenario/pom.xml @@ -34,7 +34,7 @@ 3.1.9 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-cxf-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -85,6 +85,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/pom.xml b/test/plugin/scenarios/dbcp-2.x-scenario/pom.xml index c58590f76..7fa0fb1e3 100755 --- a/test/plugin/scenarios/dbcp-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/dbcp-2.x-scenario/pom.xml @@ -34,7 +34,7 @@ 2.7.0 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-dbcp-2.x-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -86,6 +86,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/druid-1.x-scenario/pom.xml b/test/plugin/scenarios/druid-1.x-scenario/pom.xml index 1c1eede25..7697ee8b6 100644 --- a/test/plugin/scenarios/druid-1.x-scenario/pom.xml +++ b/test/plugin/scenarios/druid-1.x-scenario/pom.xml @@ -34,7 +34,7 @@ 1.1.22 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-druid-1.x-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -86,6 +86,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml b/test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml index 27b2e8e85..949fd6606 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml @@ -68,6 +68,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml b/test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml index d962e3723..898d1e52b 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml @@ -68,6 +68,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/dubbo-3.x-scenario/pom.xml b/test/plugin/scenarios/dubbo-3.x-scenario/pom.xml index 0154f35ca..d6c2e8153 100644 --- a/test/plugin/scenarios/dubbo-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/dubbo-3.x-scenario/pom.xml @@ -74,6 +74,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml b/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml index a18c0f68a..37096d914 100644 --- a/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml @@ -32,7 +32,7 @@ 1.8 2.0.3 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 3.0.0 @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -92,6 +92,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml b/test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml index ff091d956..c0a6b4e56 100644 --- a/test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml @@ -34,7 +34,7 @@ 3.0.0 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE 1.4.184 3.0.0 @@ -46,7 +46,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -72,7 +72,7 @@ org.springframework.boot spring-boot-starter-jdbc - ${spring-boot-version} + ${spring.boot.version} com.h2database @@ -97,6 +97,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml b/test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml index 6aee670a7..b9315dc0a 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml @@ -34,7 +34,7 @@ 7.3.0 7.5.0 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-elasticsearch-7.x-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -118,7 +118,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml b/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml index 1a0d826e2..b9189769a 100644 --- a/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml +++ b/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 YOUR VERSION - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/fastjson-scenario/pom.xml b/test/plugin/scenarios/fastjson-scenario/pom.xml index 5a2330228..612b146fc 100644 --- a/test/plugin/scenarios/fastjson-scenario/pom.xml +++ b/test/plugin/scenarios/fastjson-scenario/pom.xml @@ -29,7 +29,7 @@ UTF-8 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.2.62 ${test.framework.version} 2.6.2 @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -79,6 +79,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/feign-scenario/pom.xml b/test/plugin/scenarios/feign-scenario/pom.xml index 3a53ebd3b..6c4a20e54 100644 --- a/test/plugin/scenarios/feign-scenario/pom.xml +++ b/test/plugin/scenarios/feign-scenario/pom.xml @@ -32,7 +32,7 @@ 1.8 9.0.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 2.6.2 @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml b/test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml index 2c92c888c..bea9c6062 100644 --- a/test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml +++ b/test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 17.10.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -102,6 +102,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml b/test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml index 8144c284d..2eb7aee50 100644 --- a/test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml +++ b/test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 6.41.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -102,6 +102,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml b/test/plugin/scenarios/graphql-12.x-scenario/pom.xml index 58dd8ee75..1e11b1043 100644 --- a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml +++ b/test/plugin/scenarios/graphql-12.x-scenario/pom.xml @@ -75,6 +75,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/graphql-8.x-scenario/pom.xml b/test/plugin/scenarios/graphql-8.x-scenario/pom.xml index 0ca568ec8..9ae3ed5dd 100644 --- a/test/plugin/scenarios/graphql-8.x-scenario/pom.xml +++ b/test/plugin/scenarios/graphql-8.x-scenario/pom.xml @@ -74,6 +74,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/graphql-9.x-scenario/pom.xml b/test/plugin/scenarios/graphql-9.x-scenario/pom.xml index 403aee0a0..1ec33b1f8 100644 --- a/test/plugin/scenarios/graphql-9.x-scenario/pom.xml +++ b/test/plugin/scenarios/graphql-9.x-scenario/pom.xml @@ -74,6 +74,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/grpc-scenario/pom.xml b/test/plugin/scenarios/grpc-scenario/pom.xml index a70cbcc71..95e7e94ea 100644 --- a/test/plugin/scenarios/grpc-scenario/pom.xml +++ b/test/plugin/scenarios/grpc-scenario/pom.xml @@ -34,7 +34,7 @@ 1.6.0 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-grpc-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -94,6 +94,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/gson-scenario/pom.xml b/test/plugin/scenarios/gson-scenario/pom.xml index 3beba29e5..ae24c5e96 100644 --- a/test/plugin/scenarios/gson-scenario/pom.xml +++ b/test/plugin/scenarios/gson-scenario/pom.xml @@ -29,7 +29,7 @@ UTF-8 - 2.1.6.RELEASE + 2.1.6.RELEASE 2.8.5 ${test.framework.version} 2.6.2 @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -79,6 +79,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/h2-scenario/pom.xml b/test/plugin/scenarios/h2-scenario/pom.xml index 1ac80263e..2622b4259 100644 --- a/test/plugin/scenarios/h2-scenario/pom.xml +++ b/test/plugin/scenarios/h2-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 1.4.177 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -84,6 +84,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/hbase-scenario/pom.xml b/test/plugin/scenarios/hbase-scenario/pom.xml index 99a3babe2..dd0952b16 100644 --- a/test/plugin/scenarios/hbase-scenario/pom.xml +++ b/test/plugin/scenarios/hbase-scenario/pom.xml @@ -31,7 +31,7 @@ ${test.framework.version} 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE 1.8 @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -82,12 +82,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -97,6 +97,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/hikaricp-scenario/pom.xml b/test/plugin/scenarios/hikaricp-scenario/pom.xml index 6c3700357..9274a9217 100644 --- a/test/plugin/scenarios/hikaricp-scenario/pom.xml +++ b/test/plugin/scenarios/hikaricp-scenario/pom.xml @@ -34,7 +34,7 @@ 3.2.0 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-hikaricp-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -86,6 +86,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/hystrix-scenario/pom.xml b/test/plugin/scenarios/hystrix-scenario/pom.xml index 3cab1e402..a8b80d9ac 100644 --- a/test/plugin/scenarios/hystrix-scenario/pom.xml +++ b/test/plugin/scenarios/hystrix-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 1.4.20 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-hystrix-scenario @@ -40,7 +40,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -81,6 +81,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/influxdb-scenario/pom.xml b/test/plugin/scenarios/influxdb-scenario/pom.xml index 6a1a80870..c144a8727 100644 --- a/test/plugin/scenarios/influxdb-scenario/pom.xml +++ b/test/plugin/scenarios/influxdb-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 1.8 - 2.1.6.RELEASE + 2.1.6.RELEASE 2.17 @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import diff --git a/test/plugin/scenarios/jackson-scenario/pom.xml b/test/plugin/scenarios/jackson-scenario/pom.xml index 3baf3563a..31dfc17c3 100644 --- a/test/plugin/scenarios/jackson-scenario/pom.xml +++ b/test/plugin/scenarios/jackson-scenario/pom.xml @@ -29,7 +29,7 @@ UTF-8 - 2.1.6.RELEASE + 2.1.6.RELEASE 2.9.9 ${test.framework.version} 2.6.2 @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -90,6 +90,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/jdk-http-scenario/pom.xml b/test/plugin/scenarios/jdk-http-scenario/pom.xml index 081298e3c..477d1cd36 100644 --- a/test/plugin/scenarios/jdk-http-scenario/pom.xml +++ b/test/plugin/scenarios/jdk-http-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 1.8 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-jdk-http-scenario @@ -40,7 +40,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -70,6 +70,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml b/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml index e268befac..6275e0689 100644 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml +++ b/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 14 - 2.2.6.RELEASE + 2.2.6.RELEASE 2.8.5 ${test.framework.version} 2.6.2 @@ -45,7 +45,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -109,6 +109,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml b/test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml index c2675f7df..5b160e403 100644 --- a/test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml +++ b/test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 17 - 2.5.6 + 2.5.6 2.8.5 ${test.framework.version} 2.6.2 @@ -45,7 +45,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import diff --git a/test/plugin/scenarios/jedis-scenario/pom.xml b/test/plugin/scenarios/jedis-scenario/pom.xml index a78f9a4a8..579e91781 100644 --- a/test/plugin/scenarios/jedis-scenario/pom.xml +++ b/test/plugin/scenarios/jedis-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 2.9.0 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-jedis-scenario @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import diff --git a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml index 1d50dede0..bfde57fb3 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml +++ b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml @@ -29,7 +29,7 @@ jettyclient-scenario 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -67,12 +67,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml index b36c17bc0..24041c817 100644 --- a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml +++ b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml @@ -67,6 +67,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/kafka-scenario/pom.xml b/test/plugin/scenarios/kafka-scenario/pom.xml index ebc971dd7..064058e89 100644 --- a/test/plugin/scenarios/kafka-scenario/pom.xml +++ b/test/plugin/scenarios/kafka-scenario/pom.xml @@ -33,7 +33,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE 3.0.0 @@ -49,7 +49,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -74,12 +74,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} com.squareup.okhttp3 @@ -94,6 +94,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml b/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml index b589e2e2b..55f0f9c1a 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml @@ -32,7 +32,7 @@ 1.8 1.3.3 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.3.61 1.3.3 @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -102,7 +102,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/pom.xml b/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/pom.xml index 255ac6ce2..fb76b5dd7 100644 --- a/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/pom.xml +++ b/test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/pom.xml @@ -32,7 +32,7 @@ 1.8 2.6.3 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE 2.6.2 4.3.8.RELEASE @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -80,6 +80,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/lettuce-scenario/pom.xml b/test/plugin/scenarios/lettuce-scenario/pom.xml index 8d5b1211c..b7a8100e1 100644 --- a/test/plugin/scenarios/lettuce-scenario/pom.xml +++ b/test/plugin/scenarios/lettuce-scenario/pom.xml @@ -32,7 +32,7 @@ ${test.framework.version} 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE 3.4.2 @@ -53,7 +53,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -78,12 +78,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -93,6 +93,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mariadb-scenario/pom.xml b/test/plugin/scenarios/mariadb-scenario/pom.xml index 6e155ba16..4d0365e8c 100644 --- a/test/plugin/scenarios/mariadb-scenario/pom.xml +++ b/test/plugin/scenarios/mariadb-scenario/pom.xml @@ -34,7 +34,7 @@ 2.6.0 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-mariadb-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -80,6 +80,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/pom.xml b/test/plugin/scenarios/mongodb-3.x-scenario/pom.xml index d9a191400..08a9f813f 100644 --- a/test/plugin/scenarios/mongodb-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/mongodb-3.x-scenario/pom.xml @@ -36,7 +36,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -49,7 +49,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -74,12 +74,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -89,6 +89,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml b/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml index 2899b21d1..20c0201d2 100644 --- a/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml +++ b/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 4.0.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -105,6 +105,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml b/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml index fa83eb9fd..29c302015 100644 --- a/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml +++ b/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml @@ -34,7 +34,7 @@ 7.0.0.jre8 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-mssql-jdbc-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -81,6 +81,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mssql-jtds-scenario/pom.xml b/test/plugin/scenarios/mssql-jtds-scenario/pom.xml index 514a6583c..84f0eccf1 100644 --- a/test/plugin/scenarios/mssql-jtds-scenario/pom.xml +++ b/test/plugin/scenarios/mssql-jtds-scenario/pom.xml @@ -34,7 +34,7 @@ 1.3.1 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-mssql-jtds-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -80,6 +80,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml b/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml index 2b92a70d7..6e1985d2b 100644 --- a/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml @@ -30,6 +30,7 @@ 1.8 3.4.6 ${test.framework.version} + 2.1.6.RELEASE skywalking-mybatis-3.x-scenario @@ -38,12 +39,12 @@ org.springframework.boot spring-boot-starter-web - 2.0.0.RELEASE + ${spring.boot.version} org.springframework.boot spring-boot-starter-jdbc - 2.0.0.RELEASE + ${spring.boot.version} mysql @@ -74,6 +75,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/mysql-scenario/pom.xml b/test/plugin/scenarios/mysql-scenario/pom.xml index 21d14480e..4a68c80f2 100644 --- a/test/plugin/scenarios/mysql-scenario/pom.xml +++ b/test/plugin/scenarios/mysql-scenario/pom.xml @@ -34,7 +34,7 @@ 5.1.5 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-mysql-scenario @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -80,6 +80,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/neo4j-4.x-scenario/pom.xml b/test/plugin/scenarios/neo4j-4.x-scenario/pom.xml index 6e52ad3a1..6224834e8 100644 --- a/test/plugin/scenarios/neo4j-4.x-scenario/pom.xml +++ b/test/plugin/scenarios/neo4j-4.x-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 4.0.0 - 2.5.1 + 2.5.1 skywalking-neo4j-4.x-scenario @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -83,6 +83,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/okhttp-scenario/pom.xml b/test/plugin/scenarios/okhttp-scenario/pom.xml index cb90629dd..01ea10083 100644 --- a/test/plugin/scenarios/okhttp-scenario/pom.xml +++ b/test/plugin/scenarios/okhttp-scenario/pom.xml @@ -35,7 +35,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -48,7 +48,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -73,12 +73,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/okhttp2-scenario/pom.xml b/test/plugin/scenarios/okhttp2-scenario/pom.xml index f57242753..e473c750a 100644 --- a/test/plugin/scenarios/okhttp2-scenario/pom.xml +++ b/test/plugin/scenarios/okhttp2-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 2.7.5 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -42,7 +42,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -84,6 +84,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/oracle-scenario/pom.xml b/test/plugin/scenarios/oracle-scenario/pom.xml index d47f5d1fd..2ae0a69f7 100644 --- a/test/plugin/scenarios/oracle-scenario/pom.xml +++ b/test/plugin/scenarios/oracle-scenario/pom.xml @@ -33,7 +33,7 @@ 10.2.0.4.0 - 2.1.6.RELEASE + 2.1.6.RELEASE skywalking-oracle-scenario @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/pulsar-scenario/pom.xml b/test/plugin/scenarios/pulsar-scenario/pom.xml index d8df64ee9..a26335ff0 100644 --- a/test/plugin/scenarios/pulsar-scenario/pom.xml +++ b/test/plugin/scenarios/pulsar-scenario/pom.xml @@ -35,7 +35,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -48,7 +48,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -73,12 +73,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -88,6 +88,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml index 5f71c7945..d0e6be532 100644 --- a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 2.0.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 3.0.0 @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -90,6 +90,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/quasar-scenario/pom.xml b/test/plugin/scenarios/quasar-scenario/pom.xml index 7e2825000..0b4f89ee8 100644 --- a/test/plugin/scenarios/quasar-scenario/pom.xml +++ b/test/plugin/scenarios/quasar-scenario/pom.xml @@ -34,7 +34,7 @@ 0.7.9 ${test.framework.version} - 2.1.6.RELEASE + 2.1.6.RELEASE 3.6.0 @@ -45,7 +45,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -88,6 +88,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/rabbitmq-scenario/pom.xml b/test/plugin/scenarios/rabbitmq-scenario/pom.xml index b011609ea..76670ebf8 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/pom.xml +++ b/test/plugin/scenarios/rabbitmq-scenario/pom.xml @@ -34,7 +34,7 @@ ${test.framework.version} 2.8.1 - 2.1.4.RELEASE + 2.1.4.RELEASE @@ -47,7 +47,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} spring-boot-starter-logging @@ -68,7 +68,7 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/redisson-scenario/pom.xml b/test/plugin/scenarios/redisson-scenario/pom.xml index cdce5c1aa..a055c35d0 100644 --- a/test/plugin/scenarios/redisson-scenario/pom.xml +++ b/test/plugin/scenarios/redisson-scenario/pom.xml @@ -28,7 +28,7 @@ UTF-8 1.8 - 1.5.2.RELEASE + 1.5.2.RELEASE 3.11.5 ${test.framework.version} @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -54,6 +54,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/retransform-class-scenario/pom.xml b/test/plugin/scenarios/retransform-class-scenario/pom.xml index f1bd71b45..75dc03f6a 100644 --- a/test/plugin/scenarios/retransform-class-scenario/pom.xml +++ b/test/plugin/scenarios/retransform-class-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 1.8 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -86,6 +86,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/sentinel-scenario/pom.xml b/test/plugin/scenarios/sentinel-scenario/pom.xml index 48fc07cbe..3dc47ed02 100644 --- a/test/plugin/scenarios/sentinel-scenario/pom.xml +++ b/test/plugin/scenarios/sentinel-scenario/pom.xml @@ -30,7 +30,7 @@ UTF-8 1.7.2 - 2.1.18.RELEASE + 2.1.18.RELEASE skywalking-sentinel-scenario @@ -40,7 +40,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -81,6 +81,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml b/test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml index 0fc103d82..d9cc16ee5 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml @@ -32,7 +32,7 @@ 1.8 1.3.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 2.9.4 @@ -108,6 +108,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml b/test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml index af3ee5199..ae262cd70 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml @@ -31,7 +31,7 @@ 3.0.0 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -48,7 +48,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -73,12 +73,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} com.h2database diff --git a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/pom.xml b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/pom.xml index 717a04236..e5c1c0709 100644 --- a/test/plugin/scenarios/shardingsphere-4.0.x-scenario/pom.xml +++ b/test/plugin/scenarios/shardingsphere-4.0.x-scenario/pom.xml @@ -33,7 +33,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -75,12 +75,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} com.h2database diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml b/test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml index 90a4fc480..f2766d587 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml +++ b/test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml @@ -33,7 +33,7 @@ 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -75,12 +75,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} com.h2database diff --git a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml b/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml index 74225f445..de81967a2 100644 --- a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml +++ b/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml @@ -32,7 +32,7 @@ 5.0.0-beta 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE @@ -49,12 +49,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} com.h2database diff --git a/test/plugin/scenarios/sofarpc-scenario/pom.xml b/test/plugin/scenarios/sofarpc-scenario/pom.xml index bae032602..de6d01cbb 100644 --- a/test/plugin/scenarios/sofarpc-scenario/pom.xml +++ b/test/plugin/scenarios/sofarpc-scenario/pom.xml @@ -68,6 +68,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/pom.xml b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/pom.xml index 3c8262441..59159fc60 100644 --- a/test/plugin/scenarios/spring-kafka-1.3.x-scenario/pom.xml +++ b/test/plugin/scenarios/spring-kafka-1.3.x-scenario/pom.xml @@ -30,7 +30,7 @@ 1.8 1.3.11.RELEASE 2.6.2 - 1.5.22.RELEASE + 1.5.22.RELEASE 0.11.0.3 3.0.0 @@ -41,12 +41,12 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-jdbc - ${spring-boot-version} + ${spring.boot.version} org.springframework.kafka @@ -83,6 +83,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/pom.xml b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/pom.xml index 62d518db5..d4a71ff8f 100644 --- a/test/plugin/scenarios/spring-kafka-2.2.x-scenario/pom.xml +++ b/test/plugin/scenarios/spring-kafka-2.2.x-scenario/pom.xml @@ -30,7 +30,7 @@ 1.8 2.2.9.RELEASE 2.6.2 - 2.1.9.RELEASE + 2.1.9.RELEASE 2.0.1 3.0.0 @@ -41,12 +41,12 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-jdbc - ${spring-boot-version} + ${spring.boot.version} org.springframework.kafka @@ -83,6 +83,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml index b00bdc1f0..2fa53f972 100644 --- a/test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml +++ b/test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml @@ -30,7 +30,7 @@ 1.8 2.3.3.RELEASE 2.6.2 - 2.3.2.RELEASE + 2.3.2.RELEASE 2.3.1 3.0.0 @@ -41,7 +41,7 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} org.springframework.kafka @@ -78,6 +78,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/spring-tx-scenario/pom.xml b/test/plugin/scenarios/spring-tx-scenario/pom.xml index 6c4e693e8..4aa42ad2a 100644 --- a/test/plugin/scenarios/spring-tx-scenario/pom.xml +++ b/test/plugin/scenarios/spring-tx-scenario/pom.xml @@ -58,6 +58,7 @@ org.springframework.boot spring-boot-maven-plugin + ${test.framework.version} diff --git a/test/plugin/scenarios/thrift-scenario/pom.xml b/test/plugin/scenarios/thrift-scenario/pom.xml index 974de57fa..88fe6d465 100644 --- a/test/plugin/scenarios/thrift-scenario/pom.xml +++ b/test/plugin/scenarios/thrift-scenario/pom.xml @@ -31,7 +31,7 @@ UTF-8 1.8 0.12.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 ${test.framework.version} diff --git a/test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml b/test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml index 56ae7c62c..7a8edf230 100644 --- a/test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml +++ b/test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml @@ -37,7 +37,7 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot @@ -52,12 +52,12 @@ org.springframework.boot spring-boot-starter-log4j2 - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} @@ -67,7 +67,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-version} + ${spring.boot.version} diff --git a/test/plugin/scenarios/undertow-scenario/pom.xml b/test/plugin/scenarios/undertow-scenario/pom.xml index 8df511ad3..3a0f39d88 100644 --- a/test/plugin/scenarios/undertow-scenario/pom.xml +++ b/test/plugin/scenarios/undertow-scenario/pom.xml @@ -33,6 +33,7 @@ undertow 1.3.0.Final + 2.1.6.RELEASE skywalking-undertow-scenario @@ -63,6 +64,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml index e0af4c17b..5f339151c 100644 --- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml @@ -31,6 +31,7 @@ UTF-8 1.8 3.9.0 + 2.1.6.RELEASE skywalking-vertx-eventbus-3.x-scenario @@ -59,6 +60,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml b/test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml index 4f963991e..e837dc5bb 100644 --- a/test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml +++ b/test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml @@ -31,6 +31,7 @@ UTF-8 1.8 3.5.4 + 2.1.6.RELEASE skywalking-vertx-web-3.54minus-scenario @@ -49,6 +50,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml b/test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml index d8dbe1df5..418922cd5 100644 --- a/test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml +++ b/test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml @@ -31,6 +31,7 @@ UTF-8 1.8 3.9.1 + 2.1.6.RELEASE skywalking-vertx-web-3.6plus-scenario @@ -54,6 +55,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml b/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml index 3d9361885..e53f8119d 100644 --- a/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml @@ -32,7 +32,7 @@ 1.8 2.2.0 - 2.1.6.RELEASE + 2.1.6.RELEASE 1.18.20 @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring.boot.version} pom import @@ -103,6 +103,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} diff --git a/test/plugin/scenarios/zookeeper-scenario/pom.xml b/test/plugin/scenarios/zookeeper-scenario/pom.xml index 2f91a3534..86010278a 100644 --- a/test/plugin/scenarios/zookeeper-scenario/pom.xml +++ b/test/plugin/scenarios/zookeeper-scenario/pom.xml @@ -32,7 +32,7 @@ ${test.framework.version} 2.6.2 4.3.8.RELEASE - 1.5.2.RELEASE + 1.5.2.RELEASE skywalking-zookeeper-scenario @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter - ${spring-boot-version} + ${spring.boot.version} org.apache.logging.log4j @@ -82,12 +82,12 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-version} + ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot-version} + ${spring.boot.version} @@ -97,6 +97,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version}