Merge pull request #1715 from microsoft/migrate-maven-release-to-esrp

[CI] Migrate Maven-Release to ESRP-Release task
microsoft · Nov 22, 2023 · d406e11 · d406e11
2 parents 7fffffe + d0d4996
commit d406e11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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
@@ -162,11 +162,7 @@ subprojects {
     publishing {
         repositories {
             maven {
-                url = ext.mavenRepoUrl
-                credentials {
-                    username = ext.mavenUser
-                    password = ext.mavenKey
-                }
+                url = uri("${System.env.BUILD_DIR}")
             }
         }