From 6cc3297dc0645e1eae7609d4a2d8179f93d5d55d Mon Sep 17 00:00:00 2001 From: Steve Marion Date: Thu, 14 Nov 2024 16:47:42 +0100 Subject: [PATCH] SONAR-23625 support for different version for community build. Co-authored-by: Alain Kermis Co-authored-by: Matteo Mara --- .../src/main/groovy/org.sonar.build/BlackBoxTest.groovy | 1 + gradle.properties | 2 +- server/sonar-db-dao/build.gradle | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org.sonar.build/BlackBoxTest.groovy b/buildSrc/src/main/groovy/org.sonar.build/BlackBoxTest.groovy index fb4a9859689..6284a251604 100644 --- a/buildSrc/src/main/groovy/org.sonar.build/BlackBoxTest.groovy +++ b/buildSrc/src/main/groovy/org.sonar.build/BlackBoxTest.groovy @@ -10,6 +10,7 @@ abstract class BlackBoxTest extends Test { if (!project.version.endsWith("-SNAPSHOT")) { systemProperty 'sonar.runtimeVersion', project.version + systemProperty 'sonar.communityRuntimeVersion', project.communityVersion } testLogging { diff --git a/gradle.properties b/gradle.properties index 4849068857d..0c7139146cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.sonarsource.sonarqube -version=10.8 +version=24.11 # End Of Life date for the version. MMF-3763. format is yyyy-MM-dd # 6 months from the release date for non LTA versions # 30 months from the release date for LTA versions diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle index e2785bd783d..85ef382ae91 100644 --- a/server/sonar-db-dao/build.gradle +++ b/server/sonar-db-dao/build.gradle @@ -68,9 +68,10 @@ task createDB(type:JavaExec) { mainClass = 'org.sonar.db.createdb.CreateDb' classpath = sourceSets.test.runtimeClasspath systemProperty 'orchestrator.configUrl', System.getProperty('orchestrator.configUrl') - if (!project.version.endsWith("-SNAPSHOT")) { - systemProperty 'sonar.runtimeVersion', project.version - } + if (!project.version.endsWith("-SNAPSHOT")) { + systemProperty 'sonar.runtimeVersion', project.version + systemProperty 'sonar.communityRuntimeVersion', project.version + } } task populateDB(type: JavaExec) { -- 2.39.5