From 3868f65bd3587370634d345c58e567ffc3c6186f Mon Sep 17 00:00:00 2001
From: Nicolas Senave <nicolas.senave@gmail.com>
Date: Wed, 9 Oct 2024 14:33:17 +0200
Subject: [PATCH] fix(jaxb): use jaxb-runtime dependency

---
 .github/workflows/create-snapshot.yml |  2 +-
 pom.xml                               | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/create-snapshot.yml b/.github/workflows/create-snapshot.yml
index f0433a57a..edf33ea98 100644
--- a/.github/workflows/create-snapshot.yml
+++ b/.github/workflows/create-snapshot.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Tag verification
         id: check-tag
         run: |
-          if ! [[ "${{ steps.version.outputs.version }}" =~ ^2.[0-9]+.[0-9]+-SNAPSHOT$ ]]; then
+          if ! [[ "${{ steps.version.outputs.version }}" =~ ^2.[0-9]+.[0-9]+-SNAPSHOT.?[0-9]*$ ]]; then
             echo "Version on v2-main ${{ steps.version.outputs.version }} branch does not match the format 2.Y.Z-SNAPSHOT"
             exit 1
           fi
diff --git a/pom.xml b/pom.xml
index 3b35899b7..678ba19cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>fr.insee.eno</groupId>
 	<artifactId>eno-core</artifactId>
-	<version>2.10.1</version>
+	<version>2.10.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Eno – Questionnaire generator</name>
@@ -107,8 +107,7 @@
 		<saxon.version>12.5</saxon.version>
 		<eclipse.version>2.7.15</eclipse.version>
 		<jaxb-api.version>2.3.1</jaxb-api.version>
-		<jaxb.core.version>4.0.5</jaxb.core.version>
-		<jaxb.impl.version>4.0.5</jaxb.impl.version>
+		<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
 		<fop.version>2.9</fop.version>
 		<commons-io.version>2.17.0</commons-io.version>
 		<guice.version>7.0.0</guice.version>
@@ -168,14 +167,9 @@
 			<version>${jaxb-api.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-core</artifactId>
-			<version>${jaxb.core.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>${jaxb.impl.version}</version>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>${jaxb-runtime.version}</version>
 		</dependency>
 
 		<!-- PDF dependency -->