fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,524 Commits 22 Branches 339 Tags
Commit Graph

13496 Commits

Author SHA1 Message Date
Stephane Nicoll
1f95989e85 Merge branch '2.4.x' 
Closes gh-26735
 2021-06-02 13:56:13 +02:00
Stephane Nicoll
363c43e315 Merge branch '2.3.x' into 2.4.x 
Closes gh-26734
 2021-06-02 13:52:03 +02:00
Stephane Nicoll
3f23b9265d Clarify when a connection pool is created for Redis 
Closes gh-26733
 2021-06-02 13:49:16 +02:00
Stephane Nicoll
7b490f003c Avoid dependency on Kotlin when depending on spring-security-config 
Closes gh-26727
 2021-06-01 17:45:14 +02:00
Stephane Nicoll
97c5a08ca5 Merge branch '2.4.x' 
Closes gh-26725
 2021-06-01 15:38:48 +02:00
Stephane Nicoll
c8959180fe Merge branch '2.3.x' into 2.4.x 
Closes gh-26724
 2021-06-01 15:38:27 +02:00
Stephane Nicoll
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
Stephane Nicoll
d0185e7531 Merge branch '2.4.x' 
Closes gh-26717
 2021-05-31 07:47:59 +02:00
Stephane Nicoll
897fd63faf Merge branch '2.3.x' into 2.4.x 
Closes gh-26716
 2021-05-31 07:47:45 +02:00
weixsun
4b3bf75a4c Remove redudant space 
See gh-26713
 2021-05-31 07:47:07 +02:00
Phillip Webb
d3f0f04f05 Merge branch '2.4.x' 
Closes gh-26703
 2021-05-28 14:53:27 -07:00
Phillip Webb
49d3ecc2b2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26702
 2021-05-28 14:53:12 -07:00
Phillip Webb
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
Madhura Bhave
54c3194164 Merge branch '2.4.x' into main 
Closes gh-26701
 2021-05-28 14:38:28 -07:00
Madhura Bhave
5314bda48d Merge branch '2.3.x' into 2.4.x 
Closes gh-26700
 2021-05-28 14:30:44 -07:00
Madhura Bhave
f55e4c08f5 Add note about Kubernetes termination grace period 
Closes gh-26469
 2021-05-28 14:30:04 -07:00
Stephane Nicoll
b8b0430139 Merge branch '2.4.x' 
Closes gh-26697
 2021-05-28 13:29:42 +02:00
Stephane Nicoll
7f5adb7e9d Merge branch '2.3.x' into 2.4.x 
Closes gh-26696
 2021-05-28 13:29:29 +02:00
Stephane Nicoll
454d72d9b2 Document spring.profiles.default in the reference guide 
Closes gh-26592
 2021-05-28 13:29:27 +02:00
Stephane Nicoll
67fe60ba8a Add missing static on JerseyInfrastructureConfiguration 
Closes gh-26695
 2021-05-28 13:26:37 +02:00
Phillip Webb
5258c26f90 Merge branch '2.4.x' 2021-05-27 13:15:19 -07:00
Phillip Webb
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
Phillip Webb
ac0c1b1456 Merge branch '2.4.x' 
Closes gh-26687
 2021-05-27 12:08:49 -07:00
Phillip Webb
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
Phillip Webb
42865daca9 Merge branch '2.4.x' 2021-05-27 11:49:42 -07:00
Phillip Webb
8661f74f2e Revert "Test optional directories without sub-directories" 
This reverts commit 3f858ed8a4b4f190885f7c4a5eff1c423f8546a9
since the test already existed.
 2021-05-27 11:48:58 -07:00
Phillip Webb
91eb37dd84 Merge branch '2.4.x' 
Closes gh-26679
 2021-05-26 21:33:18 -07:00
Phillip Webb
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
izeye
38b9a833bd Fix "Allow optional directories without sub-directories" 
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e29edc which was incorrectly checking `isOptional`.

See gh-26677
 2021-05-26 21:19:05 -07:00
Phillip Webb
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
Phillip Webb
78ac7b3861 Polish 2021-05-26 16:19:26 -07:00
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
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