From d0d499688be1567730c3a9eb820ab197045095b2 Mon Sep 17 00:00:00 2001
From: AnatolyPristensky <v-anatpr@microsoft.com>
Date: Wed, 22 Nov 2023 09:54:54 +0100
Subject: [PATCH] Migrate Maven Release to ESRP

---
 publish.gradle                        | 2 --
 scripts/put-bintray-secrets-gradle.sh | 7 +++----
 sdk/build.gradle                      | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/publish.gradle b/publish.gradle
index d6c4787e5d..09c67d4d89 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -17,9 +17,7 @@ ext {
         properties.load(file.newDataInputStream())
     }
 
-    mavenUser = properties.getProperty("maven.user")
     mavenKey = properties.getProperty("maven.key")
-    mavenRepoUrl = properties.getProperty("maven.repoUrl")
     mavenSigningKeyId = properties.getProperty("maven.signingKeyId")
     mavenPublicKeyPassword = properties.getProperty("maven.publicKeyPassword")
     mavenSecretKeyPath = properties.getProperty("maven.secretKeyPath")
diff --git a/scripts/put-bintray-secrets-gradle.sh b/scripts/put-bintray-secrets-gradle.sh
index 2f28938ec3..05bdfa2950 100755
--- a/scripts/put-bintray-secrets-gradle.sh
+++ b/scripts/put-bintray-secrets-gradle.sh
@@ -2,8 +2,7 @@
 cat >> local.properties << EOL
 maven.user=${1:-$MAVEN_USER}
 maven.key=${2:-$MAVEN_KEY}
-maven.repoUrl=${3:-$MAVEN_REPO}
-maven.signingKeyId=${4:-$GDP_SIGNING_KEY_ID}
-maven.secretKeyPath=${5:-$GDP_KEY_SECRET_PATH}
-maven.publicKeyPassword=${6:-$GDP_KEY_PASSWORD}
+maven.signingKeyId=${3:-$GDP_SIGNING_KEY_ID}
+maven.secretKeyPath=${4:-$GDP_KEY_SECRET_PATH}
+maven.publicKeyPassword=${5:-$GDP_KEY_PASSWORD}
 EOL
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 128a0f55b0..f86aadbac7 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -162,11 +162,7 @@ subprojects {
     publishing {
         repositories {
             maven {
-                url = ext.mavenRepoUrl
-                credentials {
-                    username = ext.mavenUser
-                    password = ext.mavenKey
-                }
+                url = uri("${System.env.BUILD_DIR}")
             }
         }