Commit Graph
13463 Commits
Author SHA1 Message Date
Scott FrederickandPhillip Webb c679b4ccd6 Don't attempt to set null values
Update `DataSourceBuilder` so that setters are not longer called for
`null` values. This restores Spring Boot 2.4 behavior.

Fixes gh-26633

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-26 15:52:27 -07:00
Scott FrederickandPhillip Webb a31e976ec6 Support fallback URL properties
Update `DataSourceBuilder` so that the url property attempts both
`getUrl()` / `setUrl(...)` and `getURL()`/`setURL(...)`.

Fixes gh-26647

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-26 15:52:18 -07:00
Phillip Webb e55948456f Respect custom username/password properties
Fix a bug in `DataSourceInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
2021-05-26 15:51:34 -07:00
Scott Frederick 7d6093680d Polish 2021-05-26 15:51:30 -07:00
Stephane Nicoll e5ee1eb86f Merge branch '2.4.x'
See gh-26654
2021-05-26 09:27:52 +02:00
Stephane Nicoll 130261f0df Merge branch '2.3.x' into 2.4.x
See gh-26653
2021-05-26 09:21:17 +02:00
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide
Closes gh-26592
2021-05-26 09:20:58 +02:00
Phillip Webb 249c675fff Merge branch '2.4.x'
Closes gh-26672
2021-05-25 19:37:14 -07:00
Andy WilkinsonandPhillip Webb 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
Stephane Nicoll 3c6bf14c16 Polish 2021-05-25 16:46:05 +02:00
Stephane Nicoll f3d4fdb9c4 Merge branch '2.4.x'
Closes gh-26655
2021-05-25 10:46:40 +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 d5b41e288f Merge branch '2.4.x'
Closes gh-26654
2021-05-25 10:37:49 +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 4416859a81 Merge branch '2.4.x' into main 2021-05-24 21:11:42 -07:00
Madhura Bhave 4955c80da5 Remove test that is no long necessary 2021-05-24 21:10:50 -07:00
Madhura Bhave ae24d66af7 Merge branch '2.4.x' into main
Closes gh-26649
2021-05-24 16:42:32 -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 cb7c3774a7 Merge branch '2.4.x'
Closes gh-26646
2021-05-24 11:39:57 +02:00
Stephane Nicoll 942691753d Merge branch '2.3.x' into 2.4.x
Closes gh-26645
2021-05-24 11:39:38 +02:00
dreis2211 01ee6190a2 Remove workaround for SUREFIRE-1679
See gh-26632
2021-05-24 11:15:58 +02:00
Oliver B. Fischer 11af8a816c Add link to Maven Git Commit Id Plugin
See gh-26635
2021-05-23 16:37:44 +02:00
Andy Wilkinson 7a7050879c Avoid eager initialization when configuring Data repository metrics
Fixes gh-26630
2021-05-21 13:54:35 +01:00
Phillip Webb 15042e2710 Merge branch '2.4.x'
Closes gh-26623
2021-05-20 14:43:11 -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
Phillip Webb ab958d2394 Include io.spring.asciidoctor.backends group
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
2021-05-19 22:58:31 -07:00
Phillip Webb f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
2021-05-19 21:19:24 -07:00
Phillip Webb 1702c9fc3d Rework title anchors for gradle docs
Closes gh-26618
2021-05-19 21:19:24 -07:00
Phillip Webb f692b0e937 Rework title anchors for actuator docs
Closes gh-26615
2021-05-19 21:19:24 -07:00
Phillip Webb 2dbf39c738 Polish asciidoc formatting 2021-05-19 21:19:24 -07:00
Madhura Bhave a28072bab4 Merge branch '2.4.x' into main
Closes gh-26614
2021-05-19 16:17:34 -07: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 99ed291184 Merge branch '2.4.x' into main 2021-05-19 15:27:48 -07:00
Madhura Bhave 29d1e22b91 Fix rawtypes 2021-05-19 15:26:53 -07:00
Madhura Bhave 3ef9b7e634 Merge branch '2.4.x' into main
Closes gh-26612
2021-05-19 15:01:45 -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 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
weixsun d2bdcddb5f Fix outdated defaults for Info endpoint
See gh-26591
2021-05-19 17:42:13 +02:00