Attempt simpler creds for Maven release

spring-projects · Jul 12, 2024 · 4100b6b · 4100b6b
1 parent 28c77fc
commit 4100b6b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -26,16 +26,11 @@ jobs:
       env:
         spring_username: ${{ secrets.ARTIFACTORY_USERNAME }}
         spring_password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        sonatype_username: ${{ secrets.SONATYPE_USERNAME }}
-        sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
+        sonatype_username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
+        sonatype_password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
         signing_key: ${{ secrets.GPG_PRIVATE_KEY }}
         passphrase: ${{ secrets.GPG_PASSPHRASE }}
       run: |
           echo "${signing_key}" > private.asc
           gpg --import --batch --no-tty private.asc
-          token=`curl -H "Accept: application/json" -H "Content-Type: application/json" --data '{"u":"'$(echo -n $sonatype_username | base64)'","p":"'$(echo -n $sonatype_password | base64)'"}' -u $sonatype_username:$sonatype_password https://oss.sonatype.org/service/siesta/wonderland/authenticate | jq -r .t`
-          creds=`curl -H "Accept: application/json" -H "Content-Type: application/json" -H "X-NX-AuthTicket: $token" -u $sonatype_username:$sonatype_password https://oss.sonatype.org/service/siesta/usertoken/current`
-          export nexus_username=`echo $creds | jq -r .nameCode`
-          export nexus_password=`echo $creds | jq -r .passCode`
           ./mvnw -B deploy -s .mvn/settings.xml
-
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -14,8 +14,8 @@
 	<servers>
 		<server>
 			<id>sonatype-nexus-staging</id>
-			<username>${env.nexus_username}</username>
-			<password>${env.nexus_password}</password>
+			<username>${env.sonatype_username}</username>
+			<password>${env.sonatype_password}</password>
 		</server>
 		<server>
 			<id>repo.spring.io</id>

diff --git a/pom.xml b/pom.xml
@@ -248,7 +248,7 @@ limitations under the License.
 		<repository>
 			<id>sonatype-nexus-staging</id>
 			<name>Nexus Release Repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 		<snapshotRepository>
 			<id>repo.spring.io</id>