From acc45448fcd92e02b7cae10013cccd4becddc183 Mon Sep 17 00:00:00 2001 From: Aurelien Poscia Date: Wed, 14 Jun 2023 10:07:46 +0200 Subject: [PATCH] BUILD-3122 Fix ES Url for public build --- build.gradle | 18 +++++++++++------- sonar-application/build.gradle | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 8f1f573399b..a4b500073de 100644 --- a/build.gradle +++ b/build.gradle @@ -99,16 +99,20 @@ allprojects { username artifactoryUsername password artifactoryPassword } + url "https://repox.jfrog.io/repox/sonarsource-bucket" + + patternLayout { + artifact '/[organisation]/[module]/[module]-[revision].[ext]' + } } else { - // Workaround for artifactory - // https://www.jfrog.com/jira/browse/RTFACT-13797 - repository = 'public' - } - url "https://repox.jfrog.io/repox/sonarsource-bucket" + // For public build + url "https://artifacts.elastic.co/downloads/" - patternLayout { - artifact '/[organisation]/[module]/[module]-[revision].[ext]' + patternLayout { + artifact '/[organisation]/[module]-[revision].[ext]' + } } + metadataSources { artifact() } } } diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index ba920c13849..bc479692c4e 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -79,7 +79,7 @@ dependencies { if (artifactoryUsername && artifactoryPassword) { zipDist "sonarqube:elasticsearch:${elasticsearchVersion}-no-jdk-linux-x86_64@tar.gz" } else { - zipDist "sonarqube:elasticsearch:${elasticsearchVersion}-linux-x86_64@tar.gz" + zipDist "elasticsearch:elasticsearch:${elasticsearchVersion}-linux-x86_64@tar.gz" } } -- 2.39.5