Skip to content

Commit ae677d4

Browse files
snicollsnicoll
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-42513
2 parents 7b4cd03 + 20b3e61 commit ae677d4

File tree

17 files changed

+184
-168
lines changed

17 files changed

+184
-168
lines changed

‎.github/actions/await-http-resource/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Await HTTP Resource
2-
description: Waits for an HTTP resource to be available (a HEAD request succeeds)
2+
description: 'Waits for an HTTP resource to be available (a HEAD request succeeds)'
33
inputs:
44
url:
55
description: 'The URL of the resource to await'

‎.github/actions/build/action.yml

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
name: 'Build'
1+
name: Build
22
description: 'Builds the project, optionally publishing it to a local deployment repository'
33
inputs:
4-
java-version:
4+
commercial-release-repository-url:
5+
description: 'URL of the release repository'
56
required: false
6-
default: '17'
7-
description: 'The Java version to compile and test with'
8-
java-early-access:
7+
commercial-repository-password:
8+
description: 'Password for authentication with the commercial repository'
99
required: false
10-
default: 'false'
11-
description: 'Whether the Java version is in early access'
12-
java-toolchain:
10+
commercial-repository-username:
11+
description: 'Username for authentication with the commercial repository'
12+
required: false
13+
commercial-snapshot-repository-url:
14+
description: 'URL of the snapshot repository'
15+
required: false
16+
develocity-access-key:
17+
description: 'Access key for authentication with ge.spring.io'
1318
required: false
14-
default: 'false'
15-
description: 'Whether a Java toolchain should be used'
1619
java-distribution:
20+
description: 'Java distribution to use'
1721
required: false
1822
default: 'liberica'
19-
description: 'The distribution of Java to use'
20-
publish:
23+
java-early-access:
24+
description: 'Whether the Java version is in early access'
2125
required: false
2226
default: 'false'
23-
description: 'Whether to publish artifacts ready for deployment to Artifactory'
24-
develocity-access-key:
25-
required: false
26-
description: 'The access key for authentication with ge.spring.io'
27-
commercial-repository-username:
28-
required: false
29-
description: 'Username for authentication with the commercial repository'
30-
commercial-repository-password:
27+
java-toolchain:
28+
description: 'Whether a Java toolchain should be used'
3129
required: false
32-
description: 'Password for authentication with the commercial repository'
33-
commercial-release-repository-url:
30+
default: 'false'
31+
java-version:
32+
description: 'Java version to compile and test with'
3433
required: false
35-
description: 'URL of the release repository'
36-
commercial-snapshot-repository-url:
34+
default: '17'
35+
publish:
36+
description: 'Whether to publish artifacts ready for deployment to Artifactory'
3737
required: false
38-
description: 'URL of the snapshot repository'
38+
default: 'false'
3939
outputs:
4040
build-scan-url:
41-
description: 'The URL, if any, of the build scan produced by the build'
41+
description: 'URL, if any, of the build scan produced by the build'
4242
value: ${{ (inputs.publish == 'true' && steps.publish.outputs.build-scan-url) || steps.build.outputs.build-scan-url }}
4343
version:
44-
description: 'The version that was built'
44+
description: 'Version that was built'
4545
value: ${{ steps.read-version.outputs.version }}
4646
runs:
4747
using: composite
@@ -50,28 +50,28 @@ runs:
5050
uses: ./.github/actions/prepare-gradle-build
5151
with:
5252
develocity-access-key: ${{ inputs.develocity-access-key }}
53-
java-version: ${{ inputs.java-version }}
53+
java-distribution: ${{ inputs.java-distribution }}
5454
java-early-access: ${{ inputs.java-early-access }}
5555
java-toolchain: ${{ inputs.java-toolchain }}
56-
java-distribution: ${{ inputs.java-distribution }}
56+
java-version: ${{ inputs.java-version }}
5757
- name: Build
5858
id: build
5959
if: ${{ inputs.publish == 'false' }}
6060
shell: bash
6161
env:
62-
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
63-
COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
6462
COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }}
63+
COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
64+
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
6565
COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
6666
run: ./gradlew build
6767
- name: Publish
6868
id: publish
6969
if: ${{ inputs.publish == 'true' }}
7070
shell: bash
7171
env:
72-
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
73-
COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
7472
COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }}
73+
COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
74+
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
7575
COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
7676
run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository ${{ !startsWith(github.event.head_commit.message, 'Next development version') && 'build' || '' }} publishAllPublicationsToDeploymentRepository
7777
- name: Read Version From gradle.properties

‎.github/actions/create-github-release/action.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
name: Create GitHub Release
2-
description: Create the release on GitHub with a changelog
2+
description: 'Create the release on GitHub with a changelog'
33
inputs:
44
milestone:
5-
description: Name of the GitHub milestone for which a release will be created
5+
description: 'Name of the GitHub milestone for which a release will be created'
66
required: true
77
token:
8-
description: Token to use for authentication with GitHub
8+
description: 'Token to use for authentication with GitHub'
99
required: true
1010
runs:
1111
using: composite
1212
steps:
1313
- name: Generate Changelog
1414
uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
1515
with:
16+
config-file: .github/actions/create-github-release/changelog-generator.yml
1617
milestone: ${{ inputs.milestone }}
1718
token: ${{ inputs.token }}
18-
config-file: .github/actions/create-github-release/changelog-generator.yml
1919
- name: Create GitHub Release
20+
shell: bash
2021
env:
2122
GITHUB_TOKEN: ${{ inputs.token }}
22-
shell: bash
2323
run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md

‎.github/actions/prepare-gradle-build/action.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
name: 'Prepare Gradle Build'
1+
name: Prepare Gradle Build
22
description: 'Prepares a Gradle build. Sets up Java and Gradle and configures Gradle properties'
33
inputs:
4-
java-version:
4+
develocity-access-key:
5+
description: 'Access key for authentication with ge.spring.io'
56
required: false
6-
default: '17'
7-
description: 'The Java version to use for the build'
8-
java-early-access:
7+
java-distribution:
8+
description: 'Java distribution to use'
99
required: false
10-
default: 'false'
10+
default: 'liberica'
11+
java-early-access:
1112
description: 'Whether the Java version is in early access. When true, forces java-distribution to temurin'
12-
java-toolchain:
1313
required: false
1414
default: 'false'
15+
java-toolchain:
1516
description: 'Whether a Java toolchain should be used'
16-
java-distribution:
1717
required: false
18-
default: 'liberica'
19-
description: 'The distribution of Java to use'
20-
develocity-access-key:
18+
default: 'false'
19+
java-version:
20+
description: 'Java version to use for the build'
2121
required: false
22-
description: 'The access key for authentication with ge.spring.io'
22+
default: '17'
2323
runs:
2424
using: composite
2525
steps:

‎.github/actions/print-jvm-thread-dumps/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Print JVM thread dumps
2-
description: Prints a thread dump for all running JVMs
2+
description: 'Prints a thread dump for all running JVMs'
33
runs:
44
using: composite
55
steps:

‎.github/actions/publish-gradle-plugin/action.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
name: Publish Gradle Plugin
2-
description: Publishes Spring Boot's Gradle plugin to the Plugin Portal
2+
description: 'Publishes Spring Boot''s Gradle plugin to the Plugin Portal'
33
inputs:
4-
jfrog-cli-config-token:
5-
description: 'Config token for the JFrog CLI'
6-
required: true
7-
plugin-version:
8-
description: 'Version of the plugin'
9-
required: true
4+
build-number:
5+
description: 'Build number to use when downloading plugin artifacts'
6+
required: false
7+
default: ${{ github.run_number }}
108
gradle-plugin-publish-key:
119
description: 'Gradle publishing key'
1210
required: true
1311
gradle-plugin-publish-secret:
1412
description: 'Gradle publishing secret'
1513
required: true
16-
build-number:
17-
description: 'The build number to use when downloading plugin artifacts'
18-
required: false
19-
default: ${{ github.run_number }}
14+
jfrog-cli-config-token:
15+
description: 'Config token for the JFrog CLI'
16+
required: true
17+
plugin-version:
18+
description: 'Version of the plugin'
19+
required: true
2020
runs:
2121
using: composite
2222
steps:

‎.github/actions/publish-to-sdkman/action.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
name: Publish to SDKMAN!
2-
description: Publishes the release as a new candidate version on SDKMAN!
2+
description: 'Publishes the release as a new candidate version on SDKMAN!'
33
inputs:
4+
make-default:
5+
description: 'Whether the release should be made the default version'
6+
required: false
7+
default: 'false'
48
sdkman-consumer-key:
59
description: 'Key for publishing to SDKMAN!'
610
required: true
711
sdkman-consumer-token:
812
description: 'Token for publishing to SDKMAN!'
913
required: true
1014
spring-boot-version:
11-
description: 'The version to publish'
15+
description: 'Version to publish'
1216
required: true
13-
make-default:
14-
description: 'Whether the release should be made the default version'
15-
required: false
16-
default: false
1717
runs:
1818
using: composite
1919
steps:
20-
- shell: bash
20+
- name: Publish Release
21+
shell: bash
2122
run: >
2223
curl -X POST \
2324
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \
@@ -26,8 +27,9 @@ runs:
2627
-H "Accept: application/json" \
2728
-d '{"candidate": "springboot", "version": "${{ inputs.spring-boot-version }}", "url": "${{ format('https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/{0}/spring-boot-cli-{0}-bin.zip', inputs.spring-boot-version) }}"}' \
2829
https://vendors.sdkman.io/release
29-
- shell: bash
30+
- name: Flag Release as Default
3031
if: ${{ inputs.make-default == 'true' }}
32+
shell: bash
3133
run: >
3234
curl -X PUT \
3335
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \

‎.github/actions/send-notification/action.yml

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
11
name: Send Notification
2-
description: Sends a Google Chat message as a notification of the job's outcome
2+
description: 'Sends a Google Chat message as a notification of the job''s outcome'
33
inputs:
4-
webhook-url:
5-
description: 'Google Chat Webhook URL'
6-
required: true
7-
status:
8-
description: 'Status of the job'
9-
required: true
104
build-scan-url:
115
description: 'URL of the build scan to include in the notification'
6+
required: false
127
run-name:
138
description: 'Name of the run to include in the notification'
9+
required: false
1410
default: ${{ format('{0} {1}', github.ref_name, github.job) }}
11+
status:
12+
description: 'Status of the job'
13+
required: true
14+
webhook-url:
15+
description: 'Google Chat Webhook URL'
16+
required: true
1517
runs:
1618
using: composite
1719
steps:
18-
- shell: bash
20+
- name: Prepare Variables
21+
shell: bash
1922
run: |
2023
echo "BUILD_SCAN=${{ inputs.build-scan-url == '' && ' [build scan unavailable]' || format(' [<{0}|Build Scan>]', inputs.build-scan-url) }}" >> "$GITHUB_ENV"
2124
echo "RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> "$GITHUB_ENV"
22-
- shell: bash
25+
- name: Success Notification
2326
if: ${{ inputs.status == 'success' }}
27+
shell: bash
2428
run: |
2529
curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was successful ${{ env.BUILD_SCAN }}"}' || true
26-
- shell: bash
30+
- name: Failure Notification
2731
if: ${{ inputs.status == 'failure' }}
32+
shell: bash
2833
run: |
2934
curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<users/all> *<${{ env.RUN_URL }}|${{ inputs.run-name }}> failed* ${{ env.BUILD_SCAN }}"}' || true
30-
- shell: bash
35+
- name: Cancel Notification
3136
if: ${{ inputs.status == 'cancelled' }}
37+
shell: bash
3238
run: |
3339
curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was cancelled"}' || true

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
name: Sync to Maven Central
2-
description: Syncs a release to Maven Central and waits for it to be available for use
2+
description: 'Syncs a release to Maven Central and waits for it to be available for use'
33
inputs:
44
jfrog-cli-config-token:
55
description: 'Config token for the JFrog CLI'
66
required: true
7-
spring-boot-version:
8-
description: 'The version of Spring Boot that is being synced to Central'
7+
ossrh-s01-staging-profile:
8+
description: 'Staging profile to use when syncing to Central'
99
required: true
1010
ossrh-s01-token-username:
1111
description: 'Username for authentication with s01.oss.sonatype.org'
1212
required: true
1313
ossrh-s01-token-password:
1414
description: 'Password for authentication with s01.oss.sonatype.org'
1515
required: true
16-
ossrh-s01-staging-profile:
17-
description: 'Staging profile to use when syncing to Central'
16+
spring-boot-version:
17+
description: 'Version of Spring Boot that is being synced to Central'
1818
required: true
1919
runs:
2020
using: composite
@@ -29,14 +29,14 @@ runs:
2929
- name: Sync
3030
uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1
3131
with:
32-
username: ${{ inputs.ossrh-s01-token-username }}
32+
close: true
33+
create: true
34+
generate-checksums: true
3335
password: ${{ inputs.ossrh-s01-token-password }}
36+
release: true
3437
staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }}
35-
create: true
3638
upload: true
37-
close: true
38-
release: true
39-
generate-checksums: true
39+
username: ${{ inputs.ossrh-s01-token-username }}
4040
- name: Await
4141
uses: ./.github/actions/await-http-resource
4242
with:

0 commit comments

Comments
 (0)