From 0fe830985b14549ecc7ee01b5c24126f22ba4161 Mon Sep 17 00:00:00 2001
From: Nicolas Laval <nicolas.laval@making-sense.info>
Date: Sun, 24 Dec 2023 10:43:32 +0100
Subject: [PATCH 1/2] Update Trevas version

---
 Dockerfile |  2 +-
 pom.xml    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

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 6e49a2e..6f5e888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <description>Jupyter notebook providing VTL support through Trevas engine</description>
     <artifactId>trevas-jupyter</artifactId>
     <groupId>fr.insee</groupId>
-    <version>0.4.2</version>
+    <version>0.5.0</version>
 
     <licenses>
         <license>
@@ -18,9 +18,9 @@
     </licenses>
 
     <properties>
-        <jdk.version>11</jdk.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <trevas.version>1.1.1</trevas.version>
+        <trevas.version>1.2.0</trevas.version>
     </properties>
 
     <repositories>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-kubernetes_2.12</artifactId>
-            <version>3.3.1</version>
+            <version>3.5.0</version>
         </dependency>
 
         <dependency>
@@ -182,12 +182,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.12.0</version>
                 <configuration>
-                    <release>${jdk.version}</release>
-                    <testRelease>${jdk.version}</testRelease>
-                    <target>${jdk.version}</target>
-                    <source>${jdk.version}</source>
+                    <release>${java.version}</release>
+                    <testRelease>${java.version}</testRelease>
+                    <target>${java.version}</target>
+                    <source>${java.version}</source>
                 </configuration>
             </plugin>
         </plugins>

From df58e028ce43fb93b9c184523a3f13b009e83db6 Mon Sep 17 00:00:00 2001
From: Nicolas Laval <nicolas.laval@making-sense.info>
Date: Sun, 24 Dec 2023 10:51:24 +0100
Subject: [PATCH 2/2] Update ci.yml

---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a693eb..a41e419 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up Maven Central Repository
+        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