From 171f912a3c1638034554084b0c7d1fa4617467d4 Mon Sep 17 00:00:00 2001 From: Olivier Levitt Date: Sun, 15 Oct 2023 18:50:46 +0200 Subject: [PATCH 1/4] Build java 21 --- onyxia-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onyxia-api/Dockerfile b/onyxia-api/Dockerfile index 69650366..bf980c2e 100644 --- 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 From 7f3d3f03192a3607b1b5b6a19f1f97be42e42f5f Mon Sep 17 00:00:00 2001 From: Olivier Levitt Date: Sun, 15 Oct 2023 18:52:34 +0200 Subject: [PATCH 2/4] Build java 21 --- .github/workflows/ci.yml | 8 ++++---- helm-wrapper/pom.xml | 2 +- onyxia-api/pom.xml | 2 +- onyxia-model/pom.xml | 4 ++-- pom.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 213db9f9..c266ab34 100644 --- 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 index 08dc9ca7..1ee34d21 100644 --- a/helm-wrapper/pom.xml +++ b/helm-wrapper/pom.xml @@ -15,7 +15,7 @@ Simple wrapper for Helm (https://helm.sh) - 17 + 21 diff --git a/onyxia-api/pom.xml b/onyxia-api/pom.xml index 3402cdf1..2e62c715 100644 --- a/onyxia-api/pom.xml +++ b/onyxia-api/pom.xml @@ -131,7 +131,7 @@ - 17 + 21 1.9.10 diff --git a/onyxia-model/pom.xml b/onyxia-model/pom.xml index 369ba71a..0be5051a 100644 --- a/onyxia-model/pom.xml +++ b/onyxia-model/pom.xml @@ -11,8 +11,8 @@ 0.0.1-SNAPSHOT - 17 - 17 + 21 + 21 diff --git a/pom.xml b/pom.xml index 63a65e17..817f09f1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,8 @@ 6.7.1 - 17 - 17 + 21 + 21 From da3a15051f73642d1d856d001f8f89732638482b Mon Sep 17 00:00:00 2001 From: Olivier Levitt Date: Sun, 15 Oct 2023 18:55:04 +0200 Subject: [PATCH 3/4] Kotlin : update --- onyxia-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onyxia-api/pom.xml b/onyxia-api/pom.xml index 2e62c715..d8f15dd0 100644 --- a/onyxia-api/pom.xml +++ b/onyxia-api/pom.xml @@ -132,7 +132,7 @@ 21 - 1.9.10 + 1.9.20-RC From c5768a322f9e938af8fe56ca7115eec2e3d9fcf5 Mon Sep 17 00:00:00 2001 From: Olivier Levitt Date: Mon, 16 Oct 2023 11:14:37 +0200 Subject: [PATCH 4/4] Bump spotless format for java 21 --- .../helmwrapper/service/HelmInstallService.java | 13 ++++++++++--- .../insee/onyxia/model/catalog/CatalogWrapper.java | 1 + .../java/fr/insee/onyxia/model/region/Region.java | 1 + pom.xml | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) 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 index bf1e7775..b01b2aba 100644 --- 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 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-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java index fdcf1041..dbff000a 100644 --- 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> 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 index 9b94830b..af3d86f5 100644 --- 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 index 7334c6eb..52369d45 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ - 1.15.0 + 1.18.1