75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
02494d63d2
Merge branch '2.4.x'
...
Closes gh-26744
2021-06-02 17:26:05 -07:00
1cda557d03
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26743
2021-06-02 17:25:51 -07:00
1beee5700c
Don't close early when SecurityManager present
...
Update `JarFile` and `JarFileWrapper` classes so that they no longer
close the `JarFile` early if a `SecurityManager` is in use.
Prior to this commit, the closed `JarFile` would cause (an ultimately
swallowed) NPE in `ZipFile` which manifested itself as a
`ClassNotFoundException` when starting the app.
Closes gh-25538
2021-06-02 17:24:05 -07:00
554cf9d7c7
Merge branch '2.4.x' into main
...
Closes gh-26741
2021-06-02 12:24:36 -07:00
2ff3fe22e5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26740
2021-06-02 12:20:02 -07:00
d0e2925dcc
Fix link to Spring Data JPA docs
...
Fixes gh-26736
2021-06-02 12:18:57 -07:00
f560e86f03
Write buildpack directories to builder layer
...
When a custom buildpack is provided for image building, the contents
of the buildpack directory, tgz file, or image are copied as tar
entries to a new layer in the ephemeral builder image. Prior to this
commit, only file entries from the buildpack source were copied as
builder layer tar entries; intermediate directory entries from the
source were not copied. This results in directories being created in
the builder container using default permissions. This worked on most
Linux-like OSs where the default permissions allow others-read
access. On some OSs like Arch Linux where the default directory
permissions do not allow others-read, this prevented the lifecycle
processes from reading the buildpack files.
This commit explicitly creates all intermediate directory tar entries
in the builder image layer to ensure that the buildpack directories
and files can be read by the lifecycle processes.
Fixes gh-26658
2021-06-02 14:09:53 -05:00
e2cba40db0
Merge branch '2.4.x' into main
...
Closes gh-26739
2021-06-02 12:02:53 -07:00
b102fdd392
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26738
2021-06-02 12:02:11 -07:00
15324956a8
Align int and long in RandomValuePropertySource
...
This commit aligns int and long so that a random number is generated
by delegating to ints/longs in the JDK's Random API. In the case of a
single bound value, it needs to be greater than 0 because 0 is used as
the lower bound.
Fixes gh-26628
2021-06-02 12:00:25 -07:00
e9ed92a305
Polish
2021-06-02 14:14:04 +02:00
1f95989e85
Merge branch '2.4.x'
...
Closes gh-26735
2021-06-02 13:56:13 +02:00
363c43e315
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26734
2021-06-02 13:52:03 +02:00
3f23b9265d
Clarify when a connection pool is created for Redis
...
Closes gh-26733
2021-06-02 13:49:16 +02:00
7b490f003c
Avoid dependency on Kotlin when depending on spring-security-config
...
Closes gh-26727
2021-06-01 17:45:14 +02:00
97c5a08ca5
Merge branch '2.4.x'
...
Closes gh-26725
2021-06-01 15:38:48 +02:00
c8959180fe
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26724
2021-06-01 15:38:27 +02:00
7e4defbcba
Properly guard LogbackLoggingSystem
...
Previously, LoggingSystem#get would chose Logback by the sole presence
of a class in logback-core, with the assumption that logback-classic is
also on the classpath. An app that only had the former would therefore
fail.
This commit updates the condition to check for a class in
logback-classic instead.
Closes gh-26711
2021-06-01 15:35:22 +02:00
d0185e7531
Merge branch '2.4.x'
...
Closes gh-26717
2021-05-31 07:47:59 +02:00
897fd63faf
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26716
2021-05-31 07:47:45 +02:00
4b3bf75a4c
Remove redudant space
...
See gh-26713
2021-05-31 07:47:07 +02:00
d3f0f04f05
Merge branch '2.4.x'
...
Closes gh-26703
2021-05-28 14:53:27 -07:00
49d3ecc2b2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26702
2021-05-28 14:53:12 -07:00
617f7b9587
Improve ImageName/ImageReference parse performance
...
Update `ImageName` and `ImageReference` to use distinct regex patterns
to parse specific parts of the value. Prior to this commit a single
regex pattern was used which could hang given certain input strings.
Fixes gh-23115
2021-05-28 14:52:27 -07:00
54c3194164
Merge branch '2.4.x' into main
...
Closes gh-26701
2021-05-28 14:38:28 -07:00
5314bda48d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26700
2021-05-28 14:30:44 -07:00
f55e4c08f5
Add note about Kubernetes termination grace period
...
Closes gh-26469
2021-05-28 14:30:04 -07:00
b8b0430139
Merge branch '2.4.x'
...
Closes gh-26697
2021-05-28 13:29:42 +02:00
7f5adb7e9d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26696
2021-05-28 13:29:29 +02:00
454d72d9b2
Document spring.profiles.default in the reference guide
...
Closes gh-26592
2021-05-28 13:29:27 +02:00
67fe60ba8a
Add missing static on JerseyInfrastructureConfiguration
...
Closes gh-26695
2021-05-28 13:26:37 +02:00
5258c26f90
Merge branch '2.4.x'
2021-05-27 13:15:19 -07:00
49c30854af
Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
...
Rename the now public constant for consistency with the JavaPlugin.
See gh-26686
2021-05-27 13:14:16 -07:00
ac0c1b1456
Merge branch '2.4.x'
...
Closes gh-26687
2021-05-27 12:08:49 -07:00
1e0ae9d5e3
Make PRODUCTION_RUNTIME_CLASSPATH_NAME public
...
Change `SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME` from package
private to public so that it can be accessed in user build scripts.
Fixes gh-26686
2021-05-27 12:07:35 -07:00
42865daca9
Merge branch '2.4.x'
2021-05-27 11:49:42 -07:00
8661f74f2e
Revert "Test optional directories without sub-directories"
...
This reverts commit 3f858ed8a4
2021-05-27 11:48:58 -07:00
91eb37dd84
Merge branch '2.4.x'
...
Closes gh-26679
2021-05-26 21:33:18 -07:00
3f858ed8a4
Test optional directories without sub-directories
...
Add an additional test to ensure that optional wildcard
directory patterns do not fail.
See gh-26677
2021-05-26 21:31:14 -07:00
38b9a833bd
Fix "Allow optional directories without sub-directories"
...
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e29e
2021-05-26 21:19:05 -07:00
1a10162777
Change state change logging to DEBUG
...
Update `ApplicationAvailabilityBean` so that state change logging is
at DEBUG rather than INFO.
Fixes gh-26624
2021-05-26 16:31:35 -07:00
78ac7b3861
Polish
2021-05-26 16:19:26 -07:00
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
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
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
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
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
7d6093680d
Polish
2021-05-26 15:51:30 -07:00
e5ee1eb86f
Merge branch '2.4.x'
...
See gh-26654
2021-05-26 09:27:52 +02:00
130261f0df
Merge branch '2.3.x' into 2.4.x
...
See gh-26653
2021-05-26 09:21:17 +02:00
3fbf5eeb5b
Document spring.profiles.default in the reference guide
...
Closes gh-26592
2021-05-26 09:20:58 +02:00
249c675fff
Merge branch '2.4.x'
...
Closes gh-26672
2021-05-25 19:37:14 -07:00
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
3c6bf14c16
Polish
2021-05-25 16:46:05 +02:00
f3d4fdb9c4
Merge branch '2.4.x'
...
Closes gh-26655
2021-05-25 10:46:40 +02:00
fe1e2319b2
Polish "Clarify Kotlin version requirements in documentation"
...
See gh-26421
2021-05-25 10:45:08 +02:00
944ba34556
Clarify Kotlin version requirements in documentation
...
See gh-26421
2021-05-25 10:44:51 +02:00
d5b41e288f
Merge branch '2.4.x'
...
Closes gh-26654
2021-05-25 10:37:49 +02:00
9ff372c915
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26653
2021-05-25 10:37:40 +02:00
b5ebf836e3
Document spring.profiles.default
...
Closes gh-26592
2021-05-25 10:32:59 +02:00
4416859a81
Merge branch '2.4.x' into main
2021-05-24 21:11:42 -07:00
4955c80da5
Remove test that is no long necessary
2021-05-24 21:10:50 -07:00
ae24d66af7
Merge branch '2.4.x' into main
...
Closes gh-26649
2021-05-24 16:42:32 -07:00
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
cb7c3774a7
Merge branch '2.4.x'
...
Closes gh-26646
2021-05-24 11:39:57 +02:00
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02:00
11af8a816c
Add link to Maven Git Commit Id Plugin
...
See gh-26635
2021-05-23 16:37:44 +02:00
7a7050879c
Avoid eager initialization when configuring Data repository metrics
...
Fixes gh-26630
2021-05-21 13:54:35 +01:00
15042e2710
Merge branch '2.4.x'
...
Closes gh-26623
2021-05-20 14:43:11 -07:00
6bf069d9e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26622
2021-05-20 14:42:54 -07:00
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
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
f0896c2de6
Rework title anchors for maven docs
...
Closes gh-26617
2021-05-19 21:19:24 -07:00
1702c9fc3d
Rework title anchors for gradle docs
...
Closes gh-26618
2021-05-19 21:19:24 -07:00
f692b0e937
Rework title anchors for actuator docs
...
Closes gh-26615
2021-05-19 21:19:24 -07:00
2dbf39c738
Polish asciidoc formatting
2021-05-19 21:19:24 -07:00
a28072bab4
Merge branch '2.4.x' into main
...
Closes gh-26614
2021-05-19 16:17:34 -07:00
27fee5fa95
Configure filter to process preflight requests for webflux actuator endpoints
...
Fixes gh-24541
2021-05-19 16:16:16 -07:00
99ed291184
Merge branch '2.4.x' into main
2021-05-19 15:27:48 -07:00
29d1e22b91
Fix rawtypes
2021-05-19 15:26:53 -07:00
3ef9b7e634
Merge branch '2.4.x' into main
...
Closes gh-26612
2021-05-19 15:01:45 -07:00
743ac4c394
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26611
2021-05-19 14:55:53 -07:00
b26e842050
Configure CORS in default security configuration for MVC
...
Fixes gh-11987
2021-05-19 14:40:57 -07:00
110c36e607
Merge branch '2.4.x' into main
...
Closes gh-26610
2021-05-19 13:21:39 -07:00
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
8a3f835ffe
Set Asciidoctor attribute-missing to warn
...
Closes gh-26590
2021-05-19 11:53:46 -07:00
d39bb997f2
Upgrade to Spring Session 2021.0.0
...
Closes gh-26389
2021-05-19 19:05:49 +01:00
879f362c29
Merge branch '2.4.x'
...
Closes gh-26608
2021-05-19 19:04:45 +01:00
64e76badc2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26607
2021-05-19 19:03:12 +01:00
b6e860b2d4
Prevent Jetty from delaying shutdown beyond grace period
...
Fixes gh-22689
2021-05-19 19:02:24 +01:00
66d087877d
Merge branch '2.4.x'
...
Closes gh-26606
2021-05-19 16:46:27 +01:00
6874c42d3c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26605
2021-05-19 16:46:09 +01:00
d2bdcddb5f
Fix outdated defaults for Info endpoint
...
See gh-26591
2021-05-19 17:42:13 +02:00
2a89b11df3
Exclude SmartInitializingSingletones from lazy initialization
...
Fixes gh-26470
2021-05-19 16:26:48 +01:00
b971ac8550
Upgrade to Netty 4.1.65.Final
...
Closes gh-26604
2021-05-19 17:24:04 +02:00
4caab742ca
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26603
2021-05-19 17:24:01 +02:00
a5f9e3912f
Upgrade to Spring WS 3.1.1
...
Closes gh-26390
2021-05-19 17:19:57 +02:00
6a45026097
Upgrade to Netty 4.1.65.Final
...
Closes gh-26602
2021-05-19 16:12:50 +02:00
8904649fcf
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26601
2021-05-19 16:12:49 +02:00
5edb788241
Upgrade to Netty 4.1.65.Final
...
Closes gh-26600
2021-05-19 15:51:26 +02:00
0d1b3fb078
Upgrade to Neo4j OGM 3.2.23
...
Closes gh-26599
2021-05-19 15:51:25 +02:00
22ec27dcd3
Upgrade to Json-smart 2.3.1
...
Closes gh-26598
2021-05-19 15:51:23 +02:00
32381ad61c
Upgrade to Jetty 9.4.41.v20210516
...
Closes gh-26597
2021-05-19 15:51:22 +02:00
e71b4aac7b
Upgrade to Spring Batch 4.3.3
...
Closes gh-26392
2021-05-19 15:48:38 +02:00
e5ab626638
Upgrade to Spring Batch 4.3.3
...
Closes gh-26391
2021-05-19 15:47:47 +02:00
7769e77775
Upgrade to Spring Batch 4.2.7
...
Closes gh-26426
2021-05-19 15:47:06 +02:00
b9abcba778
Merge branch '2.4.x'
...
Closes gh-26596
2021-05-19 13:38:20 +01:00
ff45e4c418
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26595
2021-05-19 13:15:18 +01:00
936c31c7a7
Prevent metrics failures from adversely affecting web responses
...
Fixes gh-24151
2021-05-19 13:14:52 +01:00
55b507bccf
Upgrade to Spring Integration 5.5.0
...
Closes gh-26388
2021-05-19 08:34:34 +01:00
04e3165c15
Upgrade to Spring Integration 5.4.7
...
Closes gh-26587
2021-05-19 08:33:14 +01:00
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
86a5c90d20
Simplify anchor-rewrite.properties
2021-05-18 21:19:09 -07:00
abd809366b
Upgrade to Spring Asciidoctor Extensions 0.6.0
...
Closes gh-26306
2021-05-18 21:44:24 +01:00
e08d4f1fe6
Move "Use Jedis Instead of Lettuce" How-to
...
See gh-26262
2021-05-18 11:53:26 -07:00
499a29c415
Move "Testcontainers" How-to
...
See gh-26262
2021-05-18 11:49:03 -07:00
72d50ed2f8
Move "Testing With Spring Security" How-to
...
See gh-26262
2021-05-18 11:49:02 -07:00
5f7e3d3952
Polish
2021-05-18 11:39:20 -07:00
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
5a6c355397
Update docs and internal dep mgmt following Spock 2.0's release
...
See gh-26586
2021-05-18 09:59:29 +01:00
2edd06fb6e
Start building against Spring Integration 5.4.7 snapshots
...
See gh-26587
2021-05-18 09:34:33 +01:00
d8b0aadf3b
Upgrade to Spring Security 5.5.0
...
Closes gh-26387
2021-05-18 09:28:09 +01:00
33a5c31fe3
Avoid duplicate crypto classes when depending on spring-security-core
...
See gh-26387
2021-05-18 09:27:48 +01:00
9dd9a2fa33
Upgrade to Spring AMQP 2.3.7
...
Closes gh-26384
2021-05-18 08:34:35 +02:00
56ba14ad2d
Upgrade to Spring Kafka 2.7.1
...
Closes gh-26386
2021-05-18 08:34:01 +02:00
83ad93844b
Upgrade to Spring AMQP 2.3.7
...
Closes gh-26383
2021-05-18 08:33:05 +02:00
2205024e9d
Upgrade to Spring Kafka 2.6.8
...
Closes gh-26385
2021-05-18 08:32:38 +02:00
678916fb3d
Upgrade to Spring Kafka 2.5.13
...
Closes gh-26429
2021-05-18 08:29:35 +02:00
5c28f8f6a8
Merge branch '2.4.x'
...
Closes gh-26585
2021-05-17 21:35:04 -07:00
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
0c8d819150
Merge branch '2.4.x'
...
Closes gh-26584
2021-05-17 17:10:10 -07:00
0699fdcc8a
Polish 'Allow remote devtools access with Spring Security'
...
See gh-25868
2021-05-17 16:54:27 -07:00
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
ba0fe1edbd
Merge branch '2.4.x'
...
Closes gh-26581
Closes gh-26582
Closes gh-26583
2021-05-17 16:28:52 -07:00
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
2bbad94910
Restore hasProgrammaticallySetProfiles code
...
Restore code lost on merge.
See gh-26580
2021-05-17 15:34:45 -07:00
634d27679a
Merge branch '2.4.x'
...
Closes gh-26580
2021-05-17 13:30:33 -07:00
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
36b6235e86
Upgrade to Spring AMQP 2.2.17.RELEASE
...
Closes gh-26428
2021-05-17 18:02:53 +01:00
e9174c1e3d
Update copyright year of changed files
...
See gh-26478
2021-05-17 16:08:20 +02:00
935199b6ba
Polish AbstractServletWebServerFactory
...
See gh-26478
2021-05-17 16:08:19 +02:00
d41fa13463
Merge branch '2.4.x'
...
Closes gh-26575
2021-05-17 14:39:35 +01:00
4eab9476a6
Polish "Detect use of spring.profiles.include as a YAML list"
...
See gh-26205
2021-05-17 14:13:29 +01:00
80ad6385f1
Detect use of spring.profiles.include as a YAML list
...
See gh-26205
2021-05-17 14:04:51 +01:00
4517f6057e
Merge branch '2.4.x'
...
Closes gh-26573
2021-05-17 13:50:13 +01:00
1d5abf5af7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26572
2021-05-17 13:49:25 +01:00
Stephane Nicoll
dreis2211
Phillip Webb
Madhura Bhave
Scott Frederick
weixsun
izeye
Andy Wilkinson
Lovekesh Garg
Oliver B. Fischer
Hatef Palizgar
ChangYong