This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch test-fix in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit b62a818a5bc311ce3b3e49c8e05dd11fed4ab89c Author: Wu Sheng <[email protected]> AuthorDate: Fri Jan 28 08:34:10 2022 +0800 Lock the Spring version in plugin test. --- CHANGES.md | 6 ++++-- .../jvm/src/main/resources/archetype-resources/pom.xml | 5 +++-- test/plugin/scenarios/activemq-scenario/pom.xml | 5 +++-- test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml | 1 + test/plugin/scenarios/avro-scenario/avro-client/pom.xml | 4 ++-- test/plugin/scenarios/avro-scenario/pom.xml | 2 +- test/plugin/scenarios/baidu-brpc-scenario/pom.xml | 1 + test/plugin/scenarios/canal-scenario/pom.xml | 9 +++++---- test/plugin/scenarios/cassandra-java-driver-3.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/clickhouse-0.3.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/correlation-autotag-scenario/pom.xml | 5 +++-- test/plugin/scenarios/customize-scenario/pom.xml | 1 + test/plugin/scenarios/cxf-scenario/pom.xml | 5 +++-- test/plugin/scenarios/dbcp-2.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/druid-1.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/dubbo-2.5.x-scenario/pom.xml | 1 + test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml | 1 + test/plugin/scenarios/dubbo-3.x-scenario/pom.xml | 1 + test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml | 7 ++++--- test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml | 6 +++--- test/plugin/scenarios/exception-checker-spring-scenario/pom.xml | 5 +++-- test/plugin/scenarios/fastjson-scenario/pom.xml | 5 +++-- test/plugin/scenarios/feign-scenario/pom.xml | 4 ++-- test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/graphql-12.x-scenario/pom.xml | 1 + test/plugin/scenarios/graphql-8.x-scenario/pom.xml | 1 + test/plugin/scenarios/graphql-9.x-scenario/pom.xml | 1 + test/plugin/scenarios/grpc-scenario/pom.xml | 5 +++-- test/plugin/scenarios/gson-scenario/pom.xml | 5 +++-- test/plugin/scenarios/h2-scenario/pom.xml | 5 +++-- test/plugin/scenarios/hbase-scenario/pom.xml | 9 +++++---- test/plugin/scenarios/hikaricp-scenario/pom.xml | 5 +++-- test/plugin/scenarios/hystrix-scenario/pom.xml | 5 +++-- test/plugin/scenarios/influxdb-scenario/pom.xml | 4 ++-- test/plugin/scenarios/jackson-scenario/pom.xml | 5 +++-- test/plugin/scenarios/jdk-http-scenario/pom.xml | 5 +++-- test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml | 5 +++-- test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml | 4 ++-- test/plugin/scenarios/jedis-scenario/pom.xml | 4 ++-- .../plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml | 8 ++++---- test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml | 1 + test/plugin/scenarios/kafka-scenario/pom.xml | 9 +++++---- test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml | 6 +++--- test/plugin/scenarios/kylin-jdbc-2.6.x-3.x-4.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/lettuce-scenario/pom.xml | 9 +++++---- test/plugin/scenarios/mariadb-scenario/pom.xml | 5 +++-- test/plugin/scenarios/mongodb-3.x-scenario/pom.xml | 9 +++++---- test/plugin/scenarios/mongodb-4.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/mssql-jdbc-scenario/pom.xml | 5 +++-- test/plugin/scenarios/mssql-jtds-scenario/pom.xml | 5 +++-- test/plugin/scenarios/mybatis-3.x-scenario/pom.xml | 1 + test/plugin/scenarios/mysql-scenario/pom.xml | 5 +++-- test/plugin/scenarios/neo4j-4.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/okhttp-scenario/pom.xml | 8 ++++---- test/plugin/scenarios/okhttp2-scenario/pom.xml | 5 +++-- test/plugin/scenarios/oracle-scenario/pom.xml | 5 +++-- test/plugin/scenarios/pulsar-scenario/pom.xml | 9 +++++---- test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/quasar-scenario/pom.xml | 5 +++-- test/plugin/scenarios/rabbitmq-scenario/pom.xml | 6 +++--- test/plugin/scenarios/redisson-scenario/pom.xml | 5 +++-- test/plugin/scenarios/retransform-class-scenario/pom.xml | 5 +++-- test/plugin/scenarios/sentinel-scenario/pom.xml | 5 +++-- test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml | 3 ++- test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml | 8 ++++---- test/plugin/scenarios/shardingsphere-4.0.x-scenario/pom.xml | 8 ++++---- test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml | 8 ++++---- test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml | 6 +++--- test/plugin/scenarios/sofarpc-scenario/pom.xml | 1 + test/plugin/scenarios/spring-kafka-1.3.x-scenario/pom.xml | 7 ++++--- test/plugin/scenarios/spring-kafka-2.2.x-scenario/pom.xml | 7 ++++--- test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/spring-tx-scenario/pom.xml | 1 + test/plugin/scenarios/thrift-scenario/pom.xml | 2 +- test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml | 8 ++++---- test/plugin/scenarios/undertow-scenario/pom.xml | 1 + test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml | 1 + test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml | 1 + test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml | 1 + test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml | 5 +++-- test/plugin/scenarios/zookeeper-scenario/pom.xml | 9 +++++---- 83 files changed, 229 insertions(+), 162 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index bda8d71..3b40298 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 66869ee..d534048 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>YOUR VERSION</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -78,6 +78,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/activemq-scenario/pom.xml b/test/plugin/scenarios/activemq-scenario/pom.xml index 9addfa4..76f9efc 100644 --- a/test/plugin/scenarios/activemq-scenario/pom.xml +++ b/test/plugin/scenarios/activemq-scenario/pom.xml @@ -33,7 +33,7 @@ <test.framework.version>5.14.5</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-activemq-scenario</name> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -78,6 +78,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml b/test/plugin/scenarios/apm-toolkit-trace-scenario/pom.xml index 4ddb6b5..e4af908 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/avro-scenario/avro-client/pom.xml b/test/plugin/scenarios/avro-scenario/avro-client/pom.xml index 9cab4f0..cec79a8 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 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -87,7 +87,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/avro-scenario/pom.xml b/test/plugin/scenarios/avro-scenario/pom.xml index 630259d..b4e48d0 100644 --- a/test/plugin/scenarios/avro-scenario/pom.xml +++ b/test/plugin/scenarios/avro-scenario/pom.xml @@ -42,7 +42,7 @@ <test.framework.version>1.7.6</test.framework.version> <avro.version>${test.framework.version}</avro.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <dependencies> diff --git a/test/plugin/scenarios/baidu-brpc-scenario/pom.xml b/test/plugin/scenarios/baidu-brpc-scenario/pom.xml index 05b2963..f840f5b 100644 --- a/test/plugin/scenarios/baidu-brpc-scenario/pom.xml +++ b/test/plugin/scenarios/baidu-brpc-scenario/pom.xml @@ -68,6 +68,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/canal-scenario/pom.xml b/test/plugin/scenarios/canal-scenario/pom.xml index 03ee7fe..17045ad 100644 --- a/test/plugin/scenarios/canal-scenario/pom.xml +++ b/test/plugin/scenarios/canal-scenario/pom.xml @@ -34,7 +34,7 @@ <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -97,17 +97,17 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -117,6 +117,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 36e6e62..9d586f9 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 @@ <test.framework.version>3.7.2</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-cassandra-java-driver-3.x-scenario</name> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -100,6 +100,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 ab2cec7..be9db88 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>0.3.1-patch</test.framework.version> - <spring-boot-version>2.5.1</spring-boot-version> + <spring.boot.version>2.5.1</spring.boot.version> </properties> <name>skywalking-clickhouse-0.3.x-scenario</name> @@ -41,7 +41,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -77,6 +77,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/correlation-autotag-scenario/pom.xml b/test/plugin/scenarios/correlation-autotag-scenario/pom.xml index 8c90a98..b102287 100644 --- a/test/plugin/scenarios/correlation-autotag-scenario/pom.xml +++ b/test/plugin/scenarios/correlation-autotag-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>1.6.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-correlation-autotag-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -100,6 +100,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/customize-scenario/pom.xml b/test/plugin/scenarios/customize-scenario/pom.xml index da45cf0..661c223 100644 --- a/test/plugin/scenarios/customize-scenario/pom.xml +++ b/test/plugin/scenarios/customize-scenario/pom.xml @@ -61,6 +61,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/cxf-scenario/pom.xml b/test/plugin/scenarios/cxf-scenario/pom.xml index 2956514..3b4709c 100644 --- a/test/plugin/scenarios/cxf-scenario/pom.xml +++ b/test/plugin/scenarios/cxf-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>3.1.9</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-cxf-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -85,6 +85,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/dbcp-2.x-scenario/pom.xml b/test/plugin/scenarios/dbcp-2.x-scenario/pom.xml index c58590f..7fa0fb1 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 @@ <test.framework.version>2.7.0</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-dbcp-2.x-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -86,6 +86,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/druid-1.x-scenario/pom.xml b/test/plugin/scenarios/druid-1.x-scenario/pom.xml index 1c1eede..7697ee8 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 @@ <test.framework.version>1.1.22</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-druid-1.x-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -86,6 +86,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 27b2e8e..949fd66 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 d962e37..898d1e5 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/dubbo-3.x-scenario/pom.xml b/test/plugin/scenarios/dubbo-3.x-scenario/pom.xml index 0154f35..d6c2e81 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml b/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml index a18c0f6..37096d9 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 @@ <compiler.version>1.8</compiler.version> <!-- Cannot be testing elasticjob (2.0.0 ~ 2.0.2) because the job configuration class incompatible --> <test.framework.version>2.0.3</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -92,6 +92,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml b/test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml index ff091d9..c0a6b4e 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 @@ <test.framework.version>3.0.0</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <h2-version>1.4.184</h2-version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -46,7 +46,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -72,7 +72,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jdbc</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>com.h2database</groupId> @@ -97,6 +97,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml b/test/plugin/scenarios/elasticsearch-7.x-scenario/pom.xml index 6aee670..b9315dc 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 @@ <test.framework.version>7.3.0</test.framework.version> <elasticsearch.version>7.5.0</elasticsearch.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-elasticsearch-7.x-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -118,7 +118,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml b/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml index 1a0d826..b918976 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>YOUR VERSION</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -78,6 +78,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/fastjson-scenario/pom.xml b/test/plugin/scenarios/fastjson-scenario/pom.xml index 5a23302..612b146 100644 --- a/test/plugin/scenarios/fastjson-scenario/pom.xml +++ b/test/plugin/scenarios/fastjson-scenario/pom.xml @@ -29,7 +29,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>1.2.62</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -79,6 +79,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/feign-scenario/pom.xml b/test/plugin/scenarios/feign-scenario/pom.xml index 3a53ebd..6c4a20e 100644 --- a/test/plugin/scenarios/feign-scenario/pom.xml +++ b/test/plugin/scenarios/feign-scenario/pom.xml @@ -32,7 +32,7 @@ <compiler.version>1.8</compiler.version> <test.framework.version>9.0.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <gson.version>2.6.2</gson.version> </properties> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> 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 2c92c88..bea9c60 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>17.10.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -102,6 +102,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 8144c28..2eb7aee 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>6.41.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -102,6 +102,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml b/test/plugin/scenarios/graphql-12.x-scenario/pom.xml index 58dd8ee..1e11b10 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/graphql-8.x-scenario/pom.xml b/test/plugin/scenarios/graphql-8.x-scenario/pom.xml index 0ca568e..9ae3ed5 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/graphql-9.x-scenario/pom.xml b/test/plugin/scenarios/graphql-9.x-scenario/pom.xml index 403aee0..1ec33b1 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/grpc-scenario/pom.xml b/test/plugin/scenarios/grpc-scenario/pom.xml index a70cbcc..95e7e94 100644 --- a/test/plugin/scenarios/grpc-scenario/pom.xml +++ b/test/plugin/scenarios/grpc-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>1.6.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-grpc-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -94,6 +94,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/gson-scenario/pom.xml b/test/plugin/scenarios/gson-scenario/pom.xml index 3beba29..ae24c5e 100644 --- a/test/plugin/scenarios/gson-scenario/pom.xml +++ b/test/plugin/scenarios/gson-scenario/pom.xml @@ -29,7 +29,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>2.8.5</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -79,6 +79,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/h2-scenario/pom.xml b/test/plugin/scenarios/h2-scenario/pom.xml index 1ac8026..2622b42 100644 --- a/test/plugin/scenarios/h2-scenario/pom.xml +++ b/test/plugin/scenarios/h2-scenario/pom.xml @@ -31,7 +31,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>1.4.177</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -84,6 +84,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/hbase-scenario/pom.xml b/test/plugin/scenarios/hbase-scenario/pom.xml index 99a3bab..dd0952b 100644 --- a/test/plugin/scenarios/hbase-scenario/pom.xml +++ b/test/plugin/scenarios/hbase-scenario/pom.xml @@ -31,7 +31,7 @@ <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> <compiler.version>1.8</compiler.version> </properties> @@ -57,7 +57,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -82,12 +82,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -97,6 +97,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/hikaricp-scenario/pom.xml b/test/plugin/scenarios/hikaricp-scenario/pom.xml index 6c37003..9274a92 100644 --- a/test/plugin/scenarios/hikaricp-scenario/pom.xml +++ b/test/plugin/scenarios/hikaricp-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>3.2.0</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-hikaricp-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -86,6 +86,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/hystrix-scenario/pom.xml b/test/plugin/scenarios/hystrix-scenario/pom.xml index 3cab1e4..a8b80d9 100644 --- a/test/plugin/scenarios/hystrix-scenario/pom.xml +++ b/test/plugin/scenarios/hystrix-scenario/pom.xml @@ -30,7 +30,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <test.framework.version>1.4.20</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-hystrix-scenario</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -81,6 +81,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/influxdb-scenario/pom.xml b/test/plugin/scenarios/influxdb-scenario/pom.xml index 6a1a808..c144a87 100644 --- a/test/plugin/scenarios/influxdb-scenario/pom.xml +++ b/test/plugin/scenarios/influxdb-scenario/pom.xml @@ -30,7 +30,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>2.17</test.framework.version> </properties> @@ -41,7 +41,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/test/plugin/scenarios/jackson-scenario/pom.xml b/test/plugin/scenarios/jackson-scenario/pom.xml index 3baf356..31dfc17 100644 --- a/test/plugin/scenarios/jackson-scenario/pom.xml +++ b/test/plugin/scenarios/jackson-scenario/pom.xml @@ -29,7 +29,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>2.9.9</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -90,6 +90,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/jdk-http-scenario/pom.xml b/test/plugin/scenarios/jdk-http-scenario/pom.xml index 081298e..477d1cd 100644 --- a/test/plugin/scenarios/jdk-http-scenario/pom.xml +++ b/test/plugin/scenarios/jdk-http-scenario/pom.xml @@ -30,7 +30,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-jdk-http-scenario</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -70,6 +70,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml b/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml index e268bef..6275e06 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 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>14</compiler.version> - <spring-boot-version>2.2.6.RELEASE</spring-boot-version> + <spring.boot.version>2.2.6.RELEASE</spring.boot.version> <test.framework.version>2.8.5</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> @@ -45,7 +45,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -109,6 +109,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml b/test/plugin/scenarios/jdk17-with-gson-scenario/pom.xml index c2675f7..5b160e4 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 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>17</compiler.version> - <spring-boot-version>2.5.6</spring-boot-version> + <spring.boot.version>2.5.6</spring.boot.version> <test.framework.version>2.8.5</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> @@ -45,7 +45,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/test/plugin/scenarios/jedis-scenario/pom.xml b/test/plugin/scenarios/jedis-scenario/pom.xml index a78f9a4..579e917 100644 --- a/test/plugin/scenarios/jedis-scenario/pom.xml +++ b/test/plugin/scenarios/jedis-scenario/pom.xml @@ -31,7 +31,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>2.9.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-jedis-scenario</name> @@ -41,7 +41,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/pom.xml index 1d50ded..bfde57f 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 @@ <artifactId>jettyclient-scenario</artifactId> <properties> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -67,12 +67,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> diff --git a/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml b/test/plugin/scenarios/jsonrpc4j-1.x-scenario/pom.xml index b36c17b..24041c8 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 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/kafka-scenario/pom.xml b/test/plugin/scenarios/kafka-scenario/pom.xml index ebc971d..064058e 100644 --- a/test/plugin/scenarios/kafka-scenario/pom.xml +++ b/test/plugin/scenarios/kafka-scenario/pom.xml @@ -33,7 +33,7 @@ <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -49,7 +49,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -74,12 +74,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> @@ -94,6 +94,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml b/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml index b589e2e..55f0f9c 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/pom.xml @@ -32,7 +32,7 @@ <compiler.version>1.8</compiler.version> <test.framework.version>1.3.3</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <kotlin.version>1.3.61</kotlin.version> <kotlinx.coroutine.version>1.3.3</kotlinx.coroutine.version> </properties> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -102,7 +102,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 255ac6c..fb76b5d 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 @@ <compiler.version>1.8</compiler.version> <test.framework.version>2.6.3</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> </properties> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -80,6 +80,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/lettuce-scenario/pom.xml b/test/plugin/scenarios/lettuce-scenario/pom.xml index 8d5b121..b7a8100 100644 --- a/test/plugin/scenarios/lettuce-scenario/pom.xml +++ b/test/plugin/scenarios/lettuce-scenario/pom.xml @@ -32,7 +32,7 @@ <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> <okhttp.version>3.4.2</okhttp.version> </properties> @@ -53,7 +53,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -78,12 +78,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -93,6 +93,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mariadb-scenario/pom.xml b/test/plugin/scenarios/mariadb-scenario/pom.xml index 6e155ba..4d0365e 100644 --- a/test/plugin/scenarios/mariadb-scenario/pom.xml +++ b/test/plugin/scenarios/mariadb-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>2.6.0</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-mariadb-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -80,6 +80,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/pom.xml b/test/plugin/scenarios/mongodb-3.x-scenario/pom.xml index d9a1914..08a9f81 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 @@ <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -49,7 +49,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -74,12 +74,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -89,6 +89,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml b/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml index 2899b21..20c0201 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>4.0.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -105,6 +105,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml b/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml index fa83eb9..29c3020 100644 --- a/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml +++ b/test/plugin/scenarios/mssql-jdbc-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>7.0.0.jre8</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-mssql-jdbc-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -81,6 +81,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mssql-jtds-scenario/pom.xml b/test/plugin/scenarios/mssql-jtds-scenario/pom.xml index 514a658..84f0ecc 100644 --- a/test/plugin/scenarios/mssql-jtds-scenario/pom.xml +++ b/test/plugin/scenarios/mssql-jtds-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>1.3.1</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-mssql-jtds-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -80,6 +80,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml b/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml index 2b92a70..ab9a07b 100644 --- a/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/mybatis-3.x-scenario/pom.xml @@ -74,6 +74,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/mysql-scenario/pom.xml b/test/plugin/scenarios/mysql-scenario/pom.xml index 21d1448..4a68c80 100644 --- a/test/plugin/scenarios/mysql-scenario/pom.xml +++ b/test/plugin/scenarios/mysql-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>5.1.5</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-mysql-scenario</name> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -80,6 +80,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/neo4j-4.x-scenario/pom.xml b/test/plugin/scenarios/neo4j-4.x-scenario/pom.xml index 6e52ad3..6224834 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>4.0.0</test.framework.version> - <spring-boot-version>2.5.1</spring-boot-version> + <spring.boot.version>2.5.1</spring.boot.version> </properties> <name>skywalking-neo4j-4.x-scenario</name> @@ -41,7 +41,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -83,6 +83,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/okhttp-scenario/pom.xml b/test/plugin/scenarios/okhttp-scenario/pom.xml index cb90629..01ea100 100644 --- a/test/plugin/scenarios/okhttp-scenario/pom.xml +++ b/test/plugin/scenarios/okhttp-scenario/pom.xml @@ -35,7 +35,7 @@ <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -48,7 +48,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -73,12 +73,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> diff --git a/test/plugin/scenarios/okhttp2-scenario/pom.xml b/test/plugin/scenarios/okhttp2-scenario/pom.xml index f572427..e473c75 100644 --- a/test/plugin/scenarios/okhttp2-scenario/pom.xml +++ b/test/plugin/scenarios/okhttp2-scenario/pom.xml @@ -31,7 +31,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>2.7.5</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -84,6 +84,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/oracle-scenario/pom.xml b/test/plugin/scenarios/oracle-scenario/pom.xml index d47f5d1..2ae0a69 100644 --- a/test/plugin/scenarios/oracle-scenario/pom.xml +++ b/test/plugin/scenarios/oracle-scenario/pom.xml @@ -33,7 +33,7 @@ <test.framework.version>10.2.0.4.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> </properties> <name>skywalking-oracle-scenario</name> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -78,6 +78,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/pulsar-scenario/pom.xml b/test/plugin/scenarios/pulsar-scenario/pom.xml index d8df64e..a26335f 100644 --- a/test/plugin/scenarios/pulsar-scenario/pom.xml +++ b/test/plugin/scenarios/pulsar-scenario/pom.xml @@ -35,7 +35,7 @@ <!-- --> <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -48,7 +48,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -73,12 +73,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -88,6 +88,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 5f71c79..d0e6be5 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 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>2.0.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> <okhttp.version>3.0.0</okhttp.version> </properties> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -90,6 +90,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/quasar-scenario/pom.xml b/test/plugin/scenarios/quasar-scenario/pom.xml index 7e28250..0b4f89e 100644 --- a/test/plugin/scenarios/quasar-scenario/pom.xml +++ b/test/plugin/scenarios/quasar-scenario/pom.xml @@ -34,7 +34,7 @@ <test.framework.version>0.7.9</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <okhttp.version>3.6.0</okhttp.version> </properties> @@ -45,7 +45,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -88,6 +88,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/rabbitmq-scenario/pom.xml b/test/plugin/scenarios/rabbitmq-scenario/pom.xml index b011609..76670eb 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/pom.xml +++ b/test/plugin/scenarios/rabbitmq-scenario/pom.xml @@ -34,7 +34,7 @@ <docker.image.version>${test.framework.version}</docker.image.version> <!-- --> <log4j.version>2.8.1</log4j.version> - <spring-boot-version>2.1.4.RELEASE</spring-boot-version> + <spring.boot.version>2.1.4.RELEASE</spring.boot.version> </properties> <dependencies> @@ -47,7 +47,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <exclusions> <exclusion> <artifactId>spring-boot-starter-logging</artifactId> @@ -68,7 +68,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> diff --git a/test/plugin/scenarios/redisson-scenario/pom.xml b/test/plugin/scenarios/redisson-scenario/pom.xml index cdce5c1..a055c35 100644 --- a/test/plugin/scenarios/redisson-scenario/pom.xml +++ b/test/plugin/scenarios/redisson-scenario/pom.xml @@ -28,7 +28,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> <test.framework.version>3.11.5</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> </properties> @@ -44,7 +44,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -54,6 +54,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/retransform-class-scenario/pom.xml b/test/plugin/scenarios/retransform-class-scenario/pom.xml index f1bd71b..75dc03f 100644 --- a/test/plugin/scenarios/retransform-class-scenario/pom.xml +++ b/test/plugin/scenarios/retransform-class-scenario/pom.xml @@ -30,7 +30,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -41,7 +41,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -86,6 +86,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/sentinel-scenario/pom.xml b/test/plugin/scenarios/sentinel-scenario/pom.xml index 48fc07c..3dc47ed 100644 --- a/test/plugin/scenarios/sentinel-scenario/pom.xml +++ b/test/plugin/scenarios/sentinel-scenario/pom.xml @@ -30,7 +30,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <test.framework.version>1.7.2</test.framework.version> - <spring-boot-version>2.1.18.RELEASE</spring-boot-version> + <spring.boot.version>2.1.18.RELEASE</spring.boot.version> </properties> <name>skywalking-sentinel-scenario</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -81,6 +81,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml b/test/plugin/scenarios/servicecomb-1.x-scenario/pom.xml index 0fc103d..d9cc16e 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 @@ <compiler.version>1.8</compiler.version> <test.framework.version>1.3.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <jackson.version>2.9.4</jackson.version> </properties> @@ -108,6 +108,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml b/test/plugin/scenarios/shardingsphere-3.x-scenario/pom.xml index af3ee51..ae262cd 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 @@ <test.framework.version>3.0.0</test.framework.version> <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -48,7 +48,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -73,12 +73,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>com.h2database</groupId> 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 717a042..e5c1c07 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 @@ <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -50,7 +50,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -75,12 +75,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>com.h2database</groupId> diff --git a/test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml b/test/plugin/scenarios/shardingsphere-4.x-scenario/pom.xml index 90a4fc4..f2766d5 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 @@ <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -50,7 +50,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -75,12 +75,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>com.h2database</groupId> 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 74225f4..de81967 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 @@ <test.framework.version>5.0.0-beta</test.framework.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <dependencies> @@ -49,12 +49,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>com.h2database</groupId> diff --git a/test/plugin/scenarios/sofarpc-scenario/pom.xml b/test/plugin/scenarios/sofarpc-scenario/pom.xml index bae0326..de6d01c 100644 --- a/test/plugin/scenarios/sofarpc-scenario/pom.xml +++ b/test/plugin/scenarios/sofarpc-scenario/pom.xml @@ -68,6 +68,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 3c82624..59159fc 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 @@ <compiler.version>1.8</compiler.version> <test.framework.version>1.3.11.RELEASE</test.framework.version> <log4j.version>2.6.2</log4j.version> - <spring-boot-version>1.5.22.RELEASE</spring-boot-version> + <spring.boot.version>1.5.22.RELEASE</spring.boot.version> <kafka-version>0.11.0.3</kafka-version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -41,12 +41,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jdbc</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.kafka</groupId> @@ -83,6 +83,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 62d518d..d4a71ff 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 @@ <compiler.version>1.8</compiler.version> <test.framework.version>2.2.9.RELEASE</test.framework.version> <log4j.version>2.6.2</log4j.version> - <spring-boot-version>2.1.9.RELEASE</spring-boot-version> + <spring.boot.version>2.1.9.RELEASE</spring.boot.version> <kafka-version>2.0.1</kafka-version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -41,12 +41,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jdbc</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.kafka</groupId> @@ -83,6 +83,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 b00bdc1..2fa53f9 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 @@ <compiler.version>1.8</compiler.version> <test.framework.version>2.3.3.RELEASE</test.framework.version> <log4j.version>2.6.2</log4j.version> - <spring-boot-version>2.3.2.RELEASE</spring-boot-version> + <spring.boot.version>2.3.2.RELEASE</spring.boot.version> <kafka-version>2.3.1</kafka-version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -41,7 +41,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.kafka</groupId> @@ -78,6 +78,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/spring-tx-scenario/pom.xml b/test/plugin/scenarios/spring-tx-scenario/pom.xml index 6c4e693..4aa42ad 100644 --- a/test/plugin/scenarios/spring-tx-scenario/pom.xml +++ b/test/plugin/scenarios/spring-tx-scenario/pom.xml @@ -58,6 +58,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${test.framework.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/thrift-scenario/pom.xml b/test/plugin/scenarios/thrift-scenario/pom.xml index 974de57..88fe6d4 100644 --- a/test/plugin/scenarios/thrift-scenario/pom.xml +++ b/test/plugin/scenarios/thrift-scenario/pom.xml @@ -31,7 +31,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>0.12.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> <thrift.version>${test.framework.version}</thrift.version> </properties> diff --git a/test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml b/test/plugin/scenarios/thrift-scenario/thrift-client/pom.xml index 56ae7c6..7a8edf2 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 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> @@ -52,12 +52,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-log4j2</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -67,7 +67,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/undertow-scenario/pom.xml b/test/plugin/scenarios/undertow-scenario/pom.xml index 8df511a..f991ec1 100644 --- a/test/plugin/scenarios/undertow-scenario/pom.xml +++ b/test/plugin/scenarios/undertow-scenario/pom.xml @@ -63,6 +63,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 e0af4c1..55c5742 100644 --- a/test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml +++ b/test/plugin/scenarios/vertx-eventbus-3.x-scenario/pom.xml @@ -59,6 +59,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 4f96399..715de34 100644 --- a/test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml +++ b/test/plugin/scenarios/vertx-web-3.54minus-scenario/pom.xml @@ -49,6 +49,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 d8dbe1d..5f8ca3c 100644 --- a/test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml +++ b/test/plugin/scenarios/vertx-web-3.6plus-scenario/pom.xml @@ -54,6 +54,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> 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 3d93618..e53f811 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 @@ <compiler.version>1.8</compiler.version> <!-- Cannot be auto testing xxl-job (2.0.0 ~ 2.1.2) because the xxl-job server incompatible --> <test.framework.version>2.2.0</test.framework.version> - <spring-boot-version>2.1.6.RELEASE</spring-boot-version> + <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <lombok.version>1.18.20</lombok.version> </properties> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -103,6 +103,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals> diff --git a/test/plugin/scenarios/zookeeper-scenario/pom.xml b/test/plugin/scenarios/zookeeper-scenario/pom.xml index 2f91a35..8601027 100644 --- a/test/plugin/scenarios/zookeeper-scenario/pom.xml +++ b/test/plugin/scenarios/zookeeper-scenario/pom.xml @@ -32,7 +32,7 @@ <docker.image.version>${test.framework.version}</docker.image.version> <log4j.version>2.6.2</log4j.version> <spring.version>4.3.8.RELEASE</spring.version> - <spring-boot-version>1.5.2.RELEASE</spring-boot-version> + <spring.boot.version>1.5.2.RELEASE</spring.boot.version> </properties> <name>skywalking-zookeeper-scenario</name> @@ -57,7 +57,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -82,12 +82,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>${spring-boot-version}</version> + <version>${spring.boot.version}</version> </dependency> </dependencies> @@ -97,6 +97,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring.boot.version}</version> <executions> <execution> <goals>
