Stéphane Nicoll
74ddea416b
Merge branch '3.3.x'
2024-09-16 14:58:21 +02:00
Stéphane Nicoll
05adcab4f4
Merge branch '3.2.x' into 3.3.x
2024-09-16 14:58:09 +02:00
Stéphane Nicoll
4dbc636c51
Upgrade to Spring Retry 2.0.9
...
Closes gh-42329
2024-09-16 14:56:13 +02:00
Stéphane Nicoll
c5cfcfb2fd
Upgrade to R2DBC MariaDB 1.2.2
...
Closes gh-42328
2024-09-16 14:56:09 +02:00
Stéphane Nicoll
f7cb18c605
Upgrade to Spring Retry 2.0.9
...
Closes gh-42327
2024-09-16 14:49:27 +02:00
Stéphane Nicoll
c16c04abfe
Upgrade to R2DBC MariaDB 1.2.2
...
Closes gh-42326
2024-09-16 14:49:22 +02:00
Stéphane Nicoll
b75c2b6529
Upgrade to Spring Retry 2.0.9
...
Closes gh-42325
2024-09-16 14:48:13 +02:00
Moritz Halbritter
4877e4d1e3
Allow the configuration of active profiles in SpringApplication.Augmented
...
Closes gh-36660
2024-09-16 11:27:26 +02:00
Stéphane Nicoll
eff76131fb
Merge branch '3.3.x'
...
Closes gh-42323
2024-09-16 09:45:30 +02:00
Stéphane Nicoll
04891746ff
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42322
2024-09-16 09:45:23 +02:00
Stéphane Nicoll
ece9cb3fe1
Merge pull request #42313 from nosan
...
* pr/42313:
Polish "Use DataSource.unwrap to get routing data source"
Use DataSource.unwrap to get routing data source
Closes gh-42313
2024-09-16 09:45:17 +02:00
Stéphane Nicoll
78a140ae25
Polish "Use DataSource.unwrap to get routing data source"
...
See gh-42313
2024-09-16 09:37:22 +02:00
Dmytro Nosan
3f9f0490a6
Use DataSource.unwrap to get routing data source
...
This commit uses DataSource.isWrapperFor and DataSource.unwrap to detect
if a DataSource is an AbstractRoutingDataSource. Previously, it relied
on instanceof which does not account for cases where the datasource has
been proxied.
See gh-42313
2024-09-16 09:28:46 +02:00
Stéphane Nicoll
00440b982c
Merge branch '3.3.x'
...
Closes gh-42321
2024-09-16 09:04:19 +02:00
Stéphane Nicoll
437ff754ef
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42320
2024-09-16 09:04:07 +02:00
Stéphane Nicoll
99d0805bf9
Merge pull request #42311 from mushroom528
...
* pr/42311:
Polish "Replace Configuration fully qualified name by constant"
Replace Configuration fully qualified name by constant
Closes gh-42311
2024-09-16 09:03:08 +02:00
Stéphane Nicoll
242803d59b
Polish "Replace Configuration fully qualified name by constant"
...
See gh-42311
2024-09-16 09:01:36 +02:00
mushroom528
9bcfc72307
Replace Configuration fully qualified name by constant
...
See gh-42311
2024-09-16 09:01:23 +02:00
Phillip Webb
d3a2bf4044
Merge pull request #42289 from quaff
...
* pr/42289:
Add common definition annotations support for ConfigurationProperties
Closes gh-42289
2024-09-13 10:52:05 -07:00
Yanming Zhou
44be2e11d9
Add common definition annotations support for ConfigurationProperties
...
Update `` to ensure that common bean definition annotations, such as
`@Lazy`, `@Primary` and `@Fallback`, are applied.
See gh-42289
2024-09-13 10:18:13 -07:00
Stéphane Nicoll
27169a9ace
Merge branch '3.3.x'
...
Closes gh-42304
2024-09-13 16:27:24 +02:00
Stéphane Nicoll
6c36c82376
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42303
2024-09-13 16:27:13 +02:00
Stéphane Nicoll
e6e7357303
Upgrade to Undertow 2.3.17.Final
...
Closes gh-42302
2024-09-13 16:26:00 +02:00
Andy Wilkinson
403d3fe56b
Merge branch '3.3.x'
...
Closes gh-42301
2024-09-13 15:11:41 +01:00
Andy Wilkinson
988e083fef
Make sure that generateAntoraYml runs when attributes have changed
...
Closes gh-42300
2024-09-13 15:10:40 +01:00
Stéphane Nicoll
ab7ac73297
Merge branch '3.3.x'
2024-09-13 15:51:47 +02:00
Stéphane Nicoll
5666c981fc
Merge branch '3.2.x' into 3.3.x
2024-09-13 15:51:40 +02:00
Stéphane Nicoll
4c6d1de284
Upgrade to Spring Data Bom 2024.1.0-M1
...
Closes gh-42143
2024-09-13 15:50:33 +02:00
Stéphane Nicoll
99d4e5cbf8
Upgrade to Spring Data Bom 2024.0.4
...
Closes gh-42132
2024-09-13 15:47:29 +02:00
Stéphane Nicoll
d3861bcaef
Upgrade to Spring Data Bom 2023.1.10
...
Closes gh-42124
2024-09-13 15:45:58 +02:00
Stéphane Nicoll
190a4279c5
Merge branch '3.3.x'
2024-09-13 15:26:15 +02:00
Stéphane Nicoll
b52202d6f2
Merge branch '3.2.x' into 3.3.x
2024-09-13 15:26:08 +02:00
Stéphane Nicoll
535ec4c14a
Upgrade to OpenTelemetry 1.42.1
...
Closes gh-42298
2024-09-13 15:18:06 +02:00
Stéphane Nicoll
baff7a5c64
Upgrade to HttpCore5 5.3
...
Closes gh-42297
2024-09-13 15:18:06 +02:00
Stéphane Nicoll
c65d26fb81
Upgrade to Groovy 4.0.23
...
Closes gh-42296
2024-09-13 15:18:06 +02:00
Stéphane Nicoll
d6bfdbd90e
Upgrade to Flyway 10.18.0
...
Closes gh-42295
2024-09-13 15:18:06 +02:00
Stéphane Nicoll
831cbedb31
Upgrade to Groovy 4.0.23
...
Closes gh-42292
2024-09-13 11:20:54 +02:00
Stéphane Nicoll
0215da06df
Upgrade to Groovy 4.0.23
...
Closes gh-42291
2024-09-13 11:17:58 +02:00
Phillip Webb
36abc9c933
Merge branch '3.3.x'
...
Closes gh-42288
2024-09-12 18:57:09 -07:00
Phillip Webb
ee2ec9bc9d
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42287
2024-09-12 18:57:01 -07:00
Phillip Webb
8686ee80d2
Merge pull request #42277 from quaff
...
* pr/42277:
Add tests to ensure private constructor is not used for binding
Closes gh-42277
2024-09-12 18:56:51 -07:00
Yanming Zhou
ee10425b6d
Add tests to ensure private constructor is not used for binding
...
See gh-42277
2024-09-12 18:54:30 -07:00
Phillip Webb
dab5326f59
Merge branch '3.3.x'
...
Closes gh-42286
2024-09-12 18:44:42 -07:00
Phillip Webb
a405c42006
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42285
2024-09-12 18:43:54 -07:00
Phillip Webb
03e7be3ccf
Document that spring.jmx.enabled is not for third-party libraries
...
Closes gh-42272
2024-09-12 18:35:57 -07:00
Phillip Webb
3723a9e040
Support Testcontainer JDBC URLs with `Replace.NON_TEST`
...
Update `TestDatabaseAutoConfiguration` so that Testcontainer JDBC URLs
are also detected when using `Replace.NON_TEST`.
Closes gh-35253
2024-09-12 13:02:23 -07:00
Stéphane Nicoll
af34690093
Upgrade to Spring HATEOAS 2.4.0-RC1
...
Closes gh-42283
2024-09-12 15:30:56 +02:00
Stéphane Nicoll
f213ba4e49
Upgrade to Spring Framework 6.2.0-RC1
...
Closes gh-42144
2024-09-12 15:30:51 +02:00
Stéphane Nicoll
92ca27688f
Merge branch '3.3.x'
2024-09-12 15:26:57 +02:00
Stéphane Nicoll
4e35050699
Merge branch '3.2.x' into 3.3.x
2024-09-12 15:26:45 +02:00