diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ce2e6e3..3164618 100644 --- 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 index e8984c1..ff45800 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -14,8 +14,8 @@ sonatype-nexus-staging - ${env.nexus_username} - ${env.nexus_password} + ${env.sonatype_username} + ${env.sonatype_password} repo.spring.io diff --git a/pom.xml b/pom.xml index ce6fd72..675b6f4 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ limitations under the License. sonatype-nexus-staging Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ repo.spring.io