From c60935a250fad81aff5d5dfba8d1d24ae1d83cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 15 May 2025 17:03:08 +0200 Subject: [PATCH 1/2] Upgrade to Spring Framework 6.0.20 Closes gh-1566 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 27b9eb36..5f7c83b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.caching=true org.gradle.parallel=true compatibilityTestPluginVersion=0.0.3 -springFrameworkVersion=6.1.19 \ No newline at end of file +springFrameworkVersion=6.1.20 \ No newline at end of file From d27fa5bc207bfeef3dd1c2ebea628dbd9b934bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 15 May 2025 17:18:39 +0200 Subject: [PATCH 2/2] Migrate to central.sonatype.com Closes gh-1567 --- .../actions/sync-to-maven-central/action.yml | 27 +++++++------------ .github/workflows/release.yml | 5 ++-- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/.github/actions/sync-to-maven-central/action.yml b/.github/actions/sync-to-maven-central/action.yml index cb8eed42..b468f2d5 100644 --- a/.github/actions/sync-to-maven-central/action.yml +++ b/.github/actions/sync-to-maven-central/action.yml @@ -1,18 +1,15 @@ name: Sync to Maven Central description: 'Syncs a release to Maven Central and waits for it to be available for use' inputs: + central-token-password: + description: 'Password for authentication with central.sonatype.com' + required: true + central-token-username: + description: 'Username for authentication with central.sonatype.com' + required: true jfrog-cli-config-token: description: 'Config token for the JFrog CLI' required: true - ossrh-s01-staging-profile: - description: 'Staging profile to use when syncing to Central' - required: true - ossrh-s01-token-password: - description: 'Password for authentication with s01.oss.sonatype.org' - required: true - ossrh-s01-token-username: - description: 'Username for authentication with s01.oss.sonatype.org' - required: true spring-ws-version: description: 'Version of Spring Web Services that is being synced to Central' required: true @@ -27,16 +24,10 @@ runs: shell: bash run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-ws-{0}', inputs.spring-ws-version) }};buildNumber=${{ github.run_number }}' - name: Sync - uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1 + uses: spring-io/nexus-sync-action@06c0064cac7caf1fed48ab8a27fbb70f2ca38f0c # v0.1.0 with: - close: true - create: true - generate-checksums: true - password: ${{ inputs.ossrh-s01-token-password }} - release: true - staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }} - upload: true - username: ${{ inputs.ossrh-s01-token-username }} + token: ${{ inputs.central-token-password }} + token-name: ${{ inputs.central-token-username }} - name: Await uses: ./.github/actions/await-http-resource with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7867cd13..087e7ac3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,10 +58,9 @@ jobs: - name: Sync to Maven Central uses: ./.github/actions/sync-to-maven-central with: + central-token-password: ${{ secrets.CENTRAL_TOKEN_PASSWORD }} + central-token-username: ${{ secrets.CENTRAL_TOKEN_USERNAME }} jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }} - ossrh-s01-staging-profile: ${{ secrets.OSSRH_S01_STAGING_PROFILE }} - ossrh-s01-token-password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - ossrh-s01-token-username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} spring-ws-version: ${{ needs.build-and-stage-release.outputs.version }} promote-release: name: Promote Release