BUILD-3122 Fix ES Url for public build

diff --git a/build.gradle b/build.gradle
index 8f1f573399b481cb290f1d401f426b6773e78bd1..a4b500073de8cd17465177beeba977b3d8d5286a 100644 (file)
--- 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 ba920c1384957eaac4b3c75d0222ddbc7a6e0292..bc479692c4e92fa04e9d2172b86ec9aa90159481 100644 (file)
--- 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"
     }
 
 }