From f8f1e34de508bab3e406286cbf83b0a729c2f875 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Thu, 11 Jul 2024 13:17:48 +0100
Subject: [PATCH] Update to 3.0.0 release

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

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c002be5..8965969 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -26,12 +26,13 @@ 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_USERNAME }}
+        sonatype_password: ${{ secrets.OSSRH_PASSWORD }}
         signing_key: ${{ secrets.GPG_PRIVATE_KEY }}
         passphrase: ${{ secrets.GPG_PASSPHRASE }}
       run: |
           echo "${signing_key}" > private.asc
           gpg --import --batch --no-tty private.asc
+          export 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`
           ./mvnw -B deploy -s .mvn/settings.xml
 
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index ff45800..585d752 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>tokenuser</username>
+			<password>${env.token}</password>
 		</server>
 		<server>
 			<id>repo.spring.io</id>
diff --git a/pom.xml b/pom.xml
index 95989cf..1f1f5fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.guice</groupId>
 	<artifactId>spring-guice</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0</version>
 
 	<name>spring-guice</name>
 	<description>Utilities for using Spring with Guice and vice versa</description>
@@ -88,7 +88,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring.version>6.1.10</spring.version>
 		<!-- Important for reproducible builds. Update using e.g. ./mvnw versions:set -DnewVersion=... -->
-		<project.build.outputTimestamp>2024-07-11T12:15:41Z</project.build.outputTimestamp>
+		<project.build.outputTimestamp>2024-07-11T12:23:44Z</project.build.outputTimestamp>
 	</properties>
 
 	<build>