Skip to content

Commit a6518c4

Browse files
authored
Merge branch 'spring-projects:main' into patch-1
2 parents 87de896 + 3e61fcd commit a6518c4

File tree

455 files changed

+19477
-14494
lines changed

Some content is hidden

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

455 files changed

+19477
-14494
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ updates:
3131
- org.apache.commons:commons-dbcp2
3232
- org.apache.derby
3333
- com.icegreen:greenmail
34+
- org.junit-pioneer*
3435
- org.hibernate.orm*
3536
- org.testcontainers*
3637
- org.hsqldb:hsqldb

.github/workflows/announce-milestone-planning.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ on:
66

77
jobs:
88
announce-milestone-planning:
9-
uses: spring-io/spring-github-workflows/.github/workflows/spring-announce-milestone-planning.yml@v5
9+
uses: spring-io/spring-github-workflows/.github/workflows/spring-announce-milestone-planning.yml@v6
1010
secrets:
1111
SPRING_RELEASE_CHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}

.github/workflows/auto-cherry-pick.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ on:
88

99
jobs:
1010
cherry-pick-commit:
11-
uses: spring-io/spring-github-workflows/.github/workflows/spring-cherry-pick.yml@v5
11+
uses: spring-io/spring-github-workflows/.github/workflows/spring-cherry-pick.yml@v6
1212
secrets:
1313
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/backport-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ on:
77

88
jobs:
99
backport-issue:
10-
uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@main
10+
uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@v6
1111
secrets:
1212
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/ci-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222

2323
jobs:
2424
build-snapshot:
25-
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
25+
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@v6
2626
with:
2727
gradleTasks: ${{ github.event_name == 'schedule' && '--rerun-tasks --refresh-dependencies' || inputs.gradleOptions }}
2828
secrets:

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ permissions:
1616
jobs:
1717
dispatch-docs-build:
1818
if: github.repository_owner == 'spring-projects'
19-
uses: spring-io/spring-github-workflows/.github/workflows/spring-dispatch-docs-build.yml@v5
19+
uses: spring-io/spring-github-workflows/.github/workflows/spring-dispatch-docs-build.yml@v6

.github/workflows/merge-dependabot-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
merge-dependabot-pr:
1313
permissions: write-all
1414

15-
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v6
1616
with:
1717
mergeArguments: --auto --squash
1818
autoMergeSnapshots: true

.github/workflows/pr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ on:
88

99
jobs:
1010
build-pull-request:
11-
uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main
11+
uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@v6

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: write
1313
issues: write
1414

15-
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@v6
1616
with:
1717
deployMilestoneToCentral: true
1818
secrets:

build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
id 'io.spring.antora.generate-antora-yml' version '0.0.1'
2424
id 'com.google.protobuf' version '0.9.5' apply false
2525
id 'io.freefair.aggregate-javadoc' version '8.14.2'
26-
id 'io.spring.nullability' version '0.0.5' apply false
26+
id 'io.spring.nullability' version '0.0.6' apply false
2727
}
2828

2929
if (isCI) {
@@ -50,22 +50,22 @@ ext {
5050
aspectjVersion = '1.9.24'
5151
assertjVersion = '3.27.6'
5252
assertkVersion = '0.28.1'
53-
avroVersion = '1.12.0'
53+
avroVersion = '1.12.1'
5454
awaitilityVersion = '4.3.0'
5555
camelVersion = '4.14.1'
5656
commonsDbcp2Version = '2.13.0'
5757
commonsIoVersion = '2.20.0'
5858
commonsNetVersion = '3.12.0'
5959
curatorVersion = '5.9.0'
60-
debeziumVersion = '3.2.3.Final'
60+
debeziumVersion = '3.2.4.Final'
6161
derbyVersion = '10.16.1.1'
6262
ftpServerVersion = '1.2.1'
6363
graalvmVersion = '24.2.2'
64-
greenmailVersion = '2.1.6'
65-
groovyVersion = '5.0.1'
64+
greenmailVersion = '2.1.7'
65+
groovyVersion = '5.0.2'
6666
hamcrestVersion = '3.0'
6767
hazelcastVersion = '5.5.0'
68-
hibernateVersion = '7.1.2.Final'
68+
hibernateVersion = '7.1.4.Final'
6969
hsqldbVersion = '2.7.4'
7070
h2Version = '2.3.232'
7171
jacksonVersion = '2.20.0'
@@ -79,6 +79,7 @@ ext {
7979
jsonpathVersion = '2.9.0'
8080
junit4Version = '4.13.2'
8181
junitJupiterVersion = '6.0.0'
82+
junitPioneerVersion = '2.3.0'
8283
kotlinCoroutinesVersion = '1.10.2'
8384
kryoVersion = '5.6.2'
8485
lettuceVersion = '6.8.1.RELEASE'
@@ -87,7 +88,7 @@ ext {
8788
micrometerTracingVersion = '1.6.0-SNAPSHOT'
8889
micrometerVersion = '1.16.0-SNAPSHOT'
8990
mockitoVersion = '5.19.0'
90-
mongoDriverVersion = '5.6.0'
91+
mongoDriverVersion = '5.6.1'
9192
mysqlVersion = '9.4.0'
9293
oracleVersion = '23.9.0.25.07'
9394
pahoMqttClientVersion = '1.2.5'
@@ -108,7 +109,7 @@ ext {
108109
springVersion = '7.0.0-SNAPSHOT'
109110
springWsVersion = '5.0.0-SNAPSHOT'
110111
testcontainersVersion = '1.21.3'
111-
tomcatVersion = '11.0.11'
112+
tomcatVersion = '11.0.13'
112113
xmlUnitVersion = '2.10.4'
113114
xstreamVersion = '1.4.21'
114115
ztZipVersion = '1.17'
@@ -229,7 +230,7 @@ configure(javaProjects) { subproject ->
229230

230231
java {
231232
toolchain {
232-
languageVersion = JavaLanguageVersion.of(24)
233+
languageVersion = JavaLanguageVersion.of(25)
233234
}
234235
withJavadocJar()
235236
withSourcesJar()
@@ -290,6 +291,7 @@ configure(javaProjects) { subproject ->
290291
}
291292
testImplementation 'org.junit.jupiter:junit-jupiter-api'
292293
testImplementation 'org.junit.jupiter:junit-jupiter-params'
294+
testImplementation "org.junit-pioneer:junit-pioneer:$junitPioneerVersion"
293295
testImplementation("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion") {
294296
exclude group: 'org.jetbrains.kotlin'
295297
}

0 commit comments

Comments
 (0)