Skip to content

Commit 28e33ef

Browse files
committed
Merge branch '3.4.x'
See gh-46023
2 parents 02f31f1 + efb942e commit 28e33ef

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.github/actions/sync-to-maven-central/action.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
name: Sync to Maven Central
22
description: 'Syncs a release to Maven Central and waits for it to be available for use'
33
inputs:
4-
central-token-password:
5-
description: 'Password for authentication with central.sonatype.com'
6-
required: true
7-
central-token-username:
8-
description: 'Username for authentication with central.sonatype.com'
9-
required: true
104
jfrog-cli-config-token:
115
description: 'Config token for the JFrog CLI'
126
required: true
7+
ossrh-s01-staging-profile:
8+
description: 'Staging profile to use when syncing to Central'
9+
required: true
10+
ossrh-s01-token-password:
11+
description: 'Password for authentication with s01.oss.sonatype.org'
12+
required: true
13+
ossrh-s01-token-username:
14+
description: 'Username for authentication with s01.oss.sonatype.org'
15+
required: true
1316
spring-boot-version:
1417
description: 'Version of Spring Boot that is being synced to Central'
1518
required: true
@@ -24,10 +27,16 @@ runs:
2427
shell: bash
2528
run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-boot-{0}', inputs.spring-boot-version) }};buildNumber=${{ github.run_number }}'
2629
- name: Sync
27-
uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
30+
uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1
2831
with:
29-
token: ${{ inputs.central-token-password }}
30-
token-name: ${{ inputs.central-token-username }}
32+
close: true
33+
create: true
34+
generate-checksums: true
35+
password: ${{ inputs.ossrh-s01-token-password }}
36+
release: true
37+
staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }}
38+
upload: true
39+
username: ${{ inputs.ossrh-s01-token-username }}
3140
- name: Await
3241
uses: ./.github/actions/await-http-resource
3342
with:

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@ jobs:
7272
- name: Sync to Maven Central
7373
uses: ./.github/actions/sync-to-maven-central
7474
with:
75-
central-token-password: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
76-
central-token-username: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
7775
jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }}
76+
ossrh-s01-staging-profile: ${{ secrets.OSSRH_S01_STAGING_PROFILE }}
77+
ossrh-s01-token-password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
78+
ossrh-s01-token-username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
7879
spring-boot-version: ${{ needs.build-and-stage-release.outputs.version }}
7980
promote-release:
8081
name: Promote Release

0 commit comments

Comments
 (0)