diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle.properties | 3 | ||||
| -rw-r--r-- | sonar-application/build.gradle | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle index 47f98fd8d8a..914ab7e9331 100644 --- a/build.gradle +++ b/build.gradle @@ -328,7 +328,7 @@ subprojects { dependency 'com.sonarsource.architecture:sonar-architecture-java-frontend-plugin:1.4.0.2329' // Webapp - dependency "com.sonarsource.sonarqube:webapp-assets:$webappVersion" + dependency "org.sonarsource.sonarqube:webapp-assets:$webappVersion" // please keep this list alphabetically ordered dependencySet(group: 'ch.qos.logback', version: '1.5.6') { diff --git a/gradle.properties b/gradle.properties index 9316a5bbc79..71d864692fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,4 @@ elasticSearchServerVersion=8.16.1 projectType=application artifactoryUrl=https://repox.jfrog.io/repox jre_release_name=jdk-17.0.13+11 -#TODO: Set to first deployed version! -webappVersion=10.8.0.9618 +webappVersion=10.8.0.10048 diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index d7dfd63886f..31e72eb12db 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -76,13 +76,13 @@ dependencies { jdbc_mssql 'com.microsoft.sqlserver:mssql-jdbc' jdbc_postgresql 'org.postgresql:postgresql' + webapp 'org.sonarsource.sonarqube:webapp-assets' def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME' ?: (project.hasProperty('artifactoryUsername') ? project.getProperty('artifactoryUsername') : '') def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' ?: (project.hasProperty('artifactoryPassword') ? project.getProperty('artifactoryPassword') : '') if (artifactoryUsername && artifactoryPassword) { zipDist "sonarqube:elasticsearch:${elasticSearchServerVersion}-no-jdk@tar.gz" - webapp 'com.sonarsource.sonarqube:webapp-assets' } else { zipDist "elasticsearch:elasticsearch:${elasticSearchServerVersion}-linux-x86_64@tar.gz" } @@ -312,15 +312,10 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath]) { def webappBuildPath = System.getenv('WEBAPP_BUILD_PATH') - def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME' ?: (project.hasProperty('artifactoryUsername') ? project.getProperty('artifactoryUsername') : '') - def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' ?: (project.hasProperty('artifactoryPassword') ? project.getProperty('artifactoryPassword') : '') - if (webappBuildPath == null && artifactoryUsername && artifactoryPassword) { + if (webappBuildPath == null) { from(zipTree(configurations.webapp.singleFile)) } else { - // TODO: fix default location! - webappBuildPath ?= "../sonarqube-webapp/server/sonar-web/build/webapp" - assert rootProject.file(webappBuildPath).exists() from(rootProject.fileTree(webappBuildPath)) |