Phillip Webb
b6d31fb6a1
Use correct type for deriveFromProperties
...
Fix `DataSourceBuilder` so that the type used to access `deriveFrom`
properties is based on the actual instance type rather than the
user-defined type which could have been changed.
Fixes gh-26644
2021-05-26 15:55:10 -07:00
Scott Frederick
eed620fc80
Allow driverClassName to be optional
...
Update `DataSourceBuilder` so that the `driverClassName` may be optional
and silently ignored if it set but the underlying type does not have
a getter/setter.
This restores Spring Boot 2.4 behavior.
Fixes gh-26631
Co-authored-by: Phillip Webb <pwebb@vmware.com >
2021-05-26 15:52:32 -07:00
Scott Frederick
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 Frederick
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 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
6424e3de12
Merge branch '2.4.x'
...
Closes gh-26671
2021-05-25 17:40:23 -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
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
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
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
Stephane Nicoll
44ad121c74
Upgrade to Kotlin 1.5.10
...
Closes gh-26652
2021-05-25 10:13:30 +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
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
Stephane Nicoll
363b508788
Merge pull request #26635 from obfischer
...
* pr/26635:
Add link to Maven Git Commit Id Plugin
Closes gh-26635
2021-05-23 16:40:34 +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
Spring Buildmaster
3a28aeeb29
Next development version (v2.5.1-SNAPSHOT)
2021-05-20 23:26:29 +00:00
Madhura Bhave
0548f90b2b
Set LATEST_GA flag to true
2021-05-20 15:36:26 -07:00
Madhura Bhave
3da3f27f14
Merge branch '2.4.x' into main
2021-05-20 15:34:19 -07:00
Madhura Bhave
b25497c45c
Set LATEST_GA flag to false
2021-05-20 15:31:16 -07: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
Scott Frederick
c380f06b2c
Merge branch '2.4.x'
2021-05-20 15:41:57 -05: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
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
60a8fae65c
Upgrade to spring-asciidoctor-backends 0.0.1
...
Closes gh-26293
2021-05-19 22:40:24 -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