feat: java 17

InseeFr · Jan 4, 2024 · a9c600b · a9c600b
1 parent 27560aa
commit a9c600b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Verify with Maven and Sonar
       if: ${{ github.actor != 'dependabot[bot]' }}
       run: mvn verify sonar:sonar -Pcoverage -Dsonar.projectKey=fr.insee:arc -Dsonar.organization=inseefr -Dsonar.host.url=https://sonarcloud.io

diff --git a/.github/workflows/deploy-on-docker.yml b/.github/workflows/deploy-on-docker.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Verify with Maven
       run: mvn verify
   push_to_registry:

diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Package with Maven
       run: mvn package
     - uses: ncipollo/release-action@v1

diff --git a/arc-core/pom.xml b/arc-core/pom.xml
@@ -35,8 +35,7 @@
 				<version>${project.maven.compiler.version}</version>
 				<configuration>
 					<compilerArgument>-Xlint:unchecked</compilerArgument>
-					<source>${project.java.version}</source>
-					<target>${project.java.version}</target>
+					<release>${project.java.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/arc-utils/pom.xml b/arc-utils/pom.xml
@@ -22,8 +22,7 @@
 				<version>${project.maven.compiler.version}</version>
 				<configuration>
 					<compilerArgument>-Xlint:unchecked</compilerArgument>
-					<source>${project.java.version}</source>
-					<target>${project.java.version}</target>
+					<release>${project.java.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/pom.xml b/pom.xml
@@ -16,8 +16,8 @@
 		<project.springboot.version>2.6.7</project.springboot.version>
 		<project.jackson.version>2.13.2</project.jackson.version>
 		<project.postgres.version>42.5.1</project.postgres.version>
-		<project.java.version>11</project.java.version>
-		<project.maven.compiler.version>3.11.0</project.maven.compiler.version>
+		<project.java.version>17</project.java.version>
+		<project.maven.compiler.version>3.12.0</project.maven.compiler.version>
 
 		<project.org.json>20231013</project.org.json>
 
@@ -128,8 +128,7 @@
 				<version>${project.maven.compiler.version}</version>
 				<configuration>
 					<compilerArgument>-Xlint:unchecked</compilerArgument>
-					<source>${project.java.version}</source>
-					<target>${project.java.version}</target>
+					<release>${project.java.version}</release>
 				</configuration>
 			</plugin>