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/7] =?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 @@ UTF-8 - 11 - 11 - 11 + 21 + 21 + 21 5.9.2 0.8.11 9.8.0.203 @@ -216,7 +216,7 @@ org.mockito mockito-core - 5.1.1 + 5.10.0 test @@ -315,6 +315,9 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M8 + + -Djava.security.manager=allow + 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/7] =?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 Date: Wed, 7 Feb 2024 14:40:39 +0000 Subject: [PATCH 3/7] 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 @@ fr.cnes.sonar cnesreport - 4.3.0 + 4.3.1 sonar-plugin SonarQube CNES Report @@ -29,9 +29,9 @@ UTF-8 - 21 - 21 - 21 + 17 + 17 + 17 5.9.2 0.8.11 9.8.0.203 From c4b657e9ad73b10aa879ef9eda35cb400ebb7b01 Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Sat, 10 Feb 2024 22:46:17 +0100 Subject: [PATCH 4/7] FMA - Draft release upgrade to java 17 --- .github/workflows/draft-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 5c1acaeb..416c23d4 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Cache Maven packages uses: actions/cache@v2 with: @@ -54,4 +54,4 @@ jobs: name: ${{ env.project }} ${{ env.tag }} bodyFile: "temp_release_notes/release_file.md" draft: true - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} From b376d962050a7cee08d93095e4a80d8017a54089 Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Sun, 11 Feb 2024 17:30:07 +0100 Subject: [PATCH 5/7] FMA - downgrade to java 11 --- .github/workflows/draft-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 416c23d4..4cfe39e9 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '17' + java-version: '11' - name: Cache Maven packages uses: actions/cache@v2 with: From eb9d8db9dfa4e3e2558818884ce8b48ef81ecc7f Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:24:08 +0100 Subject: [PATCH 6/7] FMA - Update jvm actions to v3 --- .github/workflows/draft-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 4cfe39e9..705cd60b 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -15,14 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 6f947a1134ce999d7f663c36f2e05c4b6397a65d Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:40:10 +0100 Subject: [PATCH 7/7] FMA - image actions 'adopts' v2 --- .github/workflows/draft-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 705cd60b..416c23d4 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -15,14 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository code - uses: actions/checkout@v3 + uses: actions/checkout@v2 - name: Setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 with: distribution: 'adopt' java-version: '17' - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v2 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}