kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add JDK 16 to test matrix, move bom to backend profile (#7139)

This commit is contained in:
kezhenxu94 2021-06-20 23:24:02 +08:00 committed by GitHub
parent 6caf29733f
commit ab6285c5a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e.jdk-versions.yaml vendored
View File

@ -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 }}

1
CHANGES.md
View File

@ -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.

6
pom.xml
View File

@ -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>

2
test/e2e/pom.xml
View File

@ -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>

4
test/plugin/archetypes/jvm/src/main/resources/archetype-resources/pom.xml
View File

@ -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>
</project>

2
test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml
View File

@ -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>

4
test/plugin/pom.xml
View File

@ -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>
</project>

2
test/plugin/scenarios/asynchttpclient-scenario/pom.xml
View File

@ -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>

4
test/plugin/scenarios/elasticjob-2.x-scenario/pom.xml
View File

@ -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>
</project>

2
test/plugin/scenarios/elasticsearch-5.x-scenario/pom.xml
View File

@ -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>

4
test/plugin/scenarios/exception-checker-spring-scenario/pom.xml
View File

@ -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>
</project>

2
test/plugin/scenarios/exception-checker-tomcat-scenario/pom.xml
View File

@ -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>

4
test/plugin/scenarios/finagle-17.10.x-scenario/pom.xml
View File

@ -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>
</project>

4
test/plugin/scenarios/finagle-6.44.x-scenario/pom.xml
View File

@ -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>
</project>

2
test/plugin/scenarios/graphql-12.x-scenario/pom.xml
View File

@ -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>

2
test/plugin/scenarios/graphql-8.x-scenario/pom.xml
View File

@ -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>

2
test/plugin/scenarios/graphql-9.x-scenario/pom.xml
View File

@ -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>

4
test/plugin/scenarios/h2-scenario/pom.xml
View File

@ -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>
</project>

2
test/plugin/scenarios/httpasyncclient-scenario/pom.xml
View File

@ -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>

4
test/plugin/scenarios/mongodb-4.x-scenario/pom.xml
View File

@ -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>
</project>

4
test/plugin/scenarios/quartz-scheduler-2.x-scenario/pom.xml
View File

@ -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>
</project>

4
test/plugin/scenarios/retransform-class-scenario/pom.xml
View File

@ -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>
</project>

2
test/plugin/scenarios/retransform-class-tomcat-scenario/pom.xml
View File

@ -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>

2
test/plugin/scenarios/spring-scheduled-scenario/pom.xml
View File

@ -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>

2
test/plugin/scenarios/struts2.3-scenario/pom.xml
View File

@ -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>

2
test/plugin/scenarios/struts2.5-scenario/pom.xml
View File

@ -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>

2
test/plugin/scenarios/thrift-scenario/pom.xml
View File

@ -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>

4
test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml
View File

@ -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>
</project>