NOJIRA Fully rely on Cirrus env variables

SonarSource · Feb 6, 2024 · aa1fee2 · aa1fee2
1 parent 5e6ead9
commit aa1fee2
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,14 +74,11 @@ allprojects {
     }
 
     maven {
-        if (artifactoryPassword) {
-          authentication {
-            header(HttpHeaderAuthentication)
-          }
-          credentials(HttpHeaderCredentials) {
-            name = "Authorization"
-            value = "Bearer $artifactoryPassword"
-          }
+        if (artifactoryUsername && artifactoryPassword) {
+            credentials {
+                username artifactoryUsername
+                password artifactoryPassword
+            }
         } else {
             // Workaround for artifactory
             // https://www.jfrog.com/jira/browse/RTFACT-13797
@@ -91,14 +88,11 @@ allprojects {
     }
     ivy {
           if (artifactoryUsername && artifactoryPassword) {
-              url "${artifactoryUrl}/sonarsource-bucket"
-              authentication {
-                header(HttpHeaderAuthentication)
-              }
-              credentials(HttpHeaderCredentials) {
-                name = "Authorization"
-                value = "Bearer $artifactoryPassword"
+              credentials {
+                  username artifactoryUsername
+                  password artifactoryPassword
               }
+              url "${artifactoryUrl}/sonarsource-bucket"
 
               patternLayout {
                 artifact '/[organisation]/[module]/[module]-[revision].[ext]'