Madhura Bhave
110c36e607
Merge branch '2.4.x' into main
...
Closes gh-26610
2021-05-19 13:21:39 -07:00
Madhura Bhave
80610fa250
Restore order of additional and active profiles
...
This commit restores the order of additional and active profiles
so that active profiles now take precedence.
Fixes gh-26189
2021-05-19 13:21:03 -07:00
Phillip Webb
8a3f835ffe
Set Asciidoctor attribute-missing to warn
...
Closes gh-26590
2021-05-19 11:53:46 -07:00
Andy Wilkinson
d39bb997f2
Upgrade to Spring Session 2021.0.0
...
Closes gh-26389
2021-05-19 19:05:49 +01:00
Andy Wilkinson
879f362c29
Merge branch '2.4.x'
...
Closes gh-26608
2021-05-19 19:04:45 +01:00
Andy Wilkinson
64e76badc2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26607
2021-05-19 19:03:12 +01:00
Andy Wilkinson
b6e860b2d4
Prevent Jetty from delaying shutdown beyond grace period
...
Fixes gh-22689
2021-05-19 19:02:24 +01:00
Andy Wilkinson
66d087877d
Merge branch '2.4.x'
...
Closes gh-26606
2021-05-19 16:46:27 +01:00
Andy Wilkinson
6874c42d3c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26605
2021-05-19 16:46:09 +01:00
Stephane Nicoll
8b74d79539
Merge pull request #26591 from weixsun
...
* pr/26591:
Fix outdated defaults for Info endpoint
Closes gh-26591
2021-05-19 17:45:21 +02:00
weixsun
d2bdcddb5f
Fix outdated defaults for Info endpoint
...
See gh-26591
2021-05-19 17:42:13 +02:00
Andy Wilkinson
2a89b11df3
Exclude SmartInitializingSingletones from lazy initialization
...
Fixes gh-26470
2021-05-19 16:26:48 +01:00
Stephane Nicoll
b971ac8550
Upgrade to Netty 4.1.65.Final
...
Closes gh-26604
2021-05-19 17:24:04 +02:00
Stephane Nicoll
4caab742ca
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26603
2021-05-19 17:24:01 +02:00
Stephane Nicoll
a5f9e3912f
Upgrade to Spring WS 3.1.1
...
Closes gh-26390
2021-05-19 17:19:57 +02:00
Stephane Nicoll
02240857db
Merge branch '2.4.x'
2021-05-19 16:43:19 +02:00
Stephane Nicoll
78da54d0d4
Merge branch '2.3.x' into 2.4.x
2021-05-19 16:43:06 +02:00
Stephane Nicoll
a2365b326d
Merge branch '2.4.x'
2021-05-19 16:38:44 +02:00
Stephane Nicoll
6a45026097
Upgrade to Netty 4.1.65.Final
...
Closes gh-26602
2021-05-19 16:12:50 +02:00
Stephane Nicoll
8904649fcf
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26601
2021-05-19 16:12:49 +02:00
Stephane Nicoll
5edb788241
Upgrade to Netty 4.1.65.Final
...
Closes gh-26600
2021-05-19 15:51:26 +02:00
Stephane Nicoll
0d1b3fb078
Upgrade to Neo4j OGM 3.2.23
...
Closes gh-26599
2021-05-19 15:51:25 +02:00
Stephane Nicoll
22ec27dcd3
Upgrade to Json-smart 2.3.1
...
Closes gh-26598
2021-05-19 15:51:23 +02:00
Stephane Nicoll
32381ad61c
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26597
2021-05-19 15:51:22 +02:00
Stephane Nicoll
9bbf1c8bb1
Merge branch '2.4.x'
2021-05-19 15:49:01 +02:00
Stephane Nicoll
e71b4aac7b
Upgrade to Spring Batch 4.3.3
...
Closes gh-26392
2021-05-19 15:48:38 +02:00
Stephane Nicoll
a160453115
Merge branch '2.3.x' into 2.4.x
2021-05-19 15:48:18 +02:00
Stephane Nicoll
e5ab626638
Upgrade to Spring Batch 4.3.3
...
Closes gh-26391
2021-05-19 15:47:47 +02:00
Stephane Nicoll
7769e77775
Upgrade to Spring Batch 4.2.7
...
Closes gh-26426
2021-05-19 15:47:06 +02:00
Andy Wilkinson
b9abcba778
Merge branch '2.4.x'
...
Closes gh-26596
2021-05-19 13:38:20 +01:00
Andy Wilkinson
ff45e4c418
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26595
2021-05-19 13:15:18 +01:00
Andy Wilkinson
936c31c7a7
Prevent metrics failures from adversely affecting web responses
...
Fixes gh-24151
2021-05-19 13:14:52 +01:00
Andy Wilkinson
55b507bccf
Upgrade to Spring Integration 5.5.0
...
Closes gh-26388
2021-05-19 08:34:34 +01:00
Andy Wilkinson
bde5537bab
Merge branch '2.4.x'
2021-05-19 08:33:56 +01:00
Andy Wilkinson
04e3165c15
Upgrade to Spring Integration 5.4.7
...
Closes gh-26587
2021-05-19 08:33:14 +01:00
Phillip Webb
34b288e5fe
Add prefix to appendix property anchor links
...
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.
Closes gh-26375
2021-05-18 21:19:24 -07:00
Phillip Webb
86a5c90d20
Simplify anchor-rewrite.properties
2021-05-18 21:19:09 -07:00
Andy Wilkinson
abd809366b
Upgrade to Spring Asciidoctor Extensions 0.6.0
...
Closes gh-26306
2021-05-18 21:44:24 +01:00
Phillip Webb
1411cc3df7
Reorder a few how-to sections
...
Closes gh-26262
2021-05-18 11:54:04 -07:00
Phillip Webb
e08d4f1fe6
Move "Use Jedis Instead of Lettuce" How-to
...
See gh-26262
2021-05-18 11:53:26 -07:00
Phillip Webb
499a29c415
Move "Testcontainers" How-to
...
See gh-26262
2021-05-18 11:49:03 -07:00
Phillip Webb
72d50ed2f8
Move "Testing With Spring Security" How-to
...
See gh-26262
2021-05-18 11:49:02 -07:00
Phillip Webb
5f7e3d3952
Polish
2021-05-18 11:39:20 -07:00
Andy Wilkinson
41a2c96162
Merge pull request #26586 from dreis2211
...
* gh-26586:
Polish "Update docs and internal dep mgmt following Spock 2.0's release"
Update docs and internal dep mgmt following Spock 2.0's release
Closes gh-26586
2021-05-18 10:01:12 +01:00
Andy Wilkinson
8bc1a3aa1b
Merge branch '2.4.x'
2021-05-18 10:00:53 +01:00
Andy Wilkinson
88b383c6bb
Polish "Update docs and internal dep mgmt following Spock 2.0's release"
...
See gh-26586
2021-05-18 10:00:05 +01:00
dreis2211
5a6c355397
Update docs and internal dep mgmt following Spock 2.0's release
...
See gh-26586
2021-05-18 09:59:29 +01:00
Andy Wilkinson
2edd06fb6e
Start building against Spring Integration 5.4.7 snapshots
...
See gh-26587
2021-05-18 09:34:33 +01:00
Andy Wilkinson
d8b0aadf3b
Upgrade to Spring Security 5.5.0
...
Closes gh-26387
2021-05-18 09:28:09 +01:00
Andy Wilkinson
33a5c31fe3
Avoid duplicate crypto classes when depending on spring-security-core
...
See gh-26387
2021-05-18 09:27:48 +01:00