This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch jdk/16 in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 417344c367840750c3469ecbb4badee5a25cd72c Author: kezhenxu94 <[email protected]> AuthorDate: Sun Jun 20 21:26:28 2021 +0800 Add JDK 16 to test matrix, move bom to backend profile --- .github/workflows/e2e.jdk-versions.yaml | 2 +- CHANGES.md | 1 + pom.xml | 6 +++--- test/e2e/pom.xml | 2 +- .../archetypes/jvm/src/main/resources/archetype-resources/pom.xml | 4 ++-- .../tomcat/src/main/resources/archetype-resources/pom.xml | 2 +- test/plugin/pom.xml | 4 ++-- test/plugin/scenarios/asynchttpclient-scenario/pom.xml | 2 +- test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml | 4 ++-- test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml | 2 +- test/plugin/scenarios/exception-checker-spring-scenario/pom.xml | 4 ++-- test/plugin/scenarios/exception-checker-tomcat-scenario/pom.xml | 2 +- test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml | 4 ++-- test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml | 4 ++-- test/plugin/scenarios/graphql-12.x-scenario/pom.xml | 2 +- test/plugin/scenarios/graphql-8.x-scenario/pom.xml | 2 +- test/plugin/scenarios/graphql-9.x-scenario/pom.xml | 2 +- test/plugin/scenarios/h2-scenario/pom.xml | 4 ++-- test/plugin/scenarios/httpasyncclient-scenario/pom.xml | 2 +- test/plugin/scenarios/mongodb-4.x-scenario/pom.xml | 4 ++-- test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml | 4 ++-- test/plugin/scenarios/retransform-class-scenario/pom.xml | 4 ++-- test/plugin/scenarios/retransform-class-tomcat-scenario/pom.xml | 2 +- test/plugin/scenarios/spring-scheduled-scenario/pom.xml | 2 +- test/plugin/scenarios/struts2.3-scenario/pom.xml | 2 +- test/plugin/scenarios/struts2.5-scenario/pom.xml | 2 +- test/plugin/scenarios/thrift-scenario/pom.xml | 2 +- test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml | 4 ++-- 28 files changed, 41 insertions(+), 40 deletions(-) diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index 7798a11..b4236d6 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -33,7 +33,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - jdk: [8, 9, 10, 11, 12, 13, 14, 15] + jdk: [8, 9, 10, 11, 12, 13, 14, 15, 16] env: SW_SIMPLE_CASE: jdk SW_AGENT_JDK_VERSION: ${{ matrix.jdk }} diff --git a/CHANGES.md b/CHANGES.md index 0d0705d..62b3e03 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Release Notes. ------------------ #### Project * Extract dependency management to a bom. +* Add JDK 16 to test matrix. #### Java Agent * Supports modifying span attributes in async mode. diff --git a/pom.xml b/pom.xml index 9788b61..471382b 100755 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,6 @@ <modules> <module>apm-commons</module> <module>apm-protocol</module> - <module>oap-server-bom</module> - <module>oap-server-bom-es7</module> </modules> <packaging>pom</packaging> @@ -94,6 +92,8 @@ </activation> <modules> <module>oap-server</module> + <module>oap-server-bom</module> + <module>oap-server-bom-es7</module> </modules> </profile> <profile> @@ -188,7 +188,7 @@ <checkstyle.version>6.18</checkstyle.version> <junit.version>4.12</junit.version> <mockito-core.version>3.5.13</mockito-core.version> - <lombok.version>1.18.16</lombok.version> + <lombok.version>1.18.20</lombok.version> <!-- core lib dependency --> <bytebuddy.version>1.10.19</bytebuddy.version> diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml index 7245949..d4e3680 100644 --- a/test/e2e/pom.xml +++ b/test/e2e/pom.xml @@ -65,7 +65,7 @@ <guava.version>28.2-jre</guava.version> <h2.version>1.4.199</h2.version> <mysql.version>8.0.13</mysql.version> - <lombok.version>1.18.16</lombok.version> + <lombok.version>1.18.20</lombok.version> <kafka-clients.version>2.4.1</kafka-clients.version> <jacoco.version>0.8.6</jacoco.version> 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 026b500..66869ee 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 @@ -32,7 +32,7 @@ <compiler.version>1.8</compiler.version> <test.framework.version>YOUR VERSION</test.framework.version> <spring-boot-version>2.1.6.RELEASE</spring-boot-version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-${scenario_name}</name> @@ -115,4 +115,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml b/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml index 7d4acfb..aa00c7d 100644 --- a/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml +++ b/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml @@ -33,7 +33,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>YOUR VERSION</test.framework.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <dependencies> diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml index eb7afeb..d4811bf 100644 --- a/test/plugin/pom.xml +++ b/test/plugin/pom.xml @@ -44,7 +44,7 @@ <junit.version>4.11</junit.version> <guava.version>20.0</guava.version> <gson.version>2.8.5</gson.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <snakeyaml.version>1.24</snakeyaml.version> <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> @@ -163,4 +163,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/asynchttpclient-scenario/pom.xml b/test/plugin/scenarios/asynchttpclient-scenario/pom.xml index 91453ce..4c008b8 100644 --- a/test/plugin/scenarios/asynchttpclient-scenario/pom.xml +++ b/test/plugin/scenarios/asynchttpclient-scenario/pom.xml @@ -35,7 +35,7 @@ <test.framework.version>4.1.2</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <spring-boot.version>1.5.9.RELEASE</spring-boot.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <log4j.version>2.8.1</log4j.version> </properties> diff --git a/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml b/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml index f6dd1e2..a18c0f6 100644 --- a/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml @@ -33,7 +33,7 @@ <!-- 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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <okhttp-version>3.0.0</okhttp-version> </properties> @@ -129,4 +129,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml b/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml index 4f0bf3a..d28eb95 100644 --- a/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml +++ b/test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml @@ -35,7 +35,7 @@ <docker.image.version>${test.framework.version}</docker.image.version> <spring-boot.version>2.1.4.RELEASE</spring-boot.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <log4j.version>2.8.1</log4j.version> </properties> diff --git a/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml b/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml index 47fb833..1a0d826 100644 --- a/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml +++ b/test/plugin/scenarios/exception-checker-spring-scenario/pom.xml @@ -32,7 +32,7 @@ <compiler.version>1.8</compiler.version> <test.framework.version>YOUR VERSION</test.framework.version> <spring-boot-version>2.1.6.RELEASE</spring-boot-version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-exception-checker-spring</name> @@ -115,4 +115,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/exception-checker-tomcat-scenario/pom.xml b/test/plugin/scenarios/exception-checker-tomcat-scenario/pom.xml index 813f35e..beac42f 100644 --- a/test/plugin/scenarios/exception-checker-tomcat-scenario/pom.xml +++ b/test/plugin/scenarios/exception-checker-tomcat-scenario/pom.xml @@ -32,7 +32,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <spring.framework.version>4.3.0.RELEASE</spring.framework.version> </properties> 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 08e963a..2c92c88 100644 --- a/test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml +++ b/test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml @@ -32,7 +32,7 @@ <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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-finagle-17.10.x-scenario</name> @@ -167,4 +167,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> 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 95ee340..8144c28 100644 --- a/test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml +++ b/test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml @@ -32,7 +32,7 @@ <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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-finagle-6.44.x-scenario</name> @@ -167,4 +167,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml b/test/plugin/scenarios/graphql-12.x-scenario/pom.xml index 77ced6c..58dd8ee 100644 --- a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml +++ b/test/plugin/scenarios/graphql-12.x-scenario/pom.xml @@ -34,7 +34,7 @@ <compiler.version>1.8</compiler.version> <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>9.0</test.framework.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <test.framework>graphql</test.framework> </properties> diff --git a/test/plugin/scenarios/graphql-8.x-scenario/pom.xml b/test/plugin/scenarios/graphql-8.x-scenario/pom.xml index 59412f0..0ca568e 100644 --- a/test/plugin/scenarios/graphql-8.x-scenario/pom.xml +++ b/test/plugin/scenarios/graphql-8.x-scenario/pom.xml @@ -34,7 +34,7 @@ <compiler.version>1.8</compiler.version> <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>8.0</test.framework.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <test.framework>graphql</test.framework> </properties> diff --git a/test/plugin/scenarios/graphql-9.x-scenario/pom.xml b/test/plugin/scenarios/graphql-9.x-scenario/pom.xml index 4ce1b1e..403aee0 100644 --- a/test/plugin/scenarios/graphql-9.x-scenario/pom.xml +++ b/test/plugin/scenarios/graphql-9.x-scenario/pom.xml @@ -34,7 +34,7 @@ <compiler.version>1.8</compiler.version> <spring.boot.version>2.1.6.RELEASE</spring.boot.version> <test.framework.version>9.0</test.framework.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <test.framework>graphql</test.framework> </properties> diff --git a/test/plugin/scenarios/h2-scenario/pom.xml b/test/plugin/scenarios/h2-scenario/pom.xml index e0f1dd2..1ac8026 100644 --- a/test/plugin/scenarios/h2-scenario/pom.xml +++ b/test/plugin/scenarios/h2-scenario/pom.xml @@ -32,7 +32,7 @@ <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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-h2-scenario</name> @@ -121,4 +121,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/httpasyncclient-scenario/pom.xml b/test/plugin/scenarios/httpasyncclient-scenario/pom.xml index 6daabea..af4e2e9 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/pom.xml +++ b/test/plugin/scenarios/httpasyncclient-scenario/pom.xml @@ -32,7 +32,7 @@ <test.framework.version>4.1.2</test.framework.version> <docker.image.version>${test.framework.version}</docker.image.version> <spring-boot.version>1.5.9.RELEASE</spring-boot.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <log4j.version>2.8.1</log4j.version> </properties> diff --git a/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml b/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml index 2552518..2899b21 100644 --- a/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml +++ b/test/plugin/scenarios/mongodb-4.x-scenario/pom.xml @@ -32,7 +32,7 @@ <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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-mongodb-4.x-scenario</name> @@ -142,4 +142,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> 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 3b04494..5f71c79 100644 --- a/test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml @@ -32,7 +32,7 @@ <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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <okhttp.version>3.0.0</okhttp.version> </properties> @@ -127,4 +127,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/retransform-class-scenario/pom.xml b/test/plugin/scenarios/retransform-class-scenario/pom.xml index 0119dd2..f1bd71b 100644 --- a/test/plugin/scenarios/retransform-class-scenario/pom.xml +++ b/test/plugin/scenarios/retransform-class-scenario/pom.xml @@ -31,7 +31,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <spring-boot-version>2.1.6.RELEASE</spring-boot-version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-retransform-class-scenario</name> @@ -123,4 +123,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/test/plugin/scenarios/retransform-class-tomcat-scenario/pom.xml b/test/plugin/scenarios/retransform-class-tomcat-scenario/pom.xml index b09820b..a9f0ea5 100644 --- a/test/plugin/scenarios/retransform-class-tomcat-scenario/pom.xml +++ b/test/plugin/scenarios/retransform-class-tomcat-scenario/pom.xml @@ -32,7 +32,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <spring.version>4.3.0.RELEASE</spring.version> </properties> diff --git a/test/plugin/scenarios/spring-scheduled-scenario/pom.xml b/test/plugin/scenarios/spring-scheduled-scenario/pom.xml index cbdeb1a..024c739 100644 --- a/test/plugin/scenarios/spring-scheduled-scenario/pom.xml +++ b/test/plugin/scenarios/spring-scheduled-scenario/pom.xml @@ -32,7 +32,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <!-- Cannot be testing spring(3.2.0 ~ 3.2.8) because the tomcat image unsupported jdk1.7 --> <test.framework.version>3.1.0.RELEASE</test.framework.version> <test.framework>spring-scheduled</test.framework> diff --git a/test/plugin/scenarios/struts2.3-scenario/pom.xml b/test/plugin/scenarios/struts2.3-scenario/pom.xml index 1f055d9..68b240c 100644 --- a/test/plugin/scenarios/struts2.3-scenario/pom.xml +++ b/test/plugin/scenarios/struts2.3-scenario/pom.xml @@ -33,7 +33,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>2.3.4</test.framework.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <dependencies> diff --git a/test/plugin/scenarios/struts2.5-scenario/pom.xml b/test/plugin/scenarios/struts2.5-scenario/pom.xml index 3fcbfb6..77bf0fa 100644 --- a/test/plugin/scenarios/struts2.5-scenario/pom.xml +++ b/test/plugin/scenarios/struts2.5-scenario/pom.xml @@ -33,7 +33,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <compiler.version>1.8</compiler.version> <test.framework.version>2.5.1</test.framework.version> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <dependencies> diff --git a/test/plugin/scenarios/thrift-scenario/pom.xml b/test/plugin/scenarios/thrift-scenario/pom.xml index 27fe430..974de57 100644 --- a/test/plugin/scenarios/thrift-scenario/pom.xml +++ b/test/plugin/scenarios/thrift-scenario/pom.xml @@ -32,7 +32,7 @@ <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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> <thrift.version>${test.framework.version}</thrift.version> </properties> 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 1ac45c8..3d93618 100644 --- a/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml @@ -33,7 +33,7 @@ <!-- 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> - <lombok.version>1.18.10</lombok.version> + <lombok.version>1.18.20</lombok.version> </properties> <name>skywalking-xxl-job-2.x-scenario</name> @@ -140,4 +140,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>
