From 9f221c53d2b702eb010cc1fb3e07a5b1b66b2ef5 Mon Sep 17 00:00:00 2001 From: Thomas Holenstein Date: Fri, 9 Aug 2024 06:22:24 -0700 Subject: [PATCH] Automated rollback of commit e97ea04bc5b13ae7699db077e9b0fce9f22222ba. PiperOrigin-RevId: 661239485 Change-Id: I7da1576fde36f2176eacd182eec4193fa5607843 --- maven/maven_deploy_library.sh | 3 +-- maven/maven_deploy_library_test.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/maven/maven_deploy_library.sh b/maven/maven_deploy_library.sh index 4b91fdd..721db5d 100755 --- a/maven/maven_deploy_library.sh +++ b/maven/maven_deploy_library.sh @@ -124,9 +124,8 @@ parse_args() { if [[ -z "${GIT_URL}" ]]; then usage fi - # TODO(b/329143784): Move to 3.2.0 when possible. MAVEN_ARGS+=( - "org.apache.maven.plugins:maven-gpg-plugin:3.1.0:sign-and-deploy-file" + "gpg:sign-and-deploy-file" "-DrepositoryId=ossrh" "-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/" "-Dgpg.keyname=tink-dev@google.com" diff --git a/maven/maven_deploy_library_test.sh b/maven/maven_deploy_library_test.sh index 0283506..2bdc3d3 100755 --- a/maven/maven_deploy_library_test.sh +++ b/maven/maven_deploy_library_test.sh @@ -196,8 +196,7 @@ test_MavenDeployLibraryTest_ReleaseSucceeds() { cat << EOF > expected_commands.txt bazel build tink.jar tink-src.jar tink-javadoc.jar -mvn org.apache.maven.plugins:maven-gpg-plugin:3.1.0:sign-and-deploy-file \ --DrepositoryId=ossrh \ +mvn gpg:sign-and-deploy-file -DrepositoryId=ossrh \ -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \ -Dgpg.keyname=tink-dev@google.com \ --settings=${TEST_CASE_TMPDIR}/${RELATIVE_MVN_DIR_PATH}/settings.xml \