From aa1fee2ae2a813ecc4ffe302c1429219707b5a73 Mon Sep 17 00:00:00 2001
From: Antoine Vigneau <antoine.vigneau@sonarsource.com>
Date: Thu, 12 Oct 2023 15:48:07 +0200
Subject: [PATCH] NOJIRA Fully rely on Cirrus env variables

---
 build.gradle | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index db4bea40eb9..848b4e95276 100644
--- 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]'
-- 
2.39.5