838533ef0e
Upgrade to Spring Batch 4.3.4
...
Closes gh-28230
2021-11-17 10:04:51 +00:00
afa006986b
Merge branch '2.5.x'
...
Closes gh-28713
2021-11-17 09:01:53 +01:00
663d5d4362
Merge pull request #28712 from vpavic
...
* pr/28712:
Fix "Configure Two DataSources" example
Closes gh-28712
2021-11-17 09:01:45 +01:00
c8dd0a584b
Fix "Configure Two DataSources" example
...
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.
This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.
See gh-28712
2021-11-17 09:00:14 +01:00
d88658d47a
Remove dependencies on micrometer-jersey2
...
Closes gh-28706
2021-11-17 08:56:08 +01:00
a02be1b9a2
Merge branch '2.5.x'
2021-11-17 08:51:42 +01:00
37864f6e66
Upgrade to Spring Integration 5.5.6
...
Closes gh-28521
2021-11-17 08:51:20 +01:00
de172a52e3
Merge branch '2.4.x' into 2.5.x
2021-11-17 08:50:48 +01:00
6325df2055
Upgrade to Spring Integration 5.5.6
...
Closes gh-28513
2021-11-17 08:50:32 +01:00
385e7dd612
Upgrade to Spring Integration 5.4.12
...
Closes gh-28612
2021-11-17 08:48:53 +01:00
f1991d8d80
Avoid bean override with CachingMetadataReaderFactoryPostProcessor
...
Closes gh-28705
2021-11-16 16:24:32 +01:00
08e9725b76
Upgrade to Tomcat 9.0.55
...
Closes gh-28700
2021-11-16 11:02:02 +01:00
dbcd0524a5
Upgrade to Logback 1.2.7
...
Closes gh-28699
2021-11-16 11:02:02 +01:00
d9bef3c21e
Upgrade to Kotlin 1.6.0
...
Closes gh-28698
2021-11-16 11:02:02 +01:00
8356204430
Upgrade to Flyway 8.0.4
...
Closes gh-28697
2021-11-16 11:02:02 +01:00
4b64f36356
Upgrade to Spring Security 5.6.0
...
Closes gh-28520
2021-11-16 09:43:30 +01:00
619905a9b9
Merge branch '2.5.x'
2021-11-16 09:34:42 +01:00
d3e9e9519c
Merge branch '2.4.x' into 2.5.x
2021-11-16 09:34:32 +01:00
b16b0c789f
Upgrade to Tomcat 9.0.55
...
Closes gh-28696
2021-11-16 09:08:16 +01:00
4fcb772f37
Upgrade to Logback 1.2.7
...
Closes gh-28695
2021-11-16 09:08:15 +01:00
c4eea99608
Upgrade to Kafka 2.7.2
...
Closes gh-28694
2021-11-16 09:08:14 +01:00
44b644c770
Merge branch '2.5.x'
...
Closes gh-28693
2021-11-16 08:59:58 +01:00
48ebd1bb4d
Merge pull request #28671 from weixsun
...
* pr/28671:
Polish "Fix yaml sample format"
Fix yaml sample format
Closes gh-28671
2021-11-16 08:59:45 +01:00
9ed7674ab0
Polish "Fix yaml sample format"
...
See gh-28671
2021-11-16 08:55:52 +01:00
7f1bd43c84
Fix yaml sample format
...
See gh-28671
2021-11-16 08:53:42 +01:00
6d4537b5ae
Merge branch '2.5.x'
...
Closes gh-28692
2021-11-16 08:50:53 +01:00
ea064ce036
Merge pull request #28670 from weixsun
...
* pr/28670:
Polish "Fix yaml sample format in reference doc"
Fix yaml sample format in reference doc
Closes gh-28670
2021-11-16 08:50:44 +01:00
6d79599d99
Polish "Fix yaml sample format in reference doc"
...
See gh-28670
2021-11-16 08:50:24 +01:00
793a107d27
Fix yaml sample format in reference doc
...
See gh-28670
2021-11-16 08:45:50 +01:00
cdc14250c4
Merge branch '2.5.x'
...
Closes gh-28691
2021-11-16 08:34:39 +01:00
7f4c8aafdf
Merge pull request #28683 from izeye
...
* pr/28683:
Update URL for GraphQL Spring Boot starter
Closes gh-28683
2021-11-16 08:34:33 +01:00
e56efc03f6
Update URL for GraphQL Spring Boot starter
...
See gh-28683
2021-11-16 08:33:56 +01:00
62d87f95d3
Merge pull request #28475 from davidh44
...
* pr/28475:
Polish "Create EndpointWebExtension only if necessary"
Create EndpointWebExtension only if necessary
Closes gh-28475
2021-11-16 08:31:35 +01:00
52ecc1e0dd
Polish "Create EndpointWebExtension only if necessary"
...
See gh-28475
2021-11-16 08:22:35 +01:00
b658013a97
Create EndpointWebExtension only if necessary
...
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.
See gh-28475
2021-11-16 08:15:19 +01:00
db3a7db73d
Upgrade to Tomcat 9.0.55
...
Closes gh-28690
2021-11-16 08:14:40 +01:00
38fd96e9c1
Upgrade to Logback 1.2.7
...
Closes gh-28689
2021-11-16 08:14:39 +01:00
826515a20f
Upgrade to Kafka 2.6.3
...
Closes gh-28688
2021-11-16 08:14:38 +01:00
aaad7727f0
Merge branch '2.5.x'
2021-11-15 19:59:00 +01:00
a4c5f07391
Upgrade to Spring Kafka 2.8.0
...
Closes gh-28519
2021-11-15 19:58:47 +01:00
d058af5be2
Upgrade to Spring AMQP 2.4.0
...
Closes gh-28518
2021-11-15 19:58:29 +01:00
84d92b9504
Merge branch '2.4.x' into 2.5.x
2021-11-15 19:57:52 +01:00
882c58b1f1
Upgrade to Spring Kafka 2.7.9
...
Closes gh-28539
2021-11-15 19:57:41 +01:00
d3c5563e60
Upgrade to Spring AMQP 2.3.12
...
Closes gh-28600
2021-11-15 19:57:15 +01:00
a23b737443
Upgrade to Spring Kafka 2.6.12
...
Closes gh-28685
2021-11-15 19:56:26 +01:00
69da7b4188
Upgrade to Spring AMQP 2.3.12
...
Closes gh-28599
2021-11-15 19:56:04 +01:00
8903c69b19
Avoid exposing time-related task metrics
...
Fixes gh-28535
2021-11-15 12:24:50 -06:00
d7f8931dd4
Make TaskExecution and TaskScheduling metrics unique
...
Fixes gh-28536
2021-11-15 12:23:25 -06:00
a1e7375fc0
Polish
2021-11-15 13:03:10 +00:00
2d7e0314f3
Merge branch '2.5.x'
...
# Conflicts:
# spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
# spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
2021-11-15 12:51:43 +00:00
Andy Wilkinson
Stephane Nicoll
Vedran Pavic
Weix Sun
izeye
davidh44
Scott Frederick