From 54978b2a8ff850dcba1a793e54686d652de5f2ec Mon Sep 17 00:00:00 2001 From: Luca Bassi Date: Thu, 7 Nov 2024 18:11:45 +0100 Subject: [PATCH] Upgrade to Java 17 --- .github/workflows/maven.yml | 4 ++-- Dockerfile | 4 ++-- README.md | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 048fb743..2fce398b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,11 +26,11 @@ jobs: if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Cache Maven packages uses: actions/cache@v4 with: diff --git a/Dockerfile b/Dockerfile index 21fd5b1d..47b7d333 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # https://spring.io/guides/topicals/spring-boot-docker#_multi_stage_build -FROM eclipse-temurin:11-jdk-alpine as build +FROM eclipse-temurin:17-jdk-alpine as build WORKDIR /workspace/app RUN apk add maven COPY pom.xml . @@ -12,7 +12,7 @@ COPY src src RUN mvn package -s maven/cnaf-mirror-settings.xml -Dmaven.test.skip RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar) -FROM eclipse-temurin:11-centos7 +FROM eclipse-temurin:17-centos7 ENV STORM_WEBDAV_JVM_OPTS="-Dspring.profiles.active=dev" ARG DEPENDENCY=/workspace/app/target/dependency diff --git a/README.md b/README.md index d39889b4..efa56e83 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The StoRM webdav service provides http/webdav access to resources shared on a fi You will need: - git -- java 11 +- java 17 - maven 3 ## Build instructions diff --git a/pom.xml b/pom.xml index cf3874ed..f0be14a3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 1.9.0 0.8.8 - 11 + 17 2.7.18