test-java21

wangliang181230 · Sep 22, 2023 · 3f8e636 · 3f8e636
1 parent ecb7ef7
commit 3f8e636
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 17 ]
+        java: [ 21 ] # TODO: 测试java21，后面恢复成8,17
     steps:
       # step 1
       - name: "Checkout"

diff --git a/.github/workflows/license-checker.yaml b/.github/workflows/license-checker.yaml
@@ -26,7 +26,7 @@ jobs:
           log: info
           config: .licenserc.yaml
           mode: check
-      # step 5 heck dependencies
+      # step 5 check dependencies
       - name: Check Dependencies' License
         uses: apache/skywalking-eyes/dependency@8fc52baabc14c86294d96034bcc194cfa7f76b05
         with:

diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
         druid: [
           1.2.19,
           #1.2.18, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
@@ -34,7 +34,7 @@ jobs:
           1.2.1,
           1.2.0,
 
-          # not support druid:1.x
+          # not support druid:1.1.x
           #1.1.24,
           #1.1.23,
           #1.1.22,

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,11 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 21 ]
         springboot: [
-          2.7.9          -Dspring-framework.version=5.3.25,
-          2.6.14         -Dspring-framework.version=5.3.24,
-          2.5.14         -Dspring-framework.version=5.3.20,
+          2.7.16         -Dspring-framework.version=5.3.30,
+          2.6.15         -Dspring-framework.version=5.3.27,
+          2.5.15         -Dspring-framework.version=5.3.27,
           2.4.13         -Dspring-framework.version=5.3.13,
           2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
           2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,
@@ -59,9 +59,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17 ]
+        java: [ 17, 21 ]
         springboot: [
-          3.0.4 -Dspring-framework.version=6.0.6 -Dspring-boot-for-server.version=2.5.14 -Dspring-framework-for-server.version=5.3.20 -Dkotlin-maven-plugin.version=1.7.22
+          3.1.4  -Dspring-framework.version=6.0.12 -Pdependencies-for-springboot3-1-or-above,
+          3.0.11 -Dspring-framework.version=6.0.12,
         ]
     steps:
       # step 1
@@ -79,7 +80,7 @@ jobs:
       # step 4
       - name: "Test with Maven"
         run: |
-          ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dcheckstyle.skip=true -Dlicense.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          ./mvnw -T 4C clean test -Dspring-boot.version=${{ matrix.springboot }} -Dspring-boot-for-server.version=2.5.14 -Dspring-framework-for-server.version=5.3.20 -Dkotlin-maven-plugin.version=1.7.22 -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
 
   # job 3
   arm64-test:
@@ -88,9 +89,9 @@ jobs:
       fail-fast: false
       matrix:
         springboot: [
-          2.7.9          -Dspring-framework.version=5.3.25,
-          2.6.14         -Dspring-framework.version=5.3.24,
-          2.5.14         -Dspring-framework.version=5.3.20,
+          2.7.16         -Dspring-framework.version=5.3.30,
+          2.6.15         -Dspring-framework.version=5.3.27,
+          2.5.15         -Dspring-framework.version=5.3.27,
           2.4.13         -Dspring-framework.version=5.3.13,
           2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
           2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -717,4 +717,26 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <profiles>
+        <profile>
+            <id>dependencies-for-springboot3-1-or-above</id>
+            <properties>
+                <httpcore.version>4.4.16</httpcore.version>
+                <httpclient.version>4.5.14</httpclient.version>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                    <version>${httpcore.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                    <version>${httpclient.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>