SONARJAVA-6182 Switch Guava project used in ruling tests to Java 21 (#59)

Author: asya-vorobeva

.github/scripts/resolve-sonar-java-plugin-version.sh

@@ -8,7 +8,7 @@ on:
   pull_request:
   workflow_dispatch:
   schedule:
-    - cron: "30 1 * * *" # Run daily at 1:30 AM UTC
+    - cron: "30 1 * * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -33,8 +33,10 @@ jobs:
         id: build-step
         with:
           deploy-pull-request: true
-          artifactory-reader-role: private-reader    # Override default public-reader
-          artifactory-deployer-role: qa-deployer     # Override default public-deployer
+          artifactory-reader-role: private-reader
+          artifactory-deployer-role: qa-deployer
+          use-develocity: ${{ env.USE_DEVELOCITY }}
+          develocity-url: ${{ env.DEVELOCITY_URL }}
 
   qa:
     needs: [build]
@@ -46,10 +48,8 @@ jobs:
       fail-fast: false
       matrix:
         item:
-          - { name: "with Lastest SonarJava Plugin", profile: "without-sonarqube-project", java_plugin_version: "LATEST_MASTER" }
-          - { name: "for SonarQube Project Only", profile: "only-sonarqube-project", java_plugin_version: "LATEST_MASTER" }
-          - { name: "for Guava Project Only", profile: "only-guava-project", java_plugin_version: "LATEST_MASTER", java_version: "17", sonar-runtime: "LATEST_RELEASE[2025.4]" }
-          - { name: "with Prod SonarJava Plugin", profile: "without-sonarqube-project", java_plugin_version: "POM_PROPERTY" }
+          - { name: "with Latest SonarJava Plugin", profile: "without-sonarqube-project" }
+          - { name: "for SonarQube Project Only", profile: "only-sonarqube-project" }
     name: "QA Tests ${{ matrix.item.name }}"
     env:
       BUILD_NUMBER: ${{ needs.build.outputs.build-number }}
@@ -60,17 +60,7 @@ jobs:
           submodules: recursive
       - uses: jdx/mise-action@d6e32c1796099e0f1f3ac741c220a8b7eae9e5dd # v3.2.0
         with:
-          working-directory: its/ruling
           version: 2025.7.12
-      - name: Override Java version for specific profiles
-        if: ${{ matrix.item.java_version }}
-        run: |
-          # We must 'cd' into the target directory because mise 'use' commands are 
-          # scoped to the current working directory. Changing directories ensures 
-          # the java version is pinned specifically for the 'its/ruling' path 
-          # by creating/updating a local .mise.toml file there.
-          cd its/ruling
-          mise use java@${{ matrix.item.java_version }}
       - name: Get GitHub Token for QA Licenses
         id: secrets
         uses: SonarSource/vault-action-wrapper@v3
@@ -81,36 +71,28 @@ jobs:
         id: configure-maven
         uses: SonarSource/ci-github-actions/config-maven@v1
         with:
-          artifactory-reader-role: private-reader    # Override default public-reader
-      - name: Get Sonar Java plugin version
-        id: resolve-sonar-java-plugin-version
-        run: |
-          VERSION=$(.github/scripts/resolve-sonar-java-plugin-version.sh "${{ matrix.item.java_plugin_version }}")
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          artifactory-reader-role: private-reader
+          use-develocity: ${{ env.USE_DEVELOCITY }}
+          develocity-url: ${{ env.DEVELOCITY_URL }}
       - name: Run QA Tests
         working-directory: its/ruling
         env:
           GITHUB_TOKEN: ${{ fromJSON(steps.secrets.outputs.vault).GITHUB_TOKEN }}
           BUILD_NUMBER: ${{ needs.build.outputs.build-number }}
           MAVEN_OPTS: "-Xmx3g"
-          SONAR_JAVA_VERSION: ${{ steps.resolve-sonar-java-plugin-version.outputs.version }}
-          SONAR_RUNTIME: ${{ matrix.item.sonar-runtime || 'LATEST_RELEASE' }}
         run: |
           mvn package --batch-mode \
             "-Pit-ruling,${{ matrix.item.profile }}" \
-            "-Dsonar.java.version=${SONAR_JAVA_VERSION}" \
-            "-Dorchestrator.artifactory.accessToken=${ARTIFACTORY_ACCESS_TOKEN}" \
-            "-Dsonar.runtimeVersion=${{ env.SONAR_RUNTIME }}" \
+            "-Dsonar.runtimeVersion=LATEST_RELEASE" \
             "-Dmaven.test.redirectTestOutputToFile=false" \
-            "-DbuildNumber=${BUILD_NUMBER}" \
             -B -e -V \
             "-Dparallel=methods" \
             "-DuseUnlimitedThreads=true"
       - name: Upload ruling artifacts on failure
         if: failure()
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.5.0
         with:
-          name: ruling-actual-${{ matrix.item.profile }}-${{ matrix.item.java_plugin_version }}
+          name: ruling-actual-${{ matrix.item.profile }}
           path: its/ruling/target/actual/**/*
 
   promote:

.github/workflows/build.yml

@@ -1,4 +1,3 @@
 [submodule "its/sources"]
 	path = its/sources
 	url = https://github.com/SonarSource/ruling_java.git
-	branch = se-engine

.gitmodules

@@ -31,7 +31,7 @@ To submit a contribution, create a pull request for this repository. Please make
 
 ### Build the Project and Run Unit Tests
 
-Requirements: Java 17
+Requirements: Java 21
 
 To build the plugin and run its unit tests, execute this command from the project's root directory:
 
@@ -47,7 +47,7 @@ To run the test, first make sure the submodules are checked out:
 
     git submodule update --init --recursive
 
-Then, ensure that the `JAVA_HOME` environment variable is set for the ruling tests execution and that it points to your local JDK 17 installation.
+Then, ensure that the `JAVA_HOME` environment variable is set for the ruling tests execution and that it points to your local JDK 21 installation.
 Failing to do so will produce inconsistencies with the expected results.
 
 From the `its/ruling` folder, launch the ruling tests:

README.md

@@ -114,7 +114,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <test>!org.sonar.java.it.JavaRulingTest#sonarqube_server,!org.sonar.java.it.JavaRulingTest#guava</test>
+              <test>!org.sonar.java.it.JavaRulingTest#sonarqube_server</test>
             </configuration>
           </plugin>
         </plugins>
@@ -134,20 +134,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>only-guava-project</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <test>org.sonar.java.it.JavaRulingTest#guava</test>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
 </project>

its/ruling/mise.toml

@@ -132,7 +132,7 @@ public void guava() throws Exception {
     MavenBuild build = test_project(projectKey, projectName);
     build
       // by default guava is compatible with java 6, however this is not supported with JDK 17+
-      .setProperty("java.version", "1.7")
+      .setProperty("java.version", "1.8")
       .setProperty("maven.javadoc.skip", "true")
       // use batch
       .setProperty("sonar.java.experimental.batchModeSizeInKB", "8192");

its/ruling/pom.xml

@@ -0,0 +1,11 @@
+{
+"com.google.guava:guava:src/com/google/common/collect/StandardTable.java": [
+131
+],
+"com.google.guava:guava:src/com/google/common/eventbus/SubscriberRegistry.java": [
+198
+],
+"com.google.guava:guava:src/com/google/common/reflect/ClassPath.java": [
+395
+]
+}