Commit Graph

34842 Commits

Author SHA1 Message Date
Stephane Nicoll
1b8d8cfefc Merge branch '2.5.x' 2021-11-17 15:24:16 +01:00
Stephane Nicoll
73cc23801a Merge branch '2.4.x' into 2.5.x 2021-11-17 15:24:05 +01:00
Stephane Nicoll
a6163f6acf Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28720
2021-11-17 15:03:59 +01:00
Stephane Nicoll
fc69be302a Upgrade to HttpClient5 5.1.2
Closes gh-28719
2021-11-17 15:03:57 +01:00
Stephane Nicoll
f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28718
2021-11-17 15:02:27 +01:00
Stephane Nicoll
9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8
Closes gh-28717
2021-11-17 15:02:25 +01:00
Stephane Nicoll
1df04c46b5 Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28716
2021-11-17 14:59:51 +01:00
Stephane Nicoll
ba3d0d7771 Upgrade to Spring Session 2021.1.0
Closes gh-28522
2021-11-17 14:14:08 +01:00
Andy Wilkinson
313470ac9d Merge branch '2.5.x' 2021-11-17 10:08:45 +00:00
Andy Wilkinson
d541dda6b9 Merge branch '2.4.x' into 2.5.x 2021-11-17 10:08:33 +00:00
Andy Wilkinson
c6b2567156 Upgrade to Spring Batch 4.3.4
Closes gh-28230
2021-11-17 10:08:27 +00:00
Andy Wilkinson
ea0613c7d7 Merge branch '2.5.x'
Closes gh-28261
2021-11-17 10:07:18 +00:00
Andy Wilkinson
416a133fd1 Merge branch '2.4.x' into 2.5.x
Closes gh-28250
2021-11-17 10:06:41 +00:00
Andy Wilkinson
838533ef0e Upgrade to Spring Batch 4.3.4
Closes gh-28230
2021-11-17 10:04:51 +00:00
Stephane Nicoll
afa006986b Merge branch '2.5.x'
Closes gh-28713
2021-11-17 09:01:53 +01:00
Stephane Nicoll
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
Vedran Pavic
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
Stephane Nicoll
d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll
a02be1b9a2 Merge branch '2.5.x' 2021-11-17 08:51:42 +01:00
Stephane Nicoll
37864f6e66 Upgrade to Spring Integration 5.5.6
Closes gh-28521
2021-11-17 08:51:20 +01:00
Stephane Nicoll
de172a52e3 Merge branch '2.4.x' into 2.5.x 2021-11-17 08:50:48 +01:00
Stephane Nicoll
6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
2021-11-17 08:50:32 +01:00
Stephane Nicoll
385e7dd612 Upgrade to Spring Integration 5.4.12
Closes gh-28612
2021-11-17 08:48:53 +01:00
Stephane Nicoll
f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor
Closes gh-28705
2021-11-16 16:24:32 +01:00
Stephane Nicoll
08e9725b76 Upgrade to Tomcat 9.0.55
Closes gh-28700
2021-11-16 11:02:02 +01:00
Stephane Nicoll
dbcd0524a5 Upgrade to Logback 1.2.7
Closes gh-28699
2021-11-16 11:02:02 +01:00
Stephane Nicoll
d9bef3c21e Upgrade to Kotlin 1.6.0
Closes gh-28698
2021-11-16 11:02:02 +01:00
Stephane Nicoll
8356204430 Upgrade to Flyway 8.0.4
Closes gh-28697
2021-11-16 11:02:02 +01:00
Stephane Nicoll
4b64f36356 Upgrade to Spring Security 5.6.0
Closes gh-28520
2021-11-16 09:43:30 +01:00
Stephane Nicoll
619905a9b9 Merge branch '2.5.x' 2021-11-16 09:34:42 +01:00
Stephane Nicoll
d3e9e9519c Merge branch '2.4.x' into 2.5.x 2021-11-16 09:34:32 +01:00
Stephane Nicoll
b16b0c789f Upgrade to Tomcat 9.0.55
Closes gh-28696
2021-11-16 09:08:16 +01:00
Stephane Nicoll
4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
2021-11-16 09:08:15 +01:00
Stephane Nicoll
c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
2021-11-16 09:08:14 +01:00
Stephane Nicoll
44b644c770 Merge branch '2.5.x'
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll
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
Stephane Nicoll
9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun
7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll
6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll
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
Stephane Nicoll
6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun
793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
Stephane Nicoll
cdc14250c4 Merge branch '2.5.x'
Closes gh-28691
2021-11-16 08:34:39 +01:00
Stephane Nicoll
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
izeye
e56efc03f6 Update URL for GraphQL Spring Boot starter
See gh-28683
2021-11-16 08:33:56 +01:00
Stephane Nicoll
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
Stephane Nicoll
52ecc1e0dd Polish "Create EndpointWebExtension only if necessary"
See gh-28475
2021-11-16 08:22:35 +01:00
davidh44
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
Stephane Nicoll
db3a7db73d Upgrade to Tomcat 9.0.55
Closes gh-28690
2021-11-16 08:14:40 +01:00
Stephane Nicoll
38fd96e9c1 Upgrade to Logback 1.2.7
Closes gh-28689
2021-11-16 08:14:39 +01:00