Commit Graph

50613 Commits

Author SHA1 Message Date
Yanming Zhou
b8eec2a8a4 Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices
See gh-37122
2023-08-31 13:07:10 +02:00
Andy Wilkinson
208dcb9305 Rename tests now that Jetty is preferred
Closes gh-37155
2023-08-31 11:06:54 +01:00
Moritz Halbritter
a7855622f2 Merge branch '3.1.x'
Closes gh-37157
2023-08-31 11:51:26 +02:00
Moritz Halbritter
b86937bb8e Merge branch '3.0.x' into 3.1.x
Closes gh-37156
2023-08-31 11:51:15 +02:00
Moritz Halbritter
61739bd917 Prevent propagation for local fields when using W3C propagation
Closes gh-37109
2023-08-31 11:50:05 +02:00
Andy Wilkinson
a92b1714f2 Merge branch '3.1.x'
Closes gh-37147
2023-08-31 10:40:31 +01:00
Andy Wilkinson
7f56fe8dfd Merge branch '3.0.x' into 3.1.x
Closes gh-37151
2023-08-31 10:40:07 +01:00
Andy Wilkinson
9d4e71fa2d Upgrade Java 17 image to .sdkmanrc to 17.0.8.1
Closes gh-37148
2023-08-31 10:38:02 +01:00
Andy Wilkinson
14b348998e Merge branch '3.1.x' 2023-08-31 10:35:40 +01:00
Andy Wilkinson
0d9a8a421e Merge branch '3.0.x' into 3.1.x 2023-08-31 10:35:32 +01:00
Andy Wilkinson
edf8cb6afe Merge branch '2.7.x' into 3.0.x 2023-08-31 10:35:18 +01:00
Andy Wilkinson
80cb21e800 Upgrade Java 17 CI image to 17.0.8.1+1
Closes gh-37149
2023-08-31 10:34:39 +01:00
Andy Wilkinson
e3da682d46 Merge branch '3.1.x' 2023-08-31 10:33:09 +01:00
Andy Wilkinson
934b18c2e4 Merge branch '3.0.x' into 3.1.x 2023-08-31 10:32:43 +01:00
Andy Wilkinson
e8be593df4 Merge branch '2.7.x' into 3.0.x 2023-08-31 10:31:51 +01:00
Andy Wilkinson
e3e578f78a Upgrade Java 11 CI image to 11.0.20.1+1
Closes gh-37150
2023-08-31 10:31:25 +01:00
Phillip Webb
6c4d2122e6 Merge branch '3.1.x' 2023-08-30 20:34:13 -07:00
Phillip Webb
3640491d5a Fix Timezone used for now in BuildRequestTests 2023-08-30 20:34:01 -07:00
Phillip Webb
c142051320 Merge branch '3.1.x' 2023-08-30 20:33:32 -07:00
Phillip Webb
f8f4a2b986 Fix Timezone used for now in BuildRequestTests 2023-08-30 20:33:17 -07:00
Andy Wilkinson
f6c88662b4 Merge branch '3.1.x'
Closes gh-37144
2023-08-30 13:36:01 +01:00
Andy Wilkinson
e6fcde4af5 Merge branch '3.0.x' into 3.1.x
Closes gh-37143
2023-08-30 13:35:40 +01:00
Andy Wilkinson
a8e37b5cc5 Merge branch '2.7.x' into 3.0.x
Closes gh-37142
2023-08-30 13:34:12 +01:00
Andy Wilkinson
d071ec8243 Merge pull request #37112 from hakan-krgn
* gh-37112:
  Polish "Polish code and javadoc"
  Polish code and javadoc

Closes gh-37112
2023-08-30 13:32:06 +01:00
Andy Wilkinson
2de98a84bc Polish "Polish code and javadoc"
See gh-37112
2023-08-30 13:31:58 +01:00
hakan-krgn
6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Moritz Halbritter
e532b3b830 Merge branch '3.1.x'
Closes gh-37141
2023-08-30 14:16:32 +02:00
Moritz Halbritter
4a88604a01 Merge branch '3.0.x' into 3.1.x
Closes gh-37140
2023-08-30 14:16:07 +02:00
Moritz Halbritter
c749fcb478 Merge branch '2.7.x' into 3.0.x
Closes gh-37139
2023-08-30 14:15:27 +02:00
Moritz Halbritter
0f6342a882 Make JarLaunchScript and SysVinit integration tests ARM64 compatible
Closes gh-36799
2023-08-30 14:01:32 +02:00
Andy Wilkinson
984d5303e7 Merge pull request #37117 from izeye
* gh-37117:
  Add Javadoc since for new setTaskExecutor method

Closes gh-37117
2023-08-30 11:31:06 +01:00
Johnny Lim
30eacd553d Add Javadoc since for new setTaskExecutor method
See gh-37117
2023-08-30 11:30:23 +01:00
Andy Wilkinson
d19c7ecfb8 Merge branch '3.1.x'
Closes gh-37135
2023-08-30 11:29:01 +01:00
Andy Wilkinson
d56bc9e220 Merge branch '3.0.x' into 3.1.x
Closes gh-37134
2023-08-30 11:28:49 +01:00
Andy Wilkinson
6fcc9f4b21 Merge branch '2.7.x' into 3.0.x
Closes gh-37133
2023-08-30 11:28:37 +01:00
Andy Wilkinson
d1bf1b3e15 Merge pull request #37120 from dependabot[bot]
* gh-37120:
  Bump gradle/gradle-build-action from 2.7.1 to 2.8.0

Closes gh-37120
2023-08-30 11:28:23 +01:00
dependabot[bot]
7d18b0e01b Bump gradle/gradle-build-action from 2.7.1 to 2.8.0
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](243af859f8...ef76a971e2)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-37120
2023-08-30 11:27:57 +01:00
Phillip Webb
3a99066eeb Merge branch '3.1.x' 2023-08-24 10:33:15 -07:00
Phillip Webb
81a03cf240 Merge branch '2.7.x' into 3.1.x 2023-08-24 10:32:37 -07:00
Phillip Webb
fbea788e0a Merge branch '2.7.x' into 3.0.x 2023-08-24 10:32:27 -07:00
Phillip Webb
727e22abac Restore Redis to NoSQL stores supported by Spring Data documentation
See gh-29694
2023-08-24 10:31:01 -07:00
Stephane Nicoll
009d92744a Add dependency management for Kotlin Serialization
Closes gh-37093
2023-08-24 16:49:29 +02:00
Stephane Nicoll
bd08d2faba Merge pull request #37094 from izeye
* pr/37094:
  Fix metadata of management.otlp.metrics.export.base-time-unit

Closes gh-37094
2023-08-24 16:30:46 +02:00
Johnny Lim
847c6aec01 Fix metadata of management.otlp.metrics.export.base-time-unit
See gh-37094
2023-08-24 16:30:13 +02:00
Stephane Nicoll
379b59e3fd Merge branch '3.1.x' 2023-08-24 15:51:17 +02:00
Stephane Nicoll
41d2d1da60 Merge branch '3.0.x' into 3.1.x 2023-08-24 15:51:10 +02:00
Stephane Nicoll
d85c125368 Merge branch '2.7.x' into 3.0.x 2023-08-24 15:51:02 +02:00
Spring Builds
e2d673f465 Next development version (v3.1.4-SNAPSHOT) 2023-08-24 09:58:18 +00:00
Spring Builds
982de77885 Next development version (v3.0.11-SNAPSHOT) 2023-08-24 09:02:19 +00:00
Spring Builds
1cc2f3cbd2 Next development version (v2.7.16-SNAPSHOT) 2023-08-24 07:42:05 +00:00