Moritz Halbritter
9ca6667127
Merge branch '3.2.x' into 3.3.x
2024-10-24 12:51:53 +02:00
Moritz Halbritter
9858b4b367
Fix release script
2024-10-24 12:45:52 +02:00
Andy Wilkinson
9501db4dc4
Upgrade to Spring Framework 6.2.0-RC3
...
Closes gh-42833
2024-10-24 10:43:08 +01:00
Andy Wilkinson
924c807182
Merge branch '3.3.x'
...
Closes gh-42869
2024-10-24 09:28:51 +01:00
Andy Wilkinson
2bf3e5ab20
Document that embedded Tomcat must be 10.1.25 or later
...
Closes gh-42849
2024-10-24 09:28:18 +01:00
Andy Wilkinson
9df9d89b69
Upgrade to Spring Integration 6.4.0-RC1
...
Closes gh-42563
2024-10-24 09:23:14 +01:00
Andy Wilkinson
8c06886409
Upgrade to Spring Batch 5.2.0-RC1
...
Closes gh-42560
2024-10-24 09:23:13 +01:00
Andy Wilkinson
4fa254d745
Upgrade to Byte Buddy 1.15.7
...
Closes gh-42867
2024-10-24 09:23:13 +01:00
Andy Wilkinson
c8eeba37c4
Merge branch '3.3.x'
2024-10-24 09:14:36 +01:00
Andy Wilkinson
13e75dce1b
Upgrade to Spring Integration 6.3.5
...
Closes gh-42549
2024-10-24 09:13:50 +01:00
Moritz Halbritter
c2bb3586c8
Use spring-boot-3.4.x as build name
...
See gh-42866
2024-10-24 09:47:56 +02:00
Moritz Halbritter
17a399ea92
Merge branch '3.3.x'
2024-10-24 08:58:17 +02:00
Moritz Halbritter
131bbafb6d
Merge branch '3.2.x' into 3.3.x
2024-10-24 08:58:10 +02:00
Moritz Halbritter
83a3212e98
Use github.ref_name when deploying snapshots
...
See gh-42808
2024-10-24 08:57:24 +02:00
Moritz Halbritter
465ad822d3
Merge branch '3.3.x'
...
Closes gh-42863
2024-10-24 08:39:55 +02:00
Moritz Halbritter
2d9138549c
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42862
2024-10-24 08:39:40 +02:00
Moritz Halbritter
76cfc57b35
Use steps.build-and-publish.outputs.version instead of github.ref_name
...
Closes gh-42808
2024-10-24 08:38:19 +02:00
Phillip Webb
005ea96307
Revert "Add spring-aop to work around Spring Framework mock detection issue"
...
This reverts commit 2a64cf6fb1 .
Closes gh-42855
2024-10-23 12:36:36 -07:00
Andy Wilkinson
3b330ae09a
Shut down management server once main server's shut down
...
Closes gh-41002
2024-10-23 12:08:03 -07:00
Phillip Webb
2a64cf6fb1
Add spring-aop to work around Spring Framework mock detection issue
2024-10-23 11:13:28 -07:00
Phillip Webb
0305d1e9d5
Adapt to upstream Spring Framework @MockitoBean changes
2024-10-23 11:11:55 -07:00
Phillip Webb
47fa83cafc
Merge branch '3.3.x'
2024-10-23 10:14:59 -07:00
Phillip Webb
fc1ed0b340
Increase timeout in ZipkinWebClientSenderTests
2024-10-23 10:14:32 -07:00
Phillip Webb
d8ef2144e3
Merge branch '3.3.x'
2024-10-23 09:58:59 -07:00
Phillip Webb
9210b3b8e9
Revert "Drop `@Input` from `getData()`"
...
This reverts commit a9e50d67dd as
we do have some undeclared inputs.
See gh-40572
2024-10-23 09:58:27 -07:00
Stéphane Nicoll
8bb7df3df6
Merge pull request #42837 from eddumelendez
...
* pr/42837:
Polish "Add container support for ClickHouse"
Add container support for ClickHouse
Closes gh-42837
2024-10-23 18:23:01 +02:00
Stéphane Nicoll
27e8f14c31
Polish "Add container support for ClickHouse"
...
See gh-42837
2024-10-23 18:15:43 +02:00
Eddú Meléndez
d9dfb0389e
Add container support for ClickHouse
...
See gh-42837
2024-10-23 13:54:58 +02:00
Stéphane Nicoll
c6619dd306
Upgrade to Testcontainers 1.20.3
...
Closes gh-42847
2024-10-23 09:02:32 +02:00
Stéphane Nicoll
92a98d667c
Upgrade to SQLite JDBC 3.47.0.0
...
Closes gh-42846
2024-10-23 09:02:32 +02:00
Moritz Halbritter
5e5f41b7a6
Merge branch '3.3.x'
...
Closes gh-42845
2024-10-23 08:27:51 +02:00
Moritz Halbritter
9cced069a0
Delete argfile on JVM exit
...
Closes gh-42841
2024-10-23 08:27:31 +02:00
Stéphane Nicoll
37c562a39b
Merge branch '3.3.x'
2024-10-23 08:15:46 +02:00
Stéphane Nicoll
e4adc7da33
Merge branch '3.2.x' into 3.3.x
2024-10-23 08:15:39 +02:00
Stéphane Nicoll
1ade0b1250
Upgrade to Spring GraphQL 1.3.3
...
Closes gh-42844
2024-10-23 08:04:33 +02:00
Stéphane Nicoll
8a10ad1647
Upgrade to Spring Authorization Server 1.4.0-RC1
...
Closes gh-42559
2024-10-23 08:04:29 +02:00
Stéphane Nicoll
2f920cfe86
Upgrade to HttpCore5 5.3.1
...
Closes gh-42843
2024-10-23 08:04:29 +02:00
Stéphane Nicoll
c07c0c981c
Upgrade to GraphQL Java 22.3
...
Closes gh-42842
2024-10-23 08:04:24 +02:00
Stéphane Nicoll
8bf1a2db76
Upgrade to Spring GraphQL 1.3.3
...
Closes gh-42742
2024-10-23 08:03:30 +02:00
Stéphane Nicoll
9668ecd241
Upgrade to Spring Authorization Server 1.3.3
...
Closes gh-42546
2024-10-23 08:03:30 +02:00
Stéphane Nicoll
38d534807a
Upgrade to Spring Integration 6.2.10
...
Closes gh-42537
2024-10-23 08:03:24 +02:00
Stéphane Nicoll
78d0e48b7b
Upgrade to Spring GraphQL 1.2.9
...
Closes gh-42740
2024-10-23 08:03:24 +02:00
Stéphane Nicoll
f8c9fe428b
Upgrade to Spring Authorization Server 1.2.7
...
Closes gh-42534
2024-10-23 08:03:23 +02:00
Phillip Webb
e6b840004d
Support ResourceLoader delegation from ApplicationResourceLoader
...
Update `ApplicationResourceLoader` to support delegation to another
`ResourceLoader`. The update allows customer resource loaders to be
used when loading SSL resources.
Closes gh-42835
2024-10-22 22:07:42 -07:00
Phillip Webb
65fcf34773
Merge branch '3.3.x'
...
Closes gh-42840
2024-10-22 19:23:43 -07:00
Phillip Webb
dcbf0096d8
Use context class loader when watching SSL resource
...
Update `BundleContentProperty` to use a provided resource loader when
watching files.
Fixes gh-42468
2024-10-22 19:22:33 -07:00
Phillip Webb
0a1c65f8d4
Fix test compile error introduced during merge
...
See gh-42839
2024-10-22 18:52:14 -07:00
Phillip Webb
fdf7ca9093
Merge branch '3.3.x'
...
Closes gh-42839
2024-10-22 18:45:19 -07:00
Phillip Webb
499672184c
Use context class loader when loading auto-configured SSL bundles
...
Update `SslAutoConfiguration` to the `ApplicationContext` class loader
when loading SSL resources. Prior to this commit, the thread context
class loader was used to load resources which could be incorrect.
Specifically, when using a `ForkJoinPool` the thread context classloader
defaults to the JRE `AppClassLoader` which does not include uber jar
content.
The underlying `JksSslStoreBundle` class and `PemSslStore.load(...)`
method have been updated so support using a provided `ResourceLoader`.
Fixes gh-42468
2024-10-22 18:43:57 -07:00
Phillip Webb
61fbb12499
Polish
2024-10-22 16:05:51 -07:00