From 28c77fc91d86cf36c521626a3f567cb27924bf60 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Fri, 12 Jul 2024 10:51:41 +0100
Subject: [PATCH] Tweak Maven Central cred handling

---
 .github/workflows/push.yml | 4 ++++
 .mvn/settings.xml          | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8dfad3b..ce2e6e3 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -33,5 +33,9 @@ jobs:
       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
index ff45800..e8984c1 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -14,8 +14,8 @@
 	<servers>
 		<server>
 			<id>sonatype-nexus-staging</id>
-			<username>${env.sonatype_username}</username>
-			<password>${env.sonatype_password}</password>
+			<username>${env.nexus_username}</username>
+			<password>${env.nexus_password}</password>
 		</server>
 		<server>
 			<id>repo.spring.io</id>