update version numbers:

- use latest actions version - use org.sonarsource.parent=75.0.0.1943 - align maven packages with cxx V2.1.2 - add requiredForLanguages=cxx,cpp,c++,c - test with SQ 10.6.0.92116 - test with SonarScanner 5.0.1.3006 (get CI failures with 6.x tbd)
SonarOpenCommunity · Aug 16, 2024 · ffa6560 · ffa6560
1 parent 4a483c1
commit ffa6560
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 43 deletions.
diff --git a/.github/workflows/cxx-ci.yml b/.github/workflows/cxx-ci.yml
@@ -35,12 +35,12 @@ jobs:
     # checkout code
     #
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # setup Python
     #
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.7'
 
@@ -94,14 +94,14 @@ jobs:
     #   all historical data for all branches and tags must be retrieved (fetch-depth: 0)
     #
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     # setup Java
     #
     - name: Set up JDK Java ${{ matrix.java }} | ${{ matrix.distribution }} | ${{ matrix.os }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: ${{ matrix.distribution }}
@@ -149,7 +149,7 @@ jobs:
     #
     - name: Packaging workflow data as artifacts
       if: hashFiles('staging') != ''
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: JAR_Files
         path: staging
@@ -185,12 +185,12 @@ jobs:
     # checkout code
     #
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # setup Java
     #
     - name: Set up JDK Java ${{ matrix.java }} | ${{ matrix.distribution }} | ${{ matrix.os }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: ${{ matrix.distribution }}
@@ -248,14 +248,14 @@ jobs:
     #   all historical data for all branches and tags must be retrieved (fetch-depth: 0)
     #
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     # setup Java
     #
     - name: Set up JDK Java ${{ matrix.java }} | ${{ matrix.distribution }} | ${{ matrix.os }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: ${{ matrix.distribution }}
@@ -292,7 +292,7 @@ jobs:
     # - Secrets are not passed to the runner when a workflow is triggered from a forked repository!
     #
     - name: Update SonarCloud results
-      run: mvn sonar:sonar -B -e -V -Dsonar.organization=sonaropencommunity -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dsonar.python.version=3.8
+      run: mvn sonar:sonar -B -e -V -Dsonar.organization=sonaropencommunity -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dsonar.python.version=3.8
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -308,7 +308,7 @@ jobs:
         os: [ubuntu-latest]
         java: [ '17' ]
         distribution: [ 'temurin' ]
-        sonarqube: [ '9.9.4.87374', '10.4.0.87286' ]
+        sonarqube: [ '10.6.0.92116' ]
         sonarscanner: [ '5.0.1.3006' ]
 
     runs-on: ${{ matrix.os }}
@@ -324,12 +324,12 @@ jobs:
     # checkout code
     #
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # setup Java
     #
     - name: Set up JDK Java ${{ matrix.java }} | ${{ matrix.distribution }} | ${{ matrix.os }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: ${{ matrix.distribution }}
@@ -338,7 +338,7 @@ jobs:
     # setup Python
     #
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.7'
         # cache not working with 2.7?
@@ -388,7 +388,7 @@ jobs:
     # - copy it to target folder, behave script expect it there
     #
     - name: Download cxx plugin
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: JAR_Files
 
@@ -433,7 +433,7 @@ jobs:
 
     - name: Upload LOG files as artifact
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "LOG_sonarqube_${{ matrix.sonarqube }}_java_${{ matrix.java }}_os_${{ matrix.os }}"
         path: "${{ env.SONARLOG }}"
@@ -449,7 +449,7 @@ jobs:
         os: [windows-latest]
         java: [ '17' ]
         distribution: [ 'temurin' ]
-        sonarqube: [ '9.9.4.87374', '10.4.0.87286' ]
+        sonarqube: [ '10.6.0.92116' ]
         sonarscanner: [ '5.0.1.3006' ]
 
     runs-on: ${{ matrix.os }}
@@ -466,12 +466,12 @@ jobs:
     # checkout code
     #
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # setup Java
     #
     - name: Set up JDK Java ${{ matrix.java }} | ${{ matrix.distribution }} | ${{ matrix.os }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
         distribution: ${{ matrix.distribution }}
@@ -480,7 +480,7 @@ jobs:
     # setup Python
     #
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.7'
         # cache not working with 2.7?
@@ -532,7 +532,7 @@ jobs:
     # - copy it to target folder, behave script expect it there
     #
     - name: Download cxx plugin
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: JAR_Files
 
@@ -580,7 +580,7 @@ jobs:
 
     - name: Upload LOG files as artifact
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "LOG_sonarqube_${{ matrix.sonarqube }}_java_${{ matrix.java }}_os_${{ matrix.os }}"
         path: "${{ env.SONARLOG }}"
@@ -604,7 +604,7 @@ jobs:
     #
     - name: Download JAR files
       if: github.event_name == 'push'
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: JAR_Files
 

diff --git a/cxx-sslr-toolkit/pom.xml b/cxx-sslr-toolkit/pom.xml
@@ -103,7 +103,7 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <maxsize>8600000</maxsize>
+                  <maxsize>13000000</maxsize>
                   <minsize>6000000</minsize>
                   <files>
                     <file>${project.build.directory}/${project.build.finalName}.jar</file>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>71.0.0.1292</version>
+    <version>75.0.0.1943</version>
   </parent>
 
   <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
@@ -267,41 +267,41 @@
 
     <!-- dependencies -->
     <ant.version>1.10.14</ant.version>
-    <asm.version>9.6</asm.version>
-    <assertj-core.version>3.25.3</assertj-core.version>
-    <commons-io.version>2.15.1</commons-io.version>
+    <asm.version>9.7</asm.version>
+    <assertj-core.version>3.26.3</assertj-core.version>
+    <commons-io.version>2.16.1</commons-io.version>
     <commons-lang.version>2.6</commons-lang.version>
     <cucumber.version>2.0.1</cucumber.version>
-    <dd-plist.version>1.27</dd-plist.version>
-    <gherkin.version>27.0.0</gherkin.version>
-    <gson.version>2.10.1</gson.version>
-    <guava.version>33.0.0-jre</guava.version>
-    <jackson-databind.version>2.16.1</jackson-databind.version>
+    <dd-plist.version>1.28</dd-plist.version>
+    <gherkin.version>29.0.0</gherkin.version>
+    <gson.version>2.11.0</gson.version>
+    <guava.version>33.2.1-jre</guava.version>
+    <jackson-databind.version>2.17.2</jackson-databind.version>
     <jaxen.version>2.0.0</jaxen.version>
     <jdom2.version>2.0.6.1</jdom2.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <junit-jupiter.version>5.10.2</junit-jupiter.version>
+    <junit-jupiter.version>5.10.3</junit-jupiter.version>
     <mockito-all.version>1.10.19</mockito-all.version>
-    <mockito-core.version>5.10.0</mockito-core.version>
+    <mockito-core.version>5.12.0</mockito-core.version>
     <sonar-colorizer.version>5.1</sonar-colorizer.version>
     <staxmate.version>2.4.1</staxmate.version>
     <stax2-api.version>4.2.2</stax2-api.version>
     <tag-expressions.version>6.1.0</tag-expressions.version>
-    <woodstox-core.version>6.6.0</woodstox-core.version>
+    <woodstox-core.version>7.0.0</woodstox-core.version>
 
     <!-- plugins -->
     <java.version>17</java.version>
     <jython-standalone.version>2.7.3</jython-standalone.version>
     <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-    <maven-compiler.version>3.12.1</maven-compiler.version>
-    <maven-dependency.version>3.6.1</maven-dependency.version>
-    <maven-jacoco.version>0.8.11</maven-jacoco.version>
-    <maven-jar.version>3.3.0</maven-jar.version>
-    <maven-license.version>4.3</maven-license.version>
+    <maven-compiler.version>3.13.0</maven-compiler.version>
+    <maven-dependency.version>3.7.1</maven-dependency.version>
+    <maven-jacoco.version>0.8.12</maven-jacoco.version>
+    <maven-jar.version>3.4.2</maven-jar.version>
+    <maven-license.version>4.5</maven-license.version>
     <maven-project.version>2.2.1</maven-project.version>
     <maven-python-test.version>1.0</maven-python-test.version>
-    <maven-shade.version>3.5.1</maven-shade.version>
-    <maven-sonar.version>3.10.0.2594</maven-sonar.version>
+    <maven-shade.version>3.6.0</maven-shade.version>
+    <maven-sonar.version>4.0.0.4121</maven-sonar.version>
 
   </properties>
 
@@ -312,6 +312,7 @@
         <groupId>org.sonarsource.api.plugin</groupId>
         <artifactId>sonar-plugin-api</artifactId>
         <version>${sonar.plugin.api.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.sonarsource.api.plugin</groupId>
@@ -322,11 +323,13 @@
         <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-plugin-api-impl</artifactId>
         <version>${sonar.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-testing-harness</artifactId>
         <version>${sonar.version}</version>
+        <scope>test</scope>
       </dependency>
 
       <dependency>
@@ -349,21 +352,25 @@
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
         <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
         <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
         <version>${assertj-core.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
         <version>${mockito-core.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>

diff --git a/sonar-cxx-plugin/pom.xml b/sonar-cxx-plugin/pom.xml
@@ -114,6 +114,7 @@
         <artifactId>sonar-packaging-maven-plugin</artifactId>
         <configuration>
           <pluginApiMinVersion>${pluginApiMinVersion}</pluginApiMinVersion>
+          <requiredForLanguages>cxx,cpp,c++,c</requiredForLanguages>
         </configuration>
       </plugin>
     </plugins>