升级test.yml中的springboot版本。

wangliang181230 · Sep 22, 2023 · aef3d0d · aef3d0d
1 parent 61249ec
commit aef3d0d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         java: [ 8, 11, 17, 21 ]
         springboot: [
-          2.7.15         -Dspring-framework.version=5.3.29,
+          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,
@@ -61,8 +61,8 @@ jobs:
       matrix:
         java: [ 17, 21 ]
         springboot: [
-          3.1.3  -Dspring-framework.version=6.0.11,
-          3.0.10 -Dspring-framework.version=6.0.11,
+          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
@@ -89,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         springboot: [
-          2.7.15         -Dspring-framework.version=5.3.29,
+          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,

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -70,8 +70,6 @@
         <netty.version>4.1.86.Final</netty.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <sofa.hessian.version>4.0.3</sofa.hessian.version>
-        <httpcore.version>4.4.16</httpcore.version>
-        <httpclient.version>4.5.14</httpclient.version>
 
         <protobuf.version>3.16.3</protobuf.version>
         <grpc.version>1.27.1</grpc.version>
@@ -172,16 +170,6 @@
                 <artifactId>hessian</artifactId>
                 <version>${sofa.hessian.version}</version>
             </dependency>
-            <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>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
@@ -723,4 +711,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>