Andy Wilkinson
db4e8c5133
Merge branch '3.3.x'
2024-09-18 08:48:31 +01:00
Andy Wilkinson
5ff86ea49f
Upgrade to Tomcat 10.1.30
...
Closes gh-42346
2024-09-18 08:48:08 +01:00
Andy Wilkinson
3706dced23
Upgrade to Spring Integration 6.3.4
...
Closes gh-42134
2024-09-18 08:48:02 +01:00
Andy Wilkinson
0bb727341f
Merge branch '3.3.x'
2024-09-18 08:44:10 +01:00
Andy Wilkinson
7ed34242d2
Merge branch '3.2.x' into 3.3.x
2024-09-18 08:43:54 +01:00
Andy Wilkinson
ef5bc91b35
Upgrade to Tomcat 10.1.30
...
Closes gh-42344
2024-09-18 08:19:28 +01:00
Andy Wilkinson
c37f786914
Upgrade to Spring Integration 6.2.9
...
Closes gh-42126
2024-09-18 08:19:23 +01:00
Phillip Webb
5324c646e1
Update merge script to support commercial repository
...
See gh-42333
2024-09-17 13:30:12 -07:00
Phillip Webb
58834133f1
Merge branch '3.3.x'
2024-09-17 12:33:55 -07:00
Phillip Webb
a5f27c2521
Merge branch '3.2.x' into 3.3.x
2024-09-17 12:33:34 -07:00
Phillip Webb
9726ddfe42
Add 'spring.build-type' property
...
See gh-42333
2024-09-17 12:32:50 -07:00
Phillip Webb
7934728102
Merge branch '3.3.x'
2024-09-17 12:29:47 -07:00
Phillip Webb
75bea6baf1
Merge branch '3.2.x' into 3.3.x
2024-09-17 12:27:39 -07:00
Phillip Webb
cad5dd2b85
Use variables for runs-on settings
...
See gh-42333
2024-09-17 12:25:54 -07:00
Moritz Halbritter
9294c003b4
Remove setting BP_NATIVE_IMAGE
...
Closes gh-32884
2024-09-17 15:50:57 +02:00
Stéphane Nicoll
9ca857b1ba
Merge branch '3.3.x'
...
Closes gh-42335
2024-09-17 09:19:59 +02:00
Stéphane Nicoll
bdbd006234
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42334
2024-09-17 09:19:47 +02:00
Stéphane Nicoll
3d53d7363a
Merge pull request #42331 from dependabot[bot]
...
* pr/42331:
Polish "Bump gradle/actions from 4.0.1 to 4.1.0"
Bump gradle/actions from 4.0.1 to 4.1.0
Closes gh-42331
2024-09-17 09:19:40 +02:00
Stéphane Nicoll
c6c0923dce
Polish "Bump gradle/actions from 4.0.1 to 4.1.0"
...
See gh-42331
2024-09-17 09:19:08 +02:00
dependabot[bot]
6f535adb47
Bump gradle/actions from 4.0.1 to 4.1.0
...
Bumps [gradle/actions](https://github.com/gradle/actions ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/gradle/actions/releases )
- [Commits](16bf8bc8fe...d156388eb1support@github.com >
See gh-42331
2024-09-17 09:16:59 +02:00
Stéphane Nicoll
3a9af5c4e0
Merge branch '3.3.x'
2024-09-17 09:16:20 +02:00
Stéphane Nicoll
49d8de1033
Merge branch '3.2.x' into 3.3.x
2024-09-17 09:16:12 +02:00
Stéphane Nicoll
f057559b17
Upgrade to Spring Security 6.4.0-M4
...
Closes gh-42148
2024-09-17 09:14:40 +02:00
Stéphane Nicoll
01b4ae526a
Upgrade to Spring Pulsar 1.2.0-M2
...
Closes gh-42147
2024-09-17 09:14:40 +02:00
Stéphane Nicoll
12b25e5280
Upgrade to Spring Kafka 3.3.0-M3
...
Closes gh-42146
2024-09-17 09:14:39 +02:00
Stéphane Nicoll
f844c64b12
Upgrade to Spring AMQP 3.2.0-M3
...
Closes gh-42140
2024-09-17 09:14:39 +02:00
Stéphane Nicoll
36b43f681c
Upgrade to Spring Pulsar 1.1.4
...
Closes gh-42136
2024-09-17 09:13:10 +02:00
Stéphane Nicoll
fc5b80ac64
Upgrade to Spring Kafka 3.2.4
...
Closes gh-42135
2024-09-17 09:13:10 +02:00
Stéphane Nicoll
de5f7ad318
Upgrade to Spring Pulsar 1.0.10
...
Closes gh-42128
2024-09-17 09:13:03 +02:00
Stéphane Nicoll
e009581a41
Upgrade to Spring Kafka 3.1.9
...
Closes gh-42127
2024-09-17 09:13:02 +02:00
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
