From 1ac1104ea35ee43ca1b9658328951a2d6a378471 Mon Sep 17 00:00:00 2001 From: Carmine Vassallo Date: Tue, 20 Dec 2022 17:25:25 +0100 Subject: [PATCH] SQSCANNER-108 Bump dependencies' and plugins' versions, update the embedded JRE to 11.0.17 (#141) --- .cirrus.yml | 35 +++++++++++++++++++++++++++++------ pom.xml | 36 ++++++++++++++++++------------------ 2 files changed, 47 insertions(+), 24 deletions(-) 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 @@ ${project.build.directory}/unpack ${project.build.finalName}.jar - jdk-11.0.14.1+1-jre - jdk-11.0.14.1+1-jre - jdk-11.0.14.1+1-jre/Contents/Home + jdk-11.0.17+8-jre + jdk-11.0.17+8-jre + jdk-11.0.17+8-jre/Contents/Home ${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 @@ -66,12 +66,12 @@ org.sonarsource.scanner.api sonar-scanner-api - 2.16.2.588 + 2.17.0.1059 com.google.code.findbugs jsr305 - 2.0.3 + 3.0.2 provided @@ -79,7 +79,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -91,13 +91,13 @@ org.assertj assertj-core - 3.9.1 + 3.23.1 test org.mockito mockito-core - 2.22.0 + 4.10.0 test @@ -226,7 +226,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.4.2 + 1.6.8 unpack-linux @@ -235,10 +235,10 @@ wget - 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 + https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz true ${unpack.dir}/linux - b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98 + 752616097e09d7f60a3ad8bd312f90eaf50ac72577e55df229fe6e8091148f79 @@ -276,7 +276,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.4.2 + 1.6.8 unpack-windows @@ -285,10 +285,10 @@ wget - 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 + https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.17_8.zip true ${unpack.dir}/windows - 49500200b482c407159e9907bb53efd2b2ad772623c3857c23c17c1304d421b5 + 814a731f92dd67ad6cfb11a8b06dfad5f629f67be88ae5ae37d34e6eea6be6f4 @@ -325,7 +325,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.4.2 + 1.6.8 unpack-macosx @@ -334,10 +334,10 @@ wget - 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 + https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.17%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.17_8.tar.gz true ${unpack.dir}/macosx - 1b2f792ad05af9dba876db962c189527e645b48f50ceb842b4e39169de553303 + 66508958b5da6e36021d960b65490ab70cc7d44851c98301a3d6d3552f305674 @@ -369,4 +369,4 @@ - + \ No newline at end of file -- 2.39.5