support java 17 (#4060)

apolloconfig · Oct 25, 2021 · fb135bb · fb135bb
1 parent 2b25529
commit fb135bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11]
+        jdk: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
@@ -48,6 +48,9 @@ jobs:
     - name: JDK 11 
       if: matrix.jdk == '11'
       run: mvn clean compile -Dmaven.gitcommitid.skip=true
+    - name: JDK 17
+      if: matrix.jdk == '17'
+      run: mvn clean compile -Dmaven.gitcommitid.skip=true
     - name: Upload coverage to Codecov
       if: matrix.jdk == '8'
       uses: codecov/codecov-action@v1

diff --git a/CHANGES.md b/CHANGES.md
@@ -20,6 +20,7 @@ Apollo 2.0.0
 * [public namespace basic function](https://github.com/apolloconfig/apollo/pull/3850)
 * [Bump version to 2.0.0 and drop java 1.7 support](https://github.com/apolloconfig/apollo/pull/4015)
 * [Optimize home page style](https://github.com/apolloconfig/apollo/pull/4052)
+* [Support Java 17](https://github.com/apolloconfig/apollo/pull/4060)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/pom.xml b/pom.xml
@@ -63,9 +63,9 @@
 		<revision>2.0.0-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.4.2</spring-boot.version>
-		<spring-cloud.version>2020.0.1</spring-cloud.version>
-		<jaxb.version>2.3.0</jaxb.version>
+		<spring-boot.version>2.4.12</spring-boot.version>
+		<spring-cloud.version>2020.0.4</spring-cloud.version>
+		<jaxb.version>2.3.1</jaxb.version>
 		<javax.activation.version>1.1.1</javax.activation.version>
 		<javax.mail.version>1.6.2</javax.mail.version>
 		<javassist.version>3.23.1-GA</javassist.version>
@@ -173,7 +173,7 @@
 			<dependency>
 				<groupId>com.google.inject</groupId>
 				<artifactId>guice</artifactId>
-				<version>4.1.0</version>
+				<version>5.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-lang</groupId>