Andy Wilkinson
a896fd0a36
Merge branch '2.7.x'
2022-09-10 09:38:18 +01:00
Andy Wilkinson
dffce2553c
Merge branch '2.6.x' into 2.7.x
2022-09-10 09:38:09 +01:00
Andy Wilkinson
9fe9f31af1
Polish
2022-09-10 09:38:03 +01:00
Andy Wilkinson
144abee80a
Merge branch '2.7.x'
2022-09-10 09:35:08 +01:00
Andy Wilkinson
b512083b3a
Merge branch '2.6.x' into 2.7.x
2022-09-10 09:34:57 +01:00
Andy Wilkinson
a262520f08
Disable LoaderIntegrationTests on Java 19 till it GAs
...
See gh-32280
2022-09-10 09:34:51 +01:00
Stephane Nicoll
aa6e52f029
Merge branch '2.7.x'
2022-09-10 10:32:20 +02:00
Stephane Nicoll
71fa410929
Merge branch '2.6.x' into 2.7.x
2022-09-10 10:32:12 +02:00
Stephane Nicoll
c3416ac97a
Disable LoaderIntegrationTests with Java 19
...
See gh-32295
2022-09-10 10:31:48 +02:00
Stephane Nicoll
358ee2c56b
Upgrade to Netty 4.1.81.Final
...
Closes gh-32227
2022-09-10 09:51:19 +02:00
Stephane Nicoll
3572ede2fa
Start building against Spring Retry 2.0.0-M1 snapshots
...
See gh-32293
2022-09-10 09:34:38 +02:00
Stephane Nicoll
ebef52b207
Merge branch '2.7.x'
...
Closes gh-32292
2022-09-10 09:13:53 +02:00
Stephane Nicoll
04a668fd07
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32291
2022-09-10 09:13:40 +02:00
Stephane Nicoll
42db66cc92
Merge pull request #32224 from obfischer
...
* pr/32224:
Make the path of the config directory better understandable
Closes gh-32224
2022-09-10 09:12:48 +02:00
Oliver B. Fischer
6e4e76597a
Make the path of the config directory better understandable
...
Currently, the documentation relates to the subdirectory for external
configurations as `/config`. Read as UNIX path, the leading slash
could be read as reference to the root directory `/`.
This commit updates the documentation to use 'config/' instead.
See gh-32224
2022-09-10 09:09:43 +02:00
Stephane Nicoll
57052918b3
Merge branch '2.7.x'
2022-09-10 09:05:15 +02:00
Stephane Nicoll
fd808ba16e
Start building against Spring Batch 4.3.7 snapshots
...
See gh-32278
2022-09-10 08:56:25 +02:00
Stephane Nicoll
b1b45f19fa
Start building against Spring Kafka 2.8.9 snapshots
...
See gh-32277
2022-09-10 08:56:25 +02:00
Stephane Nicoll
dbdb5f40ee
Start building against Spring Data 2021.2.3 snapshots
...
See gh-32275
2022-09-10 08:56:25 +02:00
Stephane Nicoll
b5aeb21e0a
Start building against Spring Framework 5.3.23 snapshots
...
See gh-32274
2022-09-10 08:56:24 +02:00
Stephane Nicoll
1c1006f755
Start building against Micrometer 1.9.4 snapshots
...
See gh-32272
2022-09-10 08:56:24 +02:00
Andy Wilkinson
2f3b681a82
Merge branch '2.7.x'
2022-09-10 07:49:32 +01:00
Andy Wilkinson
3f779191e6
Merge branch '2.6.x' into 2.7.x
2022-09-10 07:49:12 +01:00
Andy Wilkinson
5cb23aeb85
Only disable test tasks when a project isn't compatible with toolchain
...
Disabling compilation means that any downstream project will break.
For example, disabling our Gradle plugin's compileJava task means
that the launch script test app fails to build as it uses our
Gradle plugin and its classes are missing.
See gh-gh-32280
2022-09-10 07:47:19 +01:00
Andy Wilkinson
82b2fcd46a
Correct the "base" JDK version used in JDK 19 CI image
...
See gh-32288
2022-09-10 06:39:26 +01:00
Andy Wilkinson
bfbb466456
Merge branch '2.7.x'
...
Closes gh-32288
2022-09-10 06:23:28 +01:00
Andy Wilkinson
9ab061afb3
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32287
2022-09-10 06:20:36 +01:00
Andy Wilkinson
4523f01092
Set up CI on JDK 19
...
Closes gh-32258
2022-09-10 06:00:31 +01:00
Phillip Webb
aa62e3d1bd
Fix deprecation issues in WebMvcAutoConfigurationTests
2022-09-09 12:52:27 -07:00
Phillip Webb
fc279b7083
Deprecate ThemeResolver auto-configuration
...
Update `WebMvcAutoConfiguration` to deprecate the `ThemeResolver` bean
to align with recent Spring Framework changes.
2022-09-09 12:45:24 -07:00
Andy Wilkinson
aafceb3868
Merge branch '2.7.x'
...
Closes gh-32285
2022-09-09 16:47:06 +01:00
Andy Wilkinson
f17df7bf30
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32284
2022-09-09 16:46:43 +01:00
Andy Wilkinson
23c2f73b3f
Update tests to allow them to run on Java 19
...
Closes gh-32280
2022-09-09 16:46:14 +01:00
Andy Wilkinson
205378e769
Merge branch '2.7.x'
2022-09-09 15:15:56 +01:00
Andy Wilkinson
144fdaa703
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32283
2022-09-09 15:14:40 +01:00
Andy Wilkinson
78f4242e46
Build with Gradle 7.5 while still supporting Gradle 6.8+
...
Closes gh-32281
2022-09-09 15:13:43 +01:00
Brian Clozel
89c61e9093
Adapt GlobalObservationConvention imports
...
See micrometer-metrics/micrometer#3387
2022-09-09 14:30:53 +02:00
Stephane Nicoll
e37a0cb91e
Merge branch '2.7.x'
2022-09-09 10:30:54 +02:00
Stephane Nicoll
50ca22f89d
Merge branch '2.6.x' into 2.7.x
2022-09-09 10:30:42 +02:00
Stephane Nicoll
6d0a504283
Start building against Spring Batch 4.3.7 snapshots
...
See gh-32271
2022-09-09 08:30:41 +02:00
Stephane Nicoll
bb6307a506
Start building against Spring Kafka 2.8.9 snapshots
...
See gh-32270
2022-09-09 08:30:17 +02:00
Stephane Nicoll
91fb8b8b68
Start building against Spring AMQP 2.4.7 snapshots
...
See gh-32269
2022-09-09 08:29:48 +02:00
Stephane Nicoll
b4e97b73a6
Start building against Spring Data 2021.1.7 snapshots
...
See gh-32268
2022-09-09 08:29:26 +02:00
Stephane Nicoll
0c5d5c331a
Start building against Spring Framework 5.3.23 snapshots
...
See gh-32267
2022-09-09 08:28:59 +02:00
Stephane Nicoll
126c3cf0d8
Start building against Rector 2020.0.23 snapshots
...
See gh-32266
2022-09-09 08:28:34 +02:00
Stephane Nicoll
33b3a5f8bf
Start building against Micrometer 1.8.10 snapshots
...
See gh-32265
2022-09-09 08:28:09 +02:00
Phillip Webb
2f78d52c36
Merge branch '2.7.x'
2022-09-08 19:52:40 -07:00
Phillip Webb
55ad2b9371
Remove accidentally committed debug code
2022-09-08 19:52:01 -07:00
Phillip Webb
46be4a3f30
Merge branch '2.7.x'
2022-09-08 19:38:18 -07:00
Phillip Webb
e88a682220
Merge branch '2.6.x' into 2.7.x
2022-09-08 19:37:52 -07:00
