From 00beb90f9daa761fdee23ff6c674a1abe85185d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20S=C3=A9nave?=
 <59770457+nsenave@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:31:30 +0100
Subject: [PATCH] build: java 21 (#129)

* build: java 21

* ci: add dependabot config file

* ci: update actions with java 21
---
 .github/dependabot.yml                | 34 +++++++++++++++++++++++++++
 .github/workflows/create-release.yml  |  2 +-
 .github/workflows/create-snapshot.yml |  6 ++---
 .github/workflows/tests.yml           |  4 ++--
 pom.xml                               |  8 +++----
 5 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..692dd072
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,34 @@
+version: 2
+updates:
+
+  # Maintain dependencies for maven in v3-main branch
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "v3-main"
+
+  # Maintain dependencies for GitHub Actions in v3-main
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`.
+    # (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    target-branch: "v3-main"
+
+    # Maintain dependencies for maven in v2-main branch
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "v2-main"
+
+  # Maintain dependencies for GitHub Actions in v2-main
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`.
+    # (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    target-branch: "v2-main"
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 236b51b1..437ac8fd 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -88,7 +88,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           server-id: ossrh
           server-username: MAVEN_USERNAME
diff --git a/.github/workflows/create-snapshot.yml b/.github/workflows/create-snapshot.yml
index b71de830..deddc809 100644
--- a/.github/workflows/create-snapshot.yml
+++ b/.github/workflows/create-snapshot.yml
@@ -47,11 +47,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Tests
         run: mvn test --no-transfer-progress
@@ -79,7 +79,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           server-id: ossrh
           server-username: MAVEN_USERNAME
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 71bd14ff..15f04d5e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,11 +11,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Tests
         run: mvn test --no-transfer-progress
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 994eea69..a67ce65e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
 
-	<version>3.2.7</version>
+	<version>3.3.0</version>
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>https://inseefr.github.io/Lunatic-Model/</url>
@@ -18,7 +18,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.release>17</maven.compiler.release>
+		<maven.compiler.release>21</maven.compiler.release>
 	</properties>
 
 	<licenses>
@@ -38,7 +38,7 @@
 	<scm>
 		<connection>scm:git:git://github.com/InseeFr/Lunatic-Model.git</connection>
 		<developerConnection>scm:git:ssh://github.com:InseeFr/Lunatic-Model.git</developerConnection>
-		<url>https://github.com/InseeFr/Lunatic-Model.git/tree/master</url>
+		<url>https://github.com/InseeFr/Lunatic-Model.git/tree/v3-main</url>
 	</scm>
 
 	<distributionManagement>
@@ -94,7 +94,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.28</version>
+			<version>1.18.30</version>
 		</dependency>
 	</dependencies>