Bump java 25 (#623)

Author: olevitt

.github/workflows/ci.yml

@@ -19,11 +19,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - name: Set current version
         run: mvn -B versions:set -DnewVersion=${GITHUB_REF##*/} -DprocessAllModules -DgenerateBackupPoms=false
       - name: Build with Maven
@@ -37,11 +37,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - name: Check Spotless CodingStyle
         run: mvn spotless:check
   docker:

.java-version

@@ -1 +1 @@
-21.0
+25.0

onyxia-api/Dockerfile

@@ -1,13 +1,13 @@
 FROM eclipse-temurin:25-jre AS extract
 ARG JAR_FILE=target/*.jar
 COPY ${JAR_FILE} application.jar
-RUN java -Djarmode=layertools -jar application.jar  extract
+RUN java -Djarmode=tools -jar application.jar  extract --layers --launcher --destination output
 
 FROM eclipse-temurin:25-jre
 WORKDIR /app
 # Install helm
 COPY install-helm.sh install-helm.sh
-RUN ./install-helm.sh
+RUN bash ./install-helm.sh
 RUN rm install-helm.sh
 # Create onyxia group and user
 RUN groupadd --gid 101 --system onyxia && \
@@ -16,10 +16,10 @@ RUN groupadd --gid 101 --system onyxia && \
 ENV CACERTS_DIR="/usr/local/share/ca-certificates"
 RUN chown onyxia $JAVA_HOME/lib/security/cacerts
 # copy build extraction
-COPY --from=extract dependencies/ ./
-COPY --from=extract snapshot-dependencies/ ./
-COPY --from=extract spring-boot-loader/ ./
-COPY --from=extract application/ ./
+COPY --from=extract output/dependencies/ ./
+COPY --from=extract output/snapshot-dependencies/ ./
+COPY --from=extract output/spring-boot-loader/ ./
+COPY --from=extract output/application/ ./
 COPY entrypoint.sh entrypoint.sh
 # Equivalent to 'USER onyxia', see: https://github.com/InseeFrLab/onyxia-api/pull/116
 USER 101

onyxia-api/install-helm.sh

@@ -29,6 +29,7 @@ initArch() {
 initOS
 initArch
 HELM_DIST="helm-${HELM_VERSION}-${OS}-${ARCH}.tar.gz"
+apt update && apt install -y wget tar
 wget https://get.helm.sh/${HELM_DIST}
 tar -zxvf ${HELM_DIST}
 mv ${OS}-${ARCH}/helm /usr/local/bin/helm

pom.xml

@@ -21,8 +21,8 @@
     </distributionManagement>
     <properties>
         <fabric8io.version>7.4.0</fabric8io.version>
-        <maven.compiler.release>21</maven.compiler.release>
-        <java.version>21</java.version>
+        <maven.compiler.release>25</maven.compiler.release>
+        <java.version>25</java.version>
     </properties>
 
     <dependencyManagement>
@@ -70,7 +70,6 @@
                     <configuration>
                         <java>
                             <googleJavaFormat>
-                                <version>1.18.1</version>
                                 <style>AOSP</style>
                             </googleJavaFormat>
                         </java>