Skip to content

Commit 9f0676c

Browse files
committed
Merge branch '4.1.x'
2 parents 352d204 + f5d7f09 commit 9f0676c

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3232
${{ inputs.java-toolchain == 'true' && '25' || '' }}
3333
- name: Set Up Gradle
34-
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
34+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3535
with:
3636
cache-read-only: false
3737
develocity-access-key: ${{ inputs.develocity-access-key }}
@@ -43,7 +43,6 @@ runs:
4343
echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
4444
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
4545
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
46-
echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
4746
- name: Configure Toolchain Properties
4847
if: ${{ inputs.java-toolchain == 'true' }}
4948
shell: bash

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ runs:
1717
using: composite
1818
steps:
1919
- name: Set Up JFrog CLI
20-
uses: jfrog/setup-jfrog-cli@e5d3afdd1d75e4aa14a4f217cca93a2a9b5b846d # v4.8.0
20+
uses: jfrog/setup-jfrog-cli@5b06f730cc5a6f55d78b30753f8583454b08c0aa # v4.8.1
2121
env:
2222
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2323
- name: Download Release Artifacts
2424
shell: bash
2525
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 }}'
2626
- name: Sync
27-
uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
27+
uses: spring-io/central-publish-action@0c03960e9b16fdfe70e2443e1d5393cbc3a35622 # v0.3.0
2828
with:
2929
token: ${{ inputs.central-token-password }}
3030
token-name: ${{ inputs.central-token-username }}
31+
ignore-already-exists-error: true
3132
- name: Await
3233
uses: ./.github/actions/await-http-resource
3334
with:

.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2424
publish: true
2525
- name: Deploy
26-
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
26+
uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
2727
with:
2828
artifact-properties: |
2929
/**/spring-ws-docs-*.zip::zip.type=docs,zip.name=spring-ws,zip.deployed=false

.github/workflows/build-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: ./.github/actions/print-jvm-thread-dumps
2020
- name: Upload Build Reports
2121
if: failure()
22-
uses: actions/upload-artifact@v4
22+
uses: actions/upload-artifact@v5
2323
with:
2424
name: build-reports
2525
path: '**/build/reports/'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2323
publish: true
2424
- name: Stage Release
25-
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
25+
uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
2626
with:
2727
artifact-properties: |
2828
/**/spring-ws-docs-*.zip::zip.type=docs,zip.name=spring-ws,zip.deployed=false
@@ -72,7 +72,7 @@ jobs:
7272
runs-on: ubuntu-latest
7373
steps:
7474
- name: Set up JFrog CLI
75-
uses: jfrog/setup-jfrog-cli@e5d3afdd1d75e4aa14a4f217cca93a2a9b5b846d # v4.8.0
75+
uses: jfrog/setup-jfrog-cli@5b06f730cc5a6f55d78b30753f8583454b08c0aa # v4.8.1
7676
env:
7777
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
7878
- name: Promote build

.github/workflows/verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
distribution: 'liberica'
4949
java-version: 17
5050
- name: Set Up Gradle
51-
uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
51+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
5252
with:
5353
cache-read-only: false
5454
- name: Configure Gradle Properties
@@ -66,7 +66,7 @@ jobs:
6666
run: ./gradlew spring-ws-release-verification-tests:test
6767
- name: Upload Build Reports on Failure
6868
if: failure()
69-
uses: actions/upload-artifact@v4
69+
uses: actions/upload-artifact@v5
7070
with:
7171
name: build-reports
7272
path: '**/build/reports/'

0 commit comments

Comments
 (0)