diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c002be5..dcf4e9d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -26,12 +26,16 @@ 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 + 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 @@ sonatype-nexus-staging - ${env.sonatype_username} - ${env.sonatype_password} + ${env.nexus_username} + ${env.nexus_password} repo.spring.io diff --git a/pom.xml b/pom.xml index 95989cf..1f1f5fb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.guice spring-guice - 3.0.0-SNAPSHOT + 3.0.0 spring-guice Utilities for using Spring with Guice and vice versa @@ -88,7 +88,7 @@ UTF-8 6.1.10 - 2024-07-11T12:15:41Z + 2024-07-11T12:23:44Z