InseeFrLab · olevitt · Oct 23, 2023 · Oct 15, 2023 · Oct 15, 2023 · Oct 15, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,11 +19,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - 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@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Check Spotless CodingStyle
         run: mvn spotless:check
   docker:

diff --git a/helm-wrapper/pom.xml b/helm-wrapper/pom.xml
@@ -15,7 +15,7 @@
     <description>Simple wrapper for Helm (https://helm.sh)</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
 
     <distributionManagement>

diff --git a/helm-wrapper/src/main/java/io/github/inseefrlab/helmwrapper/service/HelmInstallService.java b/helm-wrapper/src/main/java/io/github/inseefrlab/helmwrapper/service/HelmInstallService.java
@@ -43,7 +43,10 @@ public HelmInstaller installChart(
             Map<String, String> env,
             final boolean skipTlsVerify,
             String caFile)
-            throws InvalidExitValueException, IOException, InterruptedException, TimeoutException,
+            throws InvalidExitValueException,
+                    IOException,
+                    InterruptedException,
+                    TimeoutException,
                     IllegalArgumentException {
         StringBuilder command = new StringBuilder("helm upgrade --install ");
         if (skipTlsVerify) {
@@ -96,8 +99,12 @@ public int uninstaller(HelmConfiguration configuration, String name, String name
     }
 
     public HelmLs[] listChartInstall(HelmConfiguration configuration, String namespace)
-            throws JsonMappingException, InvalidExitValueException, JsonProcessingException,
-                    IOException, InterruptedException, TimeoutException {
+            throws JsonMappingException,
+                    InvalidExitValueException,
+                    JsonProcessingException,
+                    IOException,
+                    InterruptedException,
+                    TimeoutException {
         StringBuilder command = new StringBuilder("helm ls");
         if (namespace != null) {
             command.append(" -n ");

diff --git a/onyxia-api/Dockerfile b/onyxia-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.8_7-jre
+FROM eclipse-temurin:21_35-jre
 # Install helm
 RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | DESIRED_VERSION=v3.12.0 bash
 COPY target/*.jar app.jar

diff --git a/onyxia-api/pom.xml b/onyxia-api/pom.xml
@@ -131,8 +131,8 @@
     </dependencies>
 
     <properties>
-        <java.version>17</java.version>
-        <kotlin.version>1.9.10</kotlin.version>
+        <java.version>21</java.version>
+        <kotlin.version>1.9.20-RC</kotlin.version>
     </properties>
 
     <build>

diff --git a/onyxia-model/pom.xml b/onyxia-model/pom.xml
@@ -11,8 +11,8 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>

diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java
@@ -13,6 +13,7 @@ public abstract class CatalogWrapper {
 
     @Schema(description = "This entries are those from a standard helm repository")
     private Map<String, List<Chart>> entries;
+
     /**
      * @return the packages
      */

diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/region/Region.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/region/Region.java
@@ -625,6 +625,7 @@ public static class Quotas {
             private boolean userEnabled = false;
             private boolean groupEnabled = false;
             private boolean allowUserModification = true;
+
             // could be deprecated
             @JsonProperty("default")
             private Quota defaultQuota;

diff --git a/pom.xml b/pom.xml
@@ -21,8 +21,8 @@
     </distributionManagement>
     <properties>
         <fabric8io.version>6.7.1</fabric8io.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
@@ -70,7 +70,7 @@
                     <configuration>
                         <java>
                             <googleJavaFormat>
-                                <version>1.15.0</version>
+                                <version>1.18.1</version>
                                 <style>AOSP</style>
                             </googleJavaFormat>
                         </java>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ public abstract class CatalogWrapper { @@
         @Schema(description = "This entries are those from a standard helm repository")
         private Map<String, List<Chart>> entries;
         /**
          * @return the packages
          */
@@ Expand Down @@