Commit Graph

50613 Commits

Author SHA1 Message Date
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
Stephane Nicoll
9dd9a2fa33 Upgrade to Spring AMQP 2.3.7
Closes gh-26384
2021-05-18 08:34:35 +02:00
Stephane Nicoll
56ba14ad2d Upgrade to Spring Kafka 2.7.1
Closes gh-26386
2021-05-18 08:34:01 +02:00
Stephane Nicoll
c8ba16034d Merge branch '2.4.x' 2021-05-18 08:33:22 +02:00
Stephane Nicoll
83ad93844b Upgrade to Spring AMQP 2.3.7
Closes gh-26383
2021-05-18 08:33:05 +02:00
Stephane Nicoll
2205024e9d Upgrade to Spring Kafka 2.6.8
Closes gh-26385
2021-05-18 08:32:38 +02:00
Stephane Nicoll
8ae64002ea Merge branch '2.3.x' into 2.4.x 2021-05-18 08:31:53 +02:00
Stephane Nicoll
678916fb3d Upgrade to Spring Kafka 2.5.13
Closes gh-26429
2021-05-18 08:29:35 +02:00
Phillip Webb
5c28f8f6a8 Merge branch '2.4.x'
Closes gh-26585
2021-05-17 21:35:04 -07:00
Phillip Webb
0e3ef4071e Allow optional ConfigDataLocationResolver results
Update `ConfigData` so that it signal if is considered optional. This
update allows `ConfigDataLocationResolvers` to return results that
behave in the same way as `optional:` prefixed locations without the
user themselves needing to prefix the location string.

Closes gh-25894
2021-05-17 21:31:58 -07:00
Phillip Webb
0c8d819150 Merge branch '2.4.x'
Closes gh-26584
2021-05-17 17:10:10 -07:00
Phillip Webb
2df5050040 Merge pull request #25868 from hatefpalizgar
* pr/25868:
  Polish 'Allow remote devtools access with Spring Security'
  Allow remote devtools access with Spring Security

Closes gh-25868
2021-05-17 17:09:47 -07:00
Phillip Webb
0699fdcc8a Polish 'Allow remote devtools access with Spring Security'
See gh-25868
2021-05-17 16:54:27 -07:00
Hatef Palizgar
9b2e13aace Allow remote devtools access with Spring Security
Update `ManagementWebSecurityAutoConfiguration` so that the
`managementSecurityFilterChain` bean has an explicit order.

Prior to this commit, the `managementSecurityFilterChain` would override
the `securityFilterChain` in `RemoteDevtoolsSecurityConfiguration` which
would prevent the remote devtools endpoint from being accessed.

See gh-25868
2021-05-17 16:51:18 -07:00
Phillip Webb
ba0fe1edbd Merge branch '2.4.x'
Closes gh-26581
Closes gh-26582
Closes gh-26583
2021-05-17 16:28:52 -07:00
Madhura Bhave
c45bb2bd95 Handle empty locations from patterns
Update `StandardConfigDataLocationResolver` to deal with patterns when
resolving empty directories. This update also fixes the handling of
mandatory pattern locations which would previously throw an exception.

The error message returned when a location with a pattern does not
contain any subdirectories has also been improved.

Fixes gh-26468
Fixes gh-26577
Fixes gh-26415
2021-05-17 16:23:46 -07:00
Phillip Webb
2bbad94910 Restore hasProgrammaticallySetProfiles code
Restore code lost on merge.

See gh-26580
2021-05-17 15:34:45 -07:00
Phillip Webb
634d27679a Merge branch '2.4.x'
Closes gh-26580
2021-05-17 13:30:33 -07:00
Madhura Bhave
cfa26735d2 Merge programmatically set active profiles
Update `Profiles` so that any profiles set programmatically on the
`Environment` are merged with `spring.profiles.active` properties.

Fixes gh-26151

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-17 13:29:12 -07:00
Andy Wilkinson
de6009774b Merge branch '2.4.x' 2021-05-17 18:03:37 +01:00
Andy Wilkinson
e8950c7808 Merge branch '2.3.x' into 2.4.x 2021-05-17 18:03:26 +01:00