From 746b4fef68eccdbaa180f1b03cdc2fdbd167fe3e Mon Sep 17 00:00:00 2001
From: dev31520 <83210547+dev31520@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:40:47 +0100
Subject: [PATCH 1/3] =?UTF-8?q?FMA=20-=20Mont=C3=A9e=20de=20version=20vers?=
 =?UTF-8?q?=20JAVA=2021=20et=20du=20plugin=20Mockito?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc2dd8a9..daf81a15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.min.version>11</jdk.min.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <jdk.min.version>21</jdk.min.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <junit.version>5.9.2</junit.version>
         <jacoco.version>0.8.11</jacoco.version>
         <sonar.apiVersion>9.8.0.203</sonar.apiVersion>
@@ -216,7 +216,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.1.1</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -315,6 +315,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M8</version>
+                <configuration>
+                    <argLine>-Djava.security.manager=allow</argLine>
+                </configuration>		    
             </plugin>
 
             <plugin>

From 050b28166d229f25653e6ee21ac5cf85df8b1543 Mon Sep 17 00:00:00 2001
From: dev31520 <83210547+dev31520@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:41:39 +0100
Subject: [PATCH 2/3] =?UTF-8?q?FMA=20-=20Mont=C3=A9e=20de=20version=20de?=
 =?UTF-8?q?=20la=20pipeline=20d'int=C3=A9gration=20continue=20JAVA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/java-continuous-integration.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml
index 9d485073..51657aae 100644
--- a/.github/workflows/java-continuous-integration.yml
+++ b/.github/workflows/java-continuous-integration.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '21' ]
     name: Java ${{ matrix.Java }} CI
     steps:
       - name: Check out repository code
@@ -97,7 +97,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
       - name: Cache Maven packages
         uses: actions/cache@v2
         with:
@@ -122,4 +122,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # SonarCloud access token should be generated from https://sonarcloud.io/account/security/
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.token=$SONAR_TOKEN
\ No newline at end of file
+        run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.token=$SONAR_TOKEN

From 3bb5f0518f4d0717272da6c097451ad89e8f6766 Mon Sep 17 00:00:00 2001
From: Martin Louis <louis.martin@cnes.fr>
Date: Wed, 7 Feb 2024 14:40:39 +0000
Subject: [PATCH 3/3] use java 17 for build

---
 .github/workflows/java-continuous-integration.yml | 4 ++--
 pom.xml                                           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml
index 51657aae..ba156567 100644
--- a/.github/workflows/java-continuous-integration.yml
+++ b/.github/workflows/java-continuous-integration.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21' ]
+        java: [ '17' ]
     name: Java ${{ matrix.Java }} CI
     steps:
       - name: Check out repository code
@@ -97,7 +97,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '21'
+          java-version: '17'
       - name: Cache Maven packages
         uses: actions/cache@v2
         with:
diff --git a/pom.xml b/pom.xml
index daf81a15..d54018a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>fr.cnes.sonar</groupId>
     <artifactId>cnesreport</artifactId>
-    <version>4.3.0</version>
+    <version>4.3.1</version>
     <packaging>sonar-plugin</packaging>
 
     <name>SonarQube CNES Report</name>
@@ -29,9 +29,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.min.version>21</jdk.min.version>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <jdk.min.version>17</jdk.min.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <junit.version>5.9.2</junit.version>
         <jacoco.version>0.8.11</jacoco.version>
         <sonar.apiVersion>9.8.0.203</sonar.apiVersion>