chore: upgrade lib versions

InseeFr · Feb 21, 2024 · fda3145 · fda3145
1 parent 6428952
commit fda3145
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 73 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,24 +9,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
+          distribution: 'temurin'
       - name: Get current version
         id: version
         run: echo "::set-output name=prop::$(mvn -f pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)"
       - run: echo ${{steps.version.outputs.prop}}
-      - name: Get lunatic-model version
-        id: lunatic
-        run: echo "::set-output name=prop::$(mvn -f pom.xml help:evaluate -Dexpression=lunatic.model.version -q -DforceStdout)"
-      - name: Install lunatic-model
-        run: mvn install:install-file -Dfile=lib/lunatic-model-${{steps.lunatic.outputs.prop}}.jar -DgroupId=fr.insee.lunatic -DartifactId=lunatic-model -Dversion=${{steps.lunatic.outputs.prop}} -Dpackaging=jar
       - name: Build with Maven
-        run: mvn install --file pom.xml
+        run: mvn install --no-transfer-progress
       - name: Upload jar
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jar
           path: target/*.jar
diff --git a/.github/workflows/develop-release.yml b/.github/workflows/develop-release.yml
@@ -11,18 +11,14 @@ jobs:
     build-release:
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v2
-        - name: Set up JDK 11
-          uses: actions/setup-java@v1
+        - uses: actions/checkout@v4
+        - name: Set up JDK 21
+          uses: actions/setup-java@v4
           with:
-            java-version: 11
-        - name: Get lunatic-model version
-          id: lunatic
-          run: echo "::set-output name=prop::$(mvn -f pom.xml help:evaluate -Dexpression=lunatic.model.version -q -DforceStdout)"
-        - name: Install lunatic-model
-          run: mvn install:install-file -Dfile=lib/lunatic-model-${{steps.lunatic.outputs.prop}}.jar -DgroupId=fr.insee.lunatic -DartifactId=lunatic-model -Dversion=${{steps.lunatic.outputs.prop}} -Dpackaging=jar
+            java-version: 21
+            distribution: 'temurin'
         - name: Build with Maven
-          run: mvn install --file pom.xml
+          run: mvn install --no-transfer-progress
         - name: Get current version
           id: version
           run: echo "::set-output name=prop::$(mvn -f pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)"
@@ -39,7 +35,7 @@ jobs:
             prerelease: false
         - name: Upload Release Asset
           id: upload-release-asset 
-          uses: actions/upload-release-asset@v1
+          uses: actions/upload-release-asset@v4
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,18 +11,14 @@ jobs:
   build-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
-      - name: Get lunatic-model version
-        id: lunatic
-        run: echo "::set-output name=prop::$(mvn -f pom.xml help:evaluate -Dexpression=lunatic.model.version -q -DforceStdout)"
-      - name: Install lunatic-model
-        run: mvn install:install-file -Dfile=lib/lunatic-model-${{steps.lunatic.outputs.prop}}.jar -DgroupId=fr.insee.lunatic -DartifactId=lunatic-model -Dversion=${{steps.lunatic.outputs.prop}} -Dpackaging=jar
+          java-version: 21
+          distribution: 'temurin'
       - name: Build with Maven
-        run: mvn install --file pom.xml
+        run: mvn install --no-transfer-progress
       - name: Get current version
         id: version
         run: echo "::set-output name=prop::$(mvn -f pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)"
@@ -39,7 +35,7 @@ jobs:
           prerelease: false
       - name: Upload Release Asset
         id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@v4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/pom.xml b/pom.xml
@@ -5,23 +5,20 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.insee.queen</groupId>
 	<artifactId>queen-batch</artifactId>
-	<version>4.2.1</version>
+	<version>4.2.2</version>
 	<packaging>jar</packaging>
 	<name>QueenBatch</name>
 	<description>Queen Batch</description>
 
 	<properties>
-		<jdk.version>11.0.2</jdk.version>
-		<jdk.version>1.11</jdk.version>
-		<java.version>1.11</java.version>
-		<spring.version>5.2.1.RELEASE</spring.version>
-		<log4j.version>2.17.1</log4j.version>
-		<testcontainers.version>1.15.2</testcontainers.version>
+		<java.version>21</java.version>
+		<spring.version>6.1.3</spring.version>
+		<log4j.version>2.22.1</log4j.version>
+		<testcontainers.version>1.19.5</testcontainers.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.release>11</maven.compiler.release>
-		<saxon.version>9.7.0-8</saxon.version>
-		<lunatic.model.version>2.2.3</lunatic.model.version>
+		<saxon.version>11.5</saxon.version>
+		<lunatic.model.version>2.5.1</lunatic.model.version>
 	</properties>
 
 	<dependencies>
@@ -49,68 +46,64 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
-			<version>2.2.3.RELEASE</version>
-		</dependency>
-
-		<dependency>
-		    <groupId>org.springframework.data</groupId>
-		    <artifactId>spring-data-mongodb</artifactId>
-		    <version>2.2.3.RELEASE</version>
+			<version>3.1.2</version>
 		</dependency>
+
 		<!-- Apache commons -->
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.6</version>
+			<version>2.15.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.10</version>
+			<version>3.12.0</version>
 		</dependency>
 
 		<!-- PostgreSQL database driver -->
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.3.8</version>
+			<version>42.5.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
-			<version>3.8.9</version>
+			<version>4.25.1</version>
 		</dependency>
 
 
 		<!-- For testing -->
 		<dependency>
 		    <groupId>org.junit.jupiter</groupId>
 		    <artifactId>junit-jupiter-engine</artifactId>
-		    <version>5.4.0</version>
+		    <version>5.10.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>postgresql</artifactId>
 			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<!-- For JSON format -->
 		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>mongodb</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
+		    <groupId>com.google.code.gson</groupId>
+		    <artifactId>gson</artifactId>
+		    <version>2.10.1</version>
 		</dependency>
 
-		<!-- For JSON format -->
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-		    <groupId>com.google.code.gson</groupId>
-		    <artifactId>gson</artifactId>
-		    <version>2.8.6</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>junit</artifactId>
+					<groupId>junit</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- For the Logger -->
@@ -119,6 +112,7 @@
 			<artifactId>log4j-core</artifactId>
 			<version>${log4j.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
@@ -140,12 +134,12 @@
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.moxy</artifactId>
-			<version>2.5.0</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>2.6.0</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -160,7 +154,7 @@
 		<dependency>
 		    <groupId>org.jdom</groupId>
 		    <artifactId>jdom2</artifactId>
-		    <version>2.0.6</version>
+		    <version>2.0.6.1</version>
 		</dependency>
 	</dependencies>
 
@@ -170,16 +164,15 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M4</version>
+					<version>3.1.2</version>
 					<configuration>
 						<runOrder>alphabetical</runOrder>
 						<includes>
 							<include>UnitTests.java</include>
 							<include>TestEndToEndJpa.java</include>
-							<include>TestEndToEndMongo.java</include>
 						</includes>
 						<forkedProcessExitTimeoutInSeconds>500</forkedProcessExitTimeoutInSeconds>
-						<argLine>-Xmx2048m -Xmx1G -XX:PermSize=1024m</argLine>
+						<argLine>-Xmx2048m -Xmx1G</argLine>
 						<environmentVariables>
 								<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
 						</environmentVariables>
@@ -188,7 +181,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-eclipse-plugin</artifactId>
-					<version>2.9</version>
+					<version>2.10</version>
 					<configuration>
 						<downloadSources>true</downloadSources>
 						<downloadJavadocs>false</downloadJavadocs>
@@ -243,7 +236,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.7</version>
+				<version>3.3.1</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 				</configuration>