From b7856e66258962d35a79b3575e5940180733c1eb Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 11 Dec 2024 15:38:20 +0100 Subject: [PATCH] SONARGO-73 Update Gradle wrapper and SQ Gradle plugin --- .cirrus.yml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- its/plugin/build.gradle | 2 +- its/ruling/build.gradle | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0ec3b01f..8b7e8813 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -59,7 +59,7 @@ cleanup_gradle_cache_script_template: &CLEANUP_GRADLE_CACHE_SCRIPT - rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/build-cache-1/" build_task: - <<: *LINUX_2_CPU_4G + <<: *LINUX_4_CPU_6G_JAVA_17 <<: *SETUP_GRADLE_CACHE env: SONAR_TOKEN: VAULT[development/kv/data/next data.token] diff --git a/build.gradle b/build.gradle index 71c6d374..f3c9cb44 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import java.util.jar.JarInputStream plugins { id 'com.jfrog.artifactory' version '4.28.2' - id 'org.sonarqube' version '3.5.0.2730' + id 'org.sonarqube' version '6.0.1.5171' id 'de.thetaphi.forbiddenapis' version '3.0' apply false id 'com.diffplug.spotless' version '6.15.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7d437bb..f19a9a46 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/its/plugin/build.gradle b/its/plugin/build.gradle index 7a9c0508..bc3e54ef 100644 --- a/its/plugin/build.gradle +++ b/its/plugin/build.gradle @@ -11,7 +11,7 @@ dependencies { testRuntimeOnly testLibs.junit.vintage.engine } -sonarqube.skipProject = true +sonar.skipProject = true test { onlyIf { diff --git a/its/ruling/build.gradle b/its/ruling/build.gradle index dda1c08b..a847ad92 100644 --- a/its/ruling/build.gradle +++ b/its/ruling/build.gradle @@ -9,7 +9,7 @@ dependencies { testRuntimeOnly testLibs.junit.vintage.engine } -sonarqube.skipProject = true +sonar.skipProject = true test { onlyIf {