diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e5033c..c7c6e72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 + distribution: "adopt" - name: Set current version run: mvn -B versions:set -DnewVersion=${GITHUB_REF##*/} -DprocessAllModules -DgenerateBackupPoms=false - uses: s4u/maven-settings-action@v2.8.0 diff --git a/Dockerfile b/Dockerfile index 0c11dcb..b99b3b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM inseefrlab/onyxia-jupyter-pyspark:py3.10.9-spark3.3.1 +FROM inseefrlab/onyxia-jupyter-pyspark:py3.11.6-spark3.5.0 # Allows the kernel to load the Spark and Hadoop config. ENV CLASSPATH_PREFIX "/opt/hadoop/etc/hadoop:/opt/spark/conf" diff --git a/pom.xml b/pom.xml index f6b7b92..f1055da 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Jupyter notebook providing VTL support through Trevas engine trevas-jupyter fr.insee - 0.4.2 + 0.5.0 @@ -18,9 +18,9 @@ - 11 + 17 UTF-8 - 1.1.1 + 1.2.0 @@ -98,7 +98,7 @@ org.apache.spark spark-kubernetes_2.12 - 3.3.1 + 3.5.0 @@ -184,10 +184,10 @@ maven-compiler-plugin 3.12.0 - ${jdk.version} - ${jdk.version} - ${jdk.version} - ${jdk.version} + ${java.version} + ${java.version} + ${java.version} + ${java.version}