Commit Graph

31248 Commits

Author SHA1 Message Date
izeye
38b9a833bd Fix "Allow optional directories without sub-directories"
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e29e which was incorrectly checking `isOptional`.

See gh-26677
2021-05-26 21:19:05 -07:00
Andy Wilkinson
01dd68e29e Allow optional directories without sub-directories
Update `StandardConfigDataLocationResolver` so that directory resources
are only required when the location is not optional.

Closes gh-26627

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-25 19:36:50 -07:00
Phillip Webb
14f578ed80 Merge branch '2.3.x' into 2.4.x
Closes gh-26670
2021-05-25 17:40:05 -07:00
Phillip Webb
39e3746cf6 Force Eclipse to use JavaSE-1.8 runtime
Add `EclipseConventions` to force the JavaSE-1.8 runtime to be applied
to the imported projects.

Closes gh-26669
2021-05-25 17:38:55 -07:00
Stephane Nicoll
967a794fa8 Merge pull request #26421 from lower-case
* pr/26421:
  Polish "Clarify Kotlin version requirements in documentation"
  Clarify Kotlin version requirements in documentation

Closes gh-26421
2021-05-25 10:45:45 +02:00
Stephane Nicoll
fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation"
See gh-26421
2021-05-25 10:45:08 +02:00
Lovekesh Garg
944ba34556 Clarify Kotlin version requirements in documentation
See gh-26421
2021-05-25 10:44:51 +02:00
Stephane Nicoll
9ff372c915 Merge branch '2.3.x' into 2.4.x
Closes gh-26653
2021-05-25 10:37:40 +02:00
Stephane Nicoll
b5ebf836e3 Document spring.profiles.default
Closes gh-26592
2021-05-25 10:32:59 +02:00
Madhura Bhave
4955c80da5 Remove test that is no long necessary 2021-05-24 21:10:50 -07:00
Madhura Bhave
8f2b180eb6 Use Sso Binding from SAML metadata uri if present
If the property is explicitly configured, that gets used.
If none are present, we rely on Spring Security's default value of
REDIRECT.

Fixes gh-26454
2021-05-24 16:37:31 -07:00
Stephane Nicoll
942691753d Merge branch '2.3.x' into 2.4.x
Closes gh-26645
2021-05-24 11:39:38 +02:00
Stephane Nicoll
9bdb205dba Merge pull request #26632 from dreis2211
* pr/26632:
  Remove workaround for SUREFIRE-1679

Closes gh-26632
2021-05-24 11:38:30 +02:00
dreis2211
01ee6190a2 Remove workaround for SUREFIRE-1679
See gh-26632
2021-05-24 11:15:58 +02:00
Madhura Bhave
b25497c45c Set LATEST_GA flag to false 2021-05-20 15:31:16 -07:00
Phillip Webb
6bf069d9e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26622
2021-05-20 14:42:54 -07:00
Phillip Webb
004363ceaf Use WebMvcConfigurer to add resource handlers
Move resource handler auto-configuration logic back to the
`WebMvcConfigurer` so that they also get applied to child contexts.

Closes gh-25743
2021-05-20 14:16:23 -07:00
Scott Frederick
8b24a80fa8 Merge branch '2.3.x' into 2.4.x 2021-05-20 15:38:09 -05:00
Spring Buildmaster
0fa1fa5230 Next development version (v2.4.7-SNAPSHOT) 2021-05-20 10:16:56 +00:00
Spring Buildmaster
ee76d6038c Next development version (v2.3.12.BUILD-SNAPSHOT) 2021-05-20 08:27:09 +00:00
Madhura Bhave
27fee5fa95 Configure filter to process preflight requests for webflux actuator endpoints
Fixes gh-24541
2021-05-19 16:16:16 -07:00
Madhura Bhave
29d1e22b91 Fix rawtypes 2021-05-19 15:26:53 -07:00
Madhura Bhave
743ac4c394 Merge branch '2.3.x' into 2.4.x
Closes gh-26611
2021-05-19 14:55:53 -07:00
Madhura Bhave
b26e842050 Configure CORS in default security configuration for MVC
Fixes gh-11987
2021-05-19 14:40:57 -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
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
6874c42d3c Merge branch '2.3.x' into 2.4.x
Closes gh-26605
2021-05-19 16:46:09 +01:00
Andy Wilkinson
2a89b11df3 Exclude SmartInitializingSingletones from lazy initialization
Fixes gh-26470
2021-05-19 16:26:48 +01:00
Stephane Nicoll
78da54d0d4 Merge branch '2.3.x' into 2.4.x 2021-05-19 16:43:06 +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
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
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
04e3165c15 Upgrade to Spring Integration 5.4.7
Closes gh-26587
2021-05-19 08:33:14 +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
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
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
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