From cb248adf49c93d489fcf5673487bdaa243f98723 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez <63045276+diegorodriguez31@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:38:10 +0200 Subject: [PATCH 1/6] Hotfix "cannot add same measure twice" --- .../sonar/plugins/icode/measures/ICodeMetricsProcessor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java b/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java index 23383d5..6a48c17 100644 --- a/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java +++ b/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java @@ -79,8 +79,11 @@ public static void saveMeasure(final SensorContext context, final Map Date: Fri, 4 Aug 2023 12:44:21 +0200 Subject: [PATCH 2/6] Change icode version for hotfix --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/question.md | 2 +- README.md | 1 + pom.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7552b2e..8619ac1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -27,7 +27,7 @@ assignees: '' > _Please complete the following information._ - OS: [e.g. Windows 10] - Java version: [e.g. 1.8] - - i-Code version: [e.g. 3.1.0] + - i-Code version: [e.g. 3.1.1] - Plugin version: [e.g. 2.0.0] #### Additional context diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 6615ec8..75b6c1c 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -19,7 +19,7 @@ assignees: '' > _Please complete the following information._ - OS: [e.g. Windows 10] - Java version: [e.g. 1.8] - - i-Code version: [e.g. 3.1.0] + - i-Code version: [e.g. 3.1.1] - Plugin version: [e.g. 2.0.0] #### Additional context diff --git a/README.md b/README.md index f0c4ddc..de9cb5d 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Here is the compatibility matrix of the plugin: | 3.0.0 | 4.1.0 | 7.9 -> 8.2 | Fortran | | 3.0.1 | 4.1.2 | 7.9 -> 8.2 | Fortran | | 3.1.0 | 4.1.2 | 7.9 -> 9.9 | Fortran | +| 3.1.1 | 4.1.2 | 7.9 -> 9.9 | Fortran | #### Run i-Code manually If you need help to run i-Code please refer to the [official user manual](https://github.com/cnescatlab/i-CodeCNES/wiki/User-Manual) or [i-Code issue tracker](https://github.com/cnescatlab/i-CodeCNES/issues). diff --git a/pom.xml b/pom.xml index c885d2e..f94c4f1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fr.cnes.sonar.plugins sonar-icode-cnes-plugin sonar-plugin - 3.1.0 + 3.1.1 Sonar i-Code CNES plugin From a909faa829efa95130497f65269b5b1779fe38bf Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:27:09 +0100 Subject: [PATCH 3/6] FMA - Upgrade Java 17 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f94c4f1..0fc14f2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,11 +56,11 @@ UTF-8 - 1.8 - 11 - 11 - 1.8 - 1.8 + 17 + 17 + 17 + 17 + 17 9.8.0.203 9.5.0.56709 9.9.1.69595 From 5bbb42134cc0952e54639312fae9db7eb38b1615 Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:29:09 +0100 Subject: [PATCH 4/6] FMA - Upgrade java-continuous-integration with Java 17 --- .github/workflows/java-continuous-integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml index e5d9235..8ced7d4 100644 --- a/.github/workflows/java-continuous-integration.yml +++ b/.github/workflows/java-continuous-integration.yml @@ -3,7 +3,7 @@ # This workflow is triggered each time # commits are pushed to GitHub or a pull request is opened. # It launches three jobs in parallel : a build with java 8, -# a build with java 11 and a SonarCloud analysis. +# a build with java 17 and a SonarCloud analysis. --- name: Java CI @@ -13,7 +13,7 @@ jobs: build: runs-on: ubuntu-latest - name: Java 11 CI + name: Java 17 CI steps: - name: Check out repository code uses: actions/checkout@v2 @@ -23,7 +23,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: @@ -47,7 +47,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: From 761fee31a0773380697dc90de98e75aaa86b4cfa Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:32:24 +0100 Subject: [PATCH 5/6] FMA - v3.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fc14f2..02acf05 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fr.cnes.sonar.plugins sonar-icode-cnes-plugin sonar-plugin - 3.1.1 + 3.1.2 Sonar i-Code CNES plugin From 8080702813ee09ce9515a6b9f57a1b7bb74cc7fe Mon Sep 17 00:00:00 2001 From: dev31520 <83210547+dev31520@users.noreply.github.com> Date: Sat, 10 Feb 2024 22:47:50 +0100 Subject: [PATCH 6/6] FMA - upgrade draft release to java 17 --- .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 4cfe39e..416c23d 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: