SCANCLI-180 Change compilation to target Java 11 (#223)

4 files changed, 16 insertions, 5 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index a489c04..69418f2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -92,7 +92,7 @@ mend_scan_task:
     ws_artifacts:
       path: "whitesource/**/*"
 
-linux_x64_qa_java17_task:
+linux_x64_qa_java11_task:
   depends_on:
     - build
   <<: *ONLY_SONARSOURCE_QA
@@ -113,6 +113,9 @@ linux_x64_qa_java17_task:
     - export PATH=$PATH:/tmp/${nodeName}/bin
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
+    - wget -O OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz
+    - tar xzf OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz -C /tmp
+    - export JAVA_11_HOME=/tmp/jdk-11.0.27+6-jre
     - cd it
     - mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify
   cleanup_before_cache_script:
@@ -142,7 +145,7 @@ win_x64_qa_java17_task:
 
 promote_task:
   depends_on:
-    - linux_x64_qa_java17
+    - linux_x64_qa_java11
     - win_x64_qa_java17
   <<: *ONLY_SONARSOURCE_QA_EXCEPT_ON_NIGHTLY_CRON
   eks_container:
diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
index 6b12552..4601cad 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
@@ -103,6 +103,9 @@ public abstract class ScannerTestCase {
 
   SonarScanner newScannerWithToken(File baseDir, String token, String... keyValueProperties) {
     SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties);
+    if (System.getenv().containsKey("JAVA_11_HOME")) {
+      scannerCli.getEnvironmentVariables().put("JAVA_HOME", System.getenv("JAVA_11_HOME"));
+    }
     scannerCli.setScannerVersion(artifactVersion().toString());
     if (orchestrator.getServer().version().isGreaterThanOrEquals(10, 0)) {
       scannerCli.setProperty("sonar.token", token);
@@ -115,6 +118,9 @@ public abstract class ScannerTestCase {
 
   SonarScanner newScannerWithAdminCredentials(File baseDir, String... keyValueProperties) {
     SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties);
+    if (System.getenv().containsKey("JAVA_11_HOME")) {
+      scannerCli.getEnvironmentVariables().put("JAVA_HOME", System.getenv("JAVA_11_HOME"));
+    }
     scannerCli.setScannerVersion(artifactVersion().toString());
     if (orchestrator.getServer().version().isGreaterThanOrEquals(25, 1)) {
       scannerCli.setProperty("sonar.token", orchestrator.getDefaultAdminToken());
diff --git a/pom.xml b/pom.xml
index 33b8ccf..b69353c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <!-- Release: enable publication to Bintray -->
     <artifactsToPublish>${project.groupId}:${project.artifactId}:zip,${project.groupId}:${project.artifactId}:zip:linux-x64,${project.groupId}:${project.artifactId}:zip:linux-aarch64,${project.groupId}:${project.artifactId}:zip:windows-x64,${project.groupId}:${project.artifactId}:zip:macosx-x64,${project.groupId}:${project.artifactId}:zip:macosx-aarch64,${project.groupId}:${project.artifactId}:json:cyclonedx</artifactsToPublish>
 
-    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.release>11</maven.compiler.release>
   </properties>
 
   <dependencyManagement>
diff --git a/src/test/java/testutils/LogTester.java b/src/test/java/testutils/LogTester.java
index 4b87c52..8a9d0f0 100644
--- a/src/test/java/testutils/LogTester.java
+++ b/src/test/java/testutils/LogTester.java
@@ -28,6 +28,8 @@ import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 
+import static java.util.stream.Collectors.*;
+
 public class LogTester implements BeforeEachCallback, AfterEachCallback {
 
   private final ConcurrentListAppender<ILoggingEvent> listAppender = new ConcurrentListAppender<>();
@@ -55,7 +57,7 @@ public class LogTester implements BeforeEachCallback, AfterEachCallback {
   public List<String> logs() {
     return listAppender.list.stream().map(e -> (LoggingEvent) e)
       .map(LoggingEvent::getFormattedMessage)
-      .toList();
+      .collect(toList());
   }
 
   /**
@@ -66,7 +68,7 @@ public class LogTester implements BeforeEachCallback, AfterEachCallback {
     return listAppender.list.stream().map(e -> (LoggingEvent) e)
       .filter(e -> e.getLevel().equals(ch.qos.logback.classic.Level.fromLocationAwareLoggerInteger(level.toInt())))
       .map(LoggingEvent::getFormattedMessage)
-      .toList();
+      .collect(toList());
   }
 
   public LogTester clear() {