Merge pull request #100 from cnescatlab/master

Rebase dev

Author: louisjdmartin

.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

.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

.github/workflows/draft-release.yml

@@ -27,7 +27,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:

.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
 
@@ -18,7 +18,7 @@ jobs:
     permissions:
       packages: read
     runs-on: ubuntu-latest
-    name: Java 11 CI
+    name: Java 17 CI
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
@@ -28,7 +28,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,7 +54,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:

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       |
 |        3.1.2       |          5.0.0          |        7.9 -> 9.9           |       Fortran       |
 
 #### Run i-Code manually

pom.xml

@@ -56,11 +56,11 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.version>1.8</jdk.version>
-        <jdk.min.version>11</jdk.min.version>
-        <jdk.max.version>11</jdk.max.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <jdk.version>17</jdk.version>
+        <jdk.min.version>17</jdk.min.version>
+        <jdk.max.version>17</jdk.max.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <sonar.apiVersion>9.8.0.203</sonar.apiVersion>
         <sonar.testingHarnessVersion>9.5.0.56709</sonar.testingHarnessVersion>
         <sonar.apiImplVersion>9.9.1.69595</sonar.apiImplVersion>

src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java

@@ -79,8 +79,11 @@ public static void saveMeasure(final SensorContext context, final Map<String, In
             // Get i-Code rule id to test if issue must be saved here.
             final String metricKey = icodeMeasure.getAnalysisRuleId();
             // Take F77 / F90 ncloc and number of comment lines into account
-            if (metricKey.contains("MET.Line")) {
+            if (metricKey.contains("MET.LineOfCode")) {
                 saveSonarQubeNewMeasure(context, files, CoreMetrics.NCLOC, icodeMeasure);
+            }
+            // Take F77 / F90 number of comment lines into account
+            else if (metricKey.contains("MET.LineOfComment")) {
                 saveSonarQubeNewMeasure(context, files, CoreMetrics.COMMENT_LINES, icodeMeasure);
             }
         }