Skip to content

Commit 4d40251

Browse files
snicollsnicoll
committed
Merge branch '4.0.x'
Closes spring-projectsgh-48647
2 parents ca4a11c + 03118a0 commit 4d40251

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
uses: ./.github/actions/build
2222
with:
2323
commercial-release-repository-url: ${{ vars.COMMERCIAL_RELEASE_REPO_URL }}
24-
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
25-
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
24+
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
25+
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
2626
commercial-snapshot-repository-url: ${{ vars.COMMERCIAL_SNAPSHOT_REPO_URL }}
2727
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2828
gradle-cache-read-only: false
@@ -66,8 +66,8 @@ jobs:
6666
needs: build-and-deploy-snapshot
6767
uses: ./.github/workflows/verify.yml
6868
secrets:
69-
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
70-
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
69+
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
70+
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
7171
google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
7272
opensource-repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
7373
opensource-repository-username: ${{ secrets.ARTIFACTORY_USERNAME }}

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
uses: ./.github/actions/build
4747
with:
4848
commercial-release-repository-url: ${{ vars.COMMERCIAL_RELEASE_REPO_URL }}
49-
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
50-
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
49+
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
50+
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
5151
commercial-snapshot-repository-url: ${{ vars.COMMERCIAL_SNAPSHOT_REPO_URL }}
5252
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5353
gradle-cache-read-only: false

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
uses: ./.github/actions/build
2121
with:
2222
commercial-release-repository-url: ${{ vars.COMMERCIAL_RELEASE_REPO_URL }}
23-
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
24-
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
23+
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
24+
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
2525
commercial-snapshot-repository-url: ${{ vars.COMMERCIAL_SNAPSHOT_REPO_URL }}
2626
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2727
gradle-cache-read-only: false
@@ -53,8 +53,8 @@ jobs:
5353
needs: build-and-stage-release
5454
uses: ./.github/workflows/verify.yml
5555
secrets:
56-
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
57-
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
56+
commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
57+
commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
5858
google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
5959
opensource-repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
6060
opensource-repository-username: ${{ secrets.ARTIFACTORY_USERNAME }}

0 commit comments

Comments
 (0)