From: Carmine Vassallo <carmine.vassallo@sonarsource.com>
Date: Tue, 20 Dec 2022 16:25:25 +0000 (+0100)
Subject: SQSCANNER-108 Bump dependencies' and plugins' versions, update the embedded JRE to... 
X-Git-Tag: 4.8.0.2856~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1ac1104ea35ee43ca1b9658328951a2d6a378471;p=sonar-scanner-cli.git

SQSCANNER-108 Bump dependencies' and plugins' versions, update the embedded JRE to 11.0.17 (#141)
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 48a7e68..843fbb4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -68,7 +68,7 @@ build_task:
   cleanup_before_cache_script:
     - cleanup_maven_repository
 
-linux_qa_task:
+linux_qa_java11_task:
   depends_on:
     - build
   <<: *ONLY_SONARSOURCE_QA
@@ -76,7 +76,6 @@ linux_qa_task:
     <<: *EKS_CONTAINER
   env:
     matrix:
-      - SQ_VERSION: LATEST_RELEASE[7.9]
       - SQ_VERSION: LATEST_RELEASE[8.9]
       - SQ_VERSION: DEV
   maven_cache:
@@ -110,7 +109,7 @@ linux_qa_java17_task:
   cleanup_before_cache_script:
     - cleanup_maven_repository
 
-win_qa_task:
+win_qa_java11_task:
   depends_on:
     - build
   <<: *ONLY_SONARSOURCE_QA
@@ -119,7 +118,29 @@ win_qa_task:
   env:
     CIRRUS_SHELL: bash
     matrix:
-      - SQ_VERSION: LATEST_RELEASE[7.9]
+      - SQ_VERSION: LATEST_RELEASE[8.9]
+      - SQ_VERSION: DEV
+  maven_cache:
+    folder: ${CIRRUS_WORKING_DIR}/.m2/repository
+  qa_script:
+    - source cirrus-env QA
+    - source set_maven_build_version $BUILD_NUMBER
+    - cd it
+    - mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify
+  cleanup_before_cache_script:
+    - cleanup_maven_repository
+
+win_qa_java17_task:
+  depends_on:
+    - build
+  <<: *ONLY_SONARSOURCE_QA
+  ec2_instance:
+    <<: *EC2_INSTANCE_WINDOWS
+    image: base-windows-jdk17-v*
+  env:
+    CIRRUS_SHELL: bash
+    matrix:
+      - SQ_VERSION: LATEST_RELEASE[8.9]
       - SQ_VERSION: DEV
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
@@ -133,8 +154,10 @@ win_qa_task:
 
 promote_task:
   depends_on:
-    - linux_qa
-    - win_qa
+    - linux_qa_java11
+    - linux_qa_java17
+    - win_qa_java11
+    - win_qa_java17
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
     <<: *EKS_CONTAINER
diff --git a/pom.xml b/pom.xml
index ea114a5..74695a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,9 +52,9 @@
     <!-- configuration for assembly of distributions -->
     <unpack.dir>${project.build.directory}/unpack</unpack.dir>
     <scanner.jar>${project.build.finalName}.jar</scanner.jar>
-    <jre.dirname.linux>jdk-11.0.14.1+1-jre</jre.dirname.linux>
-    <jre.dirname.windows>jdk-11.0.14.1+1-jre</jre.dirname.windows>
-    <jre.dirname.macosx>jdk-11.0.14.1+1-jre/Contents/Home</jre.dirname.macosx>
+    <jre.dirname.linux>jdk-11.0.17+8-jre</jre.dirname.linux>
+    <jre.dirname.windows>jdk-11.0.17+8-jre</jre.dirname.windows>
+    <jre.dirname.macosx>jdk-11.0.17+8-jre/Contents/Home</jre.dirname.macosx>
 
     <!-- Release: enable publication to Bintray -->
     <artifactsToPublish>${project.groupId}:${project.artifactId}:zip,${project.groupId}:${project.artifactId}:zip:linux,${project.groupId}:${project.artifactId}:zip:windows,${project.groupId}:${project.artifactId}:zip:macosx,${project.groupId}:${project.artifactId}:json:cyclonedx</artifactsToPublish>
@@ -66,12 +66,12 @@
     <dependency>
       <groupId>org.sonarsource.scanner.api</groupId>
       <artifactId>sonar-scanner-api</artifactId>
-      <version>2.16.2.588</version>
+      <version>2.17.0.1059</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>2.0.3</version>
+      <version>3.0.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -91,13 +91,13 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.9.1</version>
+      <version>3.23.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.22.0</version>
+      <version>4.10.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -226,7 +226,7 @@
           <plugin>
             <groupId>com.googlecode.maven-download-plugin</groupId>
 	          <artifactId>download-maven-plugin</artifactId>
-	          <version>1.4.2</version>
+	          <version>1.6.8</version>
             <executions>
               <execution>
                 <id>unpack-linux</id>
@@ -235,10 +235,10 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.14.1_1.tar.gz</url>
+                  <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz</url>
                   <unpack>true</unpack>
                   <outputDirectory>${unpack.dir}/linux</outputDirectory>
-                  <sha256>b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98</sha256>
+                  <sha256>752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79</sha256>
                 </configuration>
               </execution>
             </executions>
@@ -276,7 +276,7 @@
           <plugin>
             <groupId>com.googlecode.maven-download-plugin</groupId>
             <artifactId>download-maven-plugin</artifactId>
-            <version>1.4.2</version>
+            <version>1.6.8</version>
             <executions>
               <execution>
                 <id>unpack-windows</id>
@@ -285,10 +285,10 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_windows_hotspot_11.0.14.1_1.zip</url>
+                  <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.17_8.zip</url>
                   <unpack>true</unpack>
                   <outputDirectory>${unpack.dir}/windows</outputDirectory>
-                  <sha256>49500200b482c407159e9907bb53efd2b2ad772623c3857c23c17c1304d421b5</sha256>
+                  <sha256>814a731f92dd67ad6cfb11a8b06dfad5f629f67be88ae5ae37d34e6eea6be6f4</sha256>
                 </configuration>
               </execution>
             </executions>
@@ -325,7 +325,7 @@
           <plugin>
             <groupId>com.googlecode.maven-download-plugin</groupId>
             <artifactId>download-maven-plugin</artifactId>
-            <version>1.4.2</version>
+            <version>1.6.8</version>
             <executions>
               <execution>
                 <id>unpack-macosx</id>
@@ -334,10 +334,10 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.14.1_1.tar.gz</url>
+                  <url>https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz</url>
                   <unpack>true</unpack>
                   <outputDirectory>${unpack.dir}/macosx</outputDirectory>
-                  <sha256>1b2f792ad05af9dba876db962c189527e645b48f50ceb842b4e39169de553303</sha256>
+                  <sha256>66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674</sha256>
                 </configuration>
               </execution>
             </executions>
@@ -369,4 +369,4 @@
     </profile>
   </profiles>
 
-</project>
+</project>
\ No newline at end of file