Skip to content

Commit 6f72aaf

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'origin/main' into draft-interface-clients-autoconfiguration
2 parents 3699930 + e950801 commit 6f72aaf

File tree

486 files changed

+7376
-2502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

486 files changed

+7376
-2502
lines changed

‎.github/actions/build/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ inputs:
1313
required: false
1414
default: 'false'
1515
description: 'Whether a Java toolchain should be used'
16+
java-distribution:
17+
required: false
18+
default: 'liberica'
19+
description: 'The distribution of Java to use'
1620
publish:
1721
required: false
1822
default: 'false'
@@ -37,6 +41,7 @@ runs:
3741
java-version: ${{ inputs.java-version }}
3842
java-early-access: ${{ inputs.java-early-access }}
3943
java-toolchain: ${{ inputs.java-toolchain }}
44+
java-distribution: ${{ inputs.java-distribution }}
4045
- name: Build
4146
id: build
4247
if: ${{ inputs.publish == 'false' }}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ inputs:
88
java-early-access:
99
required: false
1010
default: 'false'
11-
description: 'Whether the Java version is in early access'
11+
description: 'Whether the Java version is in early access. When true, forces java-distribution to temurin'
1212
java-toolchain:
1313
required: false
1414
default: 'false'
1515
description: 'Whether a Java toolchain should be used'
16+
java-distribution:
17+
required: false
18+
default: 'liberica'
19+
description: 'The distribution of Java to use'
1620
develocity-access-key:
1721
required: false
1822
description: 'The access key for authentication with ge.spring.io'
@@ -27,12 +31,12 @@ runs:
2731
- name: Set Up Java
2832
uses: actions/setup-java@v4
2933
with:
30-
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
34+
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
3135
java-version: |
3236
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3337
${{ inputs.java-toolchain == 'true' && '17' || '' }}
3438
- name: Set Up Gradle
35-
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
39+
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
3640
with:
3741
cache-read-only: false
3842
develocity-access-key: ${{ inputs.develocity-access-key }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
using: composite
2222
steps:
2323
- name: Set Up JFrog CLI
24-
uses: jfrog/setup-jfrog-cli@26532cdb5b1ea07940f10d57666fd988048fc903 # v4.2.2
24+
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
2525
env:
2626
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2727
- name: Download Artifacts

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: composite
2121
steps:
2222
- name: Set Up JFrog CLI
23-
uses: jfrog/setup-jfrog-cli@26532cdb5b1ea07940f10d57666fd988048fc903 # v4.2.2
23+
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
2424
env:
2525
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2626
- name: Download Release Artifacts

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
build-and-deploy-snapshot:
1010
name: Build and Deploy Snapshot
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
steps:
1414
- name: Check Out Code
@@ -42,7 +42,7 @@ jobs:
4242
version: ${{ steps.build-and-publish.outputs.version }}
4343
trigger-docs-build:
4444
name: Trigger Docs Build
45-
runs-on: ubuntu-latest
45+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
4646
needs: build-and-deploy-snapshot
4747
permissions:
4848
actions: write

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
jobs:
88
build:
99
name: Build Pull Request
10-
runs-on: ubuntu-latest
10+
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1111
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1212
steps:
1313
- name: Free Disk Space
@@ -23,9 +23,9 @@ jobs:
2323
- name: Check Out
2424
uses: actions/checkout@v4
2525
- name: Validate Gradle Wrapper
26-
uses: gradle/actions/wrapper-validation@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
26+
uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
2727
- name: Set Up Gradle
28-
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
28+
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
2929
- name: Build
3030
env:
3131
CI: 'true'

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os:
17-
- id: ubuntu-latest
17+
- id: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1818
name: Linux
1919
- id: windows-latest
2020
name: Windows
@@ -26,8 +26,7 @@ jobs:
2626
- version: 22
2727
toolchain: false
2828
- version: 23
29-
early-access: true
30-
toolchain: false
29+
toolchain: true
3130
exclude:
3231
- os:
3332
name: Linux
@@ -49,6 +48,7 @@ jobs:
4948
java-version: ${{ matrix.java.version }}
5049
java-early-access: ${{ matrix.java.early-access || 'false' }}
5150
java-toolchain: ${{ matrix.java.toolchain }}
51+
java-distribution: ${{ matrix.java.distribution }}
5252
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
5353
- name: Send Notification
5454
uses: ./.github/actions/send-notification

‎.github/workflows/release-milestone.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99
jobs:
1010
build-and-stage-release:
1111
name: Build and Stage Release
12-
runs-on: ubuntu-latest
12+
runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
1313
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1414
steps:
1515
- name: Check Out Code
@@ -50,10 +50,10 @@ jobs:
5050
needs:
5151
- build-and-stage-release
5252
- verify
53-
runs-on: ubuntu-latest
53+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
5454
steps:
5555
- name: Set up JFrog CLI
56-
uses: jfrog/setup-jfrog-cli@26532cdb5b1ea07940f10d57666fd988048fc903 # v4.2.2
56+
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
5757
env:
5858
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
5959
- name: Promote build
@@ -63,7 +63,7 @@ jobs:
6363
needs:
6464
- build-and-stage-release
6565
- promote-release
66-
runs-on: ubuntu-latest
66+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
6767
steps:
6868
- name: Check Out Code
6969
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

‎.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
build-and-stage-release:
1010
name: Build and Stage Release
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
steps:
1414
- name: Check Out Code
@@ -49,7 +49,7 @@ jobs:
4949
needs:
5050
- build-and-stage-release
5151
- verify
52-
runs-on: ubuntu-latest
52+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
5353
steps:
5454
- name: Check Out Code
5555
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -66,10 +66,10 @@ jobs:
6666
needs:
6767
- build-and-stage-release
6868
- sync-to-maven-central
69-
runs-on: ubuntu-latest
69+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
7070
steps:
7171
- name: Set up JFrog CLI
72-
uses: jfrog/setup-jfrog-cli@26532cdb5b1ea07940f10d57666fd988048fc903 # v4.2.2
72+
uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
7373
env:
7474
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
7575
- name: Promote build
@@ -79,7 +79,7 @@ jobs:
7979
needs:
8080
- build-and-stage-release
8181
- sync-to-maven-central
82-
runs-on: ubuntu-latest
82+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
8383
steps:
8484
- name: Check Out Code
8585
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -95,7 +95,7 @@ jobs:
9595
needs:
9696
- build-and-stage-release
9797
- sync-to-maven-central
98-
runs-on: ubuntu-latest
98+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
9999
steps:
100100
- name: Check Out Code
101101
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -111,7 +111,7 @@ jobs:
111111
needs:
112112
- build-and-stage-release
113113
- sync-to-maven-central
114-
runs-on: ubuntu-latest
114+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
115115
steps:
116116
- name: Check Out Code
117117
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -128,7 +128,7 @@ jobs:
128128
- publish-gradle-plugin
129129
- publish-to-sdkman
130130
- update-homebrew-tap
131-
runs-on: ubuntu-latest
131+
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
132132
steps:
133133
- name: Check Out Code
134134
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

‎.github/workflows/run-system-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
run-system-tests:
1010
name: 'Java ${{ matrix.java.version}}'
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1212
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
strategy:
1414
matrix:

0 commit comments

Comments
 (0)