update to java 21 & spring boot 3.2.1 && spring-cloud 2023.0.0

wlanboy · Jan 4, 2024 · eabd572 · eabd572
1 parent d9ba7fb
commit eabd572
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
     - name: Build with Maven
       run: mvn -B package --file pom.xml -DskipTests=true
     - name: Publish to Registry

diff --git a/.github/workflows/githubpublish.yml b/.github/workflows/githubpublish.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
     - name: Build with Maven
       run: mvn -B package --file pom.xml -DskipTests=true
 

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,9 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
     - name: Build with Maven
       run: mvn -B package --file pom.xml -DskipTests=true
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 VOLUME /tmp
 ARG JAR_FILE
 ADD ${JAR_FILE} app.jar

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
   agent any
   tools { 
-     jdk 'java11slave' 
+     jdk 'java21slave' 
   }
   options {
     buildDiscarder(logRotator(numToKeepStr: '1'))

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	    <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent -->
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.6</version>
+		<version>3.2.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.wlanboy</groupId>
@@ -18,11 +18,11 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-dependencies -->
-		<spring-cloud.version>2022.0.2</spring-cloud.version>
+		<spring-cloud.version>2023.0.0</spring-cloud.version>
 		<!-- https://mvnrepository.com/artifact/net.logstash.logback/logstash-logback-encoder -->
-		<logstash-logback.version>7.3</logstash-logback.version>
+		<logstash-logback.version>7.4</logstash-logback.version>
 	</properties>
 
 	<dependencyManagement>
@@ -111,8 +111,6 @@
 					<additionalProperties>
 						<encoding.source>UTF-8</encoding.source>
 						<encoding.reporting>UTF-8</encoding.reporting>
-						<java.source>${maven.compiler.source}</java.source>
-						<java.target>${maven.compiler.target}</java.target>
 					</additionalProperties>
 					</configuration>
 				</execution>