SONARJAVA-5615 Build using Java 24 (#5198)

Author: alban-auzeill

.cirrus.yml

@@ -51,8 +51,7 @@ log_develocity_url_script: &log_develocity_url_script |
 
 common_build_definition: &COMMON_BUILD_DEFINITION
   eks_container:
-    <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j23-latest
+    <<: *CONTAINER_WITH_DOCKER_DEFINITION
     cpu: 4
     memory: 4G
   env:
@@ -63,6 +62,7 @@ common_build_definition: &COMMON_BUILD_DEFINITION
     SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
     #allow deployment of pull request artifacts to repox
     DEPLOY_PULL_REQUEST: true
+    JAVA_HOME: /opt/java/openjdk-latest
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
 
@@ -105,8 +105,7 @@ test_analyze_task:
 ws_scan_task:
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
-    <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
+    <<: *CONTAINER_WITH_DOCKER_DEFINITION
     cpu: 4
     memory: 4G
   # run only on master and long-term branches
@@ -144,8 +143,7 @@ plugin_qa_task:
     - build
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
-    <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
+    <<: *CONTAINER_WITH_DOCKER_DEFINITION
     cpu: 14
     memory: 8G
   <<: *ORCHESTRATOR_CACHE_PREPARATION_DEFINITION
@@ -176,12 +174,13 @@ sanity_task:
     - build
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
-    <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j23-latest
+    <<: *CONTAINER_WITH_DOCKER_DEFINITION
     cpu: 4
     memory: 4G
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
+  env:
+    JAVA_HOME: /opt/java/openjdk-latest
   sanity_script:
     - *log_develocity_url_script
     - source cirrus-env QA
@@ -197,8 +196,7 @@ ruling_task:
     - build
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
-    <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
+    <<: *CONTAINER_WITH_DOCKER_DEFINITION
     cpu: 14
     memory: 8G
   maven_cache:
@@ -258,9 +256,9 @@ autoscan_task:
   eks_container:
     <<: *CONTAINER_WITH_DOCKER_DEFINITION
     # For now, this autoscan_task need to execute two mvn commands:
-    # * The build of java-checks-test-sources module which requires Java 23.
-    # * The tests using Orchestrator and SonarQube that, for now, fail to work using Java 23
-    # This is why we have a local Dockerfile that provide the 2 versions of Java, 17 and 23.
+    # * The build of java-checks-test-sources module which requires Java 24.
+    # * The tests using Orchestrator and SonarQube that, for now, fail to work using Java 24
+    # This is why we have a local Dockerfile that provide the 2 versions of Java, 17 and 24.
     cpu: 14
     memory: 8G
   maven_cache:
@@ -273,7 +271,7 @@ autoscan_task:
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
     - cd java-checks-test-sources
-    - JAVA_HOME="${JAVA_LATEST_HOME}" mvn clean compile test-compile --batch-mode
+    - JAVA_HOME=/opt/java/openjdk-latest mvn clean compile test-compile --batch-mode
     - cd ../its/autoscan
     - mvn clean package --batch-mode --errors --show-version --activate-profiles it-autoscan -Dsonar.runtimeVersion=LATEST_RELEASE -Dmaven.test.redirectTestOutputToFile=false -Dparallel=methods -DuseUnlimitedThreads=true
   cleanup_before_cache_script: cleanup_maven_repository
@@ -294,8 +292,7 @@ promote_task:
     - autoscan
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
-    <<: *CONTAINER_DEFINITION
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
+    <<: *CONTAINER_WITH_DOCKER_DEFINITION
     cpu: 2
     memory: 1G
   env:

.cirrus/Dockerfile.jdk17AndLatest

@@ -7,40 +7,12 @@ USER root
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# The current image is `FROM public.ecr.aws/docker/library/eclipse-temurin:17-jammy`
-# Use a similar method to install Java 23 copied from https://github.com/adoptium/containers/blob/main/22/jdk/ubuntu/jammy/Dockerfile
+# Copy openjdk from https://github.com/adoptium/containers/blob/main/24/jdk/ubuntu/noble/Dockerfile
+COPY --from=eclipse-temurin:24.0.1_9-jdk-noble /opt/java/openjdk /opt/java/openjdk-latest
 
-ENV JAVA_LATEST_HOME /opt/java/openjdk23
-ENV JAVA_LATEST_VERSION jdk-23.0.1+11
-
-RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
-    case "${ARCH}" in \
-       amd64) \
-         ESUM='2400267e4e9c0f6ae880a4d763af6caf18c673714bdee5debf8388b0b5d52886'; \
-         BINARY_URL='https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz'; \
-         ;; \
-       arm64) \
-         ESUM='0b498a5b673cb50fe9cfd0a13bd39c7259b4fad4d930d614e1563aeb8bca7f0e'; \
-         BINARY_URL='https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.1_11.tar.gz'; \
-         ;; \
-       *) \
-         echo "Unsupported arch: ${ARCH}"; \
-         exit 1; \
-         ;; \
-    esac; \
-    wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
-    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
-    mkdir -p "${JAVA_LATEST_HOME}"; \
-    tar --extract \
-        --file /tmp/openjdk.tar.gz \
-        --directory "${JAVA_LATEST_HOME}" \
-        --strip-components 1 \
-        --no-same-owner \
-    ; \
-    rm -f /tmp/openjdk.tar.gz "${JAVA_LATEST_HOME}/lib/src.zip"; \
-    # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
-    find "${JAVA_LATEST_HOME}/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+# https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
+RUN find "/opt/java/openjdk-latest/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
     ldconfig; \
     # https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
     # https://openjdk.java.net/jeps/341

.cirrus/install-latest-java-on-windows.ps1

@@ -1,6 +1,6 @@
-$javaVersion    = "23.0.1+11"
-$sha256_x64     = "eb1bc62060f17566b160fae8ce876ada5d639e2fd4781009a1219e971b9937dd"
-$sha256_aarch64 = "00ea8896d42ac26cb6887eef08cd6e3b2a54f30e9e87b0fc965e66813567ac87"
+$javaVersion    = "24.0.1+9"
+$sha256_x64     = "2ef7f20c00577747d23999c7b29a0d35d73aeeb9d67aec0aa9825e59084447c3"
+$sha256_aarch64 = "aarch64 platform is currently unavailable, see https://adoptium.net/en-GB/news/2025/04/eclipse-temurin-8u452-11027-17015-2107-2401-available/"
 
 Write-Output "Installing Java ${javaVersion}"
 

its/autoscan/src/test/java/org/sonar/java/it/AutoScanTest.java

@@ -124,8 +124,8 @@ public void javaCheckTestSources() throws Exception {
       .setProjectVersion("0.1.0-SNAPSHOT")
       .setSourceEncoding("UTF-8")
       .setSourceDirs("aws/src/main/java/,default/src/main/java/,java-17/src/main/java/,spring-3.2/src/main/java/,spring-web-4.0/src/main/java/")
-      .setTestDirs("default/src/test/java/,test-classpath-reader/src/test/java")
-      .setProperty("sonar.java.source", "23")
+      .setTestDirs("default/src/test/java/,java-17/src/test/java/,test-classpath-reader/src/test/java")
+      .setProperty("sonar.java.source", "24")
       // common properties
       .setProperty("sonar.cpd.exclusions", "**/*")
       .setProperty("sonar.skipPackageDesign", "true")

its/autoscan/src/test/resources/autoscan/diffs/diff_S1128.json

@@ -1,6 +1,6 @@
 {
   "ruleKey": "S1128",
   "hasTruePositives": true,
-  "falseNegatives": 32,
+  "falseNegatives": 30,
   "falsePositives": 0
 }

its/autoscan/src/test/resources/autoscan/diffs/diff_S1874.json

@@ -1,6 +1,6 @@
 {
   "ruleKey": "S1874",
   "hasTruePositives": true,
-  "falseNegatives": 249,
+  "falseNegatives": 245,
   "falsePositives": 0
 }

java-checks-aws/src/test/java/org/sonar/java/checks/CommonConstants.java

@@ -19,8 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.sonar.java.checks.verifier.CheckVerifier;
 
-import static org.sonar.java.checks.CommonConstants.AWS_CLASSPATH;
-import static org.sonar.java.checks.CommonConstants.AWS_MODULE;
+import static org.sonar.java.test.classpath.TestClasspathUtils.AWS_MODULE;
 import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPathInModule;
 import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPathInModule;
 
@@ -31,7 +30,7 @@ void test() {
     CheckVerifier.newVerifier()
       .onFile(mainCodeSourcesPathInModule(AWS_MODULE, "checks/aws/AwsConsumerBuilderUsageCheckSample.java"))
       .withCheck(new AwsConsumerBuilderUsageCheck())
-      .withClassPath(AWS_CLASSPATH)
+      .withClassPath(AWS_MODULE.getClassPath())
       .verifyIssues();
   }
 
@@ -40,7 +39,7 @@ void non_compiling() {
     CheckVerifier.newVerifier()
       .onFile(nonCompilingTestSourcesPathInModule(AWS_MODULE, "checks/aws/AwsConsumerBuilderUsageCheckSample.java"))
       .withCheck(new AwsConsumerBuilderUsageCheck())
-      .withClassPath(AWS_CLASSPATH)
+      .withClassPath(AWS_MODULE.getClassPath())
       .verifyIssues();
   }
 

java-checks-aws/src/test/java/org/sonar/java/checks/aws/AwsConsumerBuilderUsageCheckTest.java

@@ -19,9 +19,8 @@
 import org.junit.jupiter.api.Test;
 import org.sonar.java.checks.verifier.CheckVerifier;
 
-import static org.sonar.java.checks.CommonConstants.AWS_CLASSPATH;
-import static org.sonar.java.checks.CommonConstants.AWS_MODULE;
 import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPathInModule;
+import static org.sonar.java.test.classpath.TestClasspathUtils.AWS_MODULE;
 
 
 class AwsCredentialsShouldBeSetExplicitlyCheckTest {
@@ -30,7 +29,7 @@ void test() {
     CheckVerifier.newVerifier()
       .onFile(mainCodeSourcesPathInModule(AWS_MODULE, "checks/aws/AwsCredentialsShouldBeSetExplicitlyCheckSample.java"))
       .withCheck(new AwsCredentialsShouldBeSetExplicitlyCheck())
-      .withClassPath(AWS_CLASSPATH)
+      .withClassPath(AWS_MODULE.getClassPath())
       .verifyIssues();
   }
 

java-checks-aws/src/test/java/org/sonar/java/checks/aws/AwsCredentialsShouldBeSetExplicitlyCheckTest.java

@@ -19,9 +19,8 @@
 import org.junit.jupiter.api.Test;
 import org.sonar.java.checks.verifier.CheckVerifier;
 
-import static org.sonar.java.checks.CommonConstants.AWS_CLASSPATH;
-import static org.sonar.java.checks.CommonConstants.AWS_MODULE;
 import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPathInModule;
+import static org.sonar.java.test.classpath.TestClasspathUtils.AWS_MODULE;
 
 class AwsLambdaSyncCallCheckTest {
 
@@ -30,7 +29,7 @@ void test() {
     CheckVerifier.newVerifier()
       .onFile(mainCodeSourcesPathInModule(AWS_MODULE, "checks/aws/AwsLambdaSyncCallCheckSample.java"))
       .withCheck(new AwsLambdaSyncCallCheck())
-      .withClassPath(AWS_CLASSPATH)
+      .withClassPath(AWS_MODULE.getClassPath())
       .verifyIssues();
   }
 }