From 69c449263aeac7f9432fce0c97823b87290613dc Mon Sep 17 00:00:00 2001 From: wlanboy Date: Thu, 4 Jan 2024 09:26:55 +0100 Subject: [PATCH] update to java 21 & spring boot 3.2.1 && spring-cloud 2023.0.0 --- .github/workflows/dockerpublish.yml | 4 ++-- .github/workflows/maven.yml | 4 ++-- Dockerfile | 2 +- Jenkinsfile | 2 +- pom.xml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml index 0ac9795..cb8f374 100644 --- 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/maven.yml b/.github/workflows/maven.yml index a4ad69a..75a5fd8 100644 --- 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 -DskipTests --file pom.xml diff --git a/Dockerfile b/Dockerfile index a65733a..99ded19 100644 --- 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 index bc27f9f..6b99ffc 100644 --- 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 index 537b9c1..d854847 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.6 + 3.2.1 @@ -19,9 +19,9 @@ UTF-8 UTF-8 - 17 + 21 - 2022.0.2 + 2023.0.0