diff options
author | Jacek Poreda <jacek.poreda@sonarsource.com> | 2024-01-29 17:20:11 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2024-01-30 15:02:02 +0000 |
commit | 3c923a113b98aa9c4ebacf5ceacf9b23160b1c99 (patch) | |
tree | 0799851c425b5992fecba6fba7821cc82f6db0b4 | |
parent | b30ba54383fa653ee40c4b97b9d5c96106361b6a (diff) | |
download | sonarqube-3c923a113b98aa9c4ebacf5ceacf9b23160b1c99.tar.gz sonarqube-3c923a113b98aa9c4ebacf5ceacf9b23160b1c99.zip |
SONAR-21476 Fix public repository
-rw-r--r-- | build.gradle | 33 | ||||
-rw-r--r-- | settings.gradle | 20 |
2 files changed, 33 insertions, 20 deletions
diff --git a/build.gradle b/build.gradle index 431cb948799..23d4fd0fa2f 100644 --- a/build.gradle +++ b/build.gradle @@ -73,21 +73,28 @@ allprojects { throw new GradleException('Invalid artifactoryUrl') } - maven { - if (artifactoryPassword) { - authentication { - header(HttpHeaderAuthentication) - } - credentials(HttpHeaderCredentials) { - name = "Authorization" - value = "Bearer $artifactoryPassword" - } - } else { - // Workaround for artifactory - // https://www.jfrog.com/jira/browse/RTFACT-13797 - repository = 'public' + if (artifactoryPassword) { + if (artifactoryUrl == '') { + throw new GradleException('Invalid artifactoryUrl') + } + maven { + authentication { + header(HttpHeaderAuthentication) + } + credentials(HttpHeaderCredentials) { + name = "Authorization" + value = "Bearer $artifactoryPassword" } url "${artifactoryUrl}/${repository}" + } + } else { + mavenCentral() + maven { + url 'https://jitpack.io' + } + maven { + url 'https://maven.codelibs.org/' + } } ivy { if (artifactoryUsername && artifactoryPassword) { diff --git a/settings.gradle b/settings.gradle index 1c1fa09fb5e..99c930014da 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,19 @@ pluginManagement { repositories { + def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' + maven { - url 'https://repox.jfrog.io/repox/plugins.gradle.org/' - authentication { - header(HttpHeaderAuthentication) - } - credentials(HttpHeaderCredentials) { - name = "Authorization" - value = "Bearer $System.env.ARTIFACTORY_PRIVATE_PASSWORD" + if (artifactoryPassword) { + url 'https://repox.jfrog.io/repox/plugins.gradle.org/' + authentication { + header(HttpHeaderAuthentication) + } + credentials(HttpHeaderCredentials) { + name = "Authorization" + value = "Bearer $artifactoryPassword" + } + } else { + url 'https://plugins.gradle.org/m2/' } } } |