Commit Graph

31430 Commits (434d4a6f76388ce42c88c6ba9f2e40656c78a242)
 

Author SHA1 Message Date
Stephane Nicoll 6490edc16d Polish 4 years ago
Phillip Webb 0da0d2d469 Prevent nested profile-specific resolution
Update the `ConfigDataEnvironment` so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is no longer called when
resolving imports declared in a profile-specific file.

Fixes gh-26753
4 years ago
Phillip Webb d1b256a169 Prevent indirect standard profile-specific imports
Update `StandardConfigDataLocationResolver` so that profile-specific
imports can only be used when there is no parent import.

Prior to this commit, given the following application.properties file:

	spring.profiles.active=p1,p2
	spring.config.import=other.properties

We would attempt to import `other.properties`, `other-p1.properties`
and `other-p2.properties`. This seems quite confusing and when we really
only need to support profile-specific properties for the initial root
set of locations.

Fixes gh-26752
4 years ago
Stephane Nicoll ad99aa2f4a Merge branch '2.3.x' into 2.4.x
Closes gh-26747
4 years ago
Stephane Nicoll 0d904666a7 Merge pull request #26737 from dreis2211
* pr/26737:
  Remove reference to surefirebooter JAR

Closes gh-26737
4 years ago
dreis2211 f470151535 Remove reference to surefirebooter JAR
See gh-26737
4 years ago
Phillip Webb 1cda557d03 Merge branch '2.3.x' into 2.4.x
Closes gh-26743
4 years ago
Phillip Webb 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
4 years ago
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
4 years ago
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
4 years ago
Madhura Bhave b102fdd392 Merge branch '2.3.x' into 2.4.x
Closes gh-26738
4 years ago
Madhura Bhave 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
4 years ago
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x
Closes gh-26734
4 years ago
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis
Closes gh-26733
4 years ago
Stephane Nicoll c8959180fe Merge branch '2.3.x' into 2.4.x
Closes gh-26724
4 years ago
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
4 years ago
Stephane Nicoll 897fd63faf Merge branch '2.3.x' into 2.4.x
Closes gh-26716
4 years ago
Stephane Nicoll 647451087f Merge pull request #26713 from weixsun
* pr/26713:
  Remove redudant space

Closes gh-26713
4 years ago
weixsun 4b3bf75a4c Remove redudant space
See gh-26713
4 years ago
Phillip Webb 49d3ecc2b2 Merge branch '2.3.x' into 2.4.x
Closes gh-26702
4 years ago
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
4 years ago
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x
Closes gh-26700
4 years ago
Madhura Bhave f55e4c08f5 Add note about Kubernetes termination grace period
Closes gh-26469
4 years ago
Stephane Nicoll 7f5adb7e9d Merge branch '2.3.x' into 2.4.x
Closes gh-26696
4 years ago
Stephane Nicoll 454d72d9b2 Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Stephane Nicoll 67fe60ba8a Add missing static on JerseyInfrastructureConfiguration
Closes gh-26695
4 years ago
Phillip Webb 49c30854af Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
Rename the now public constant for consistency with the JavaPlugin.

See gh-26686
4 years ago
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
4 years ago
Phillip Webb 8661f74f2e Revert "Test optional directories without sub-directories"
This reverts commit 3f858ed8a4
since the test already existed.
4 years ago
Phillip Webb 35f1194651 Merge pull request #26677 from izeye
* pr/26677:
  Test optional directories without sub-directories
  Fix "Allow optional directories without sub-directories"

Closes gh-26677
4 years ago
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
4 years ago
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
4 years ago
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
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>
4 years ago
Phillip Webb 14f578ed80 Merge branch '2.3.x' into 2.4.x
Closes gh-26670
4 years ago
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
4 years ago
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
4 years ago
Stephane Nicoll fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation"
See gh-26421
4 years ago
Lovekesh Garg 944ba34556 Clarify Kotlin version requirements in documentation
See gh-26421
4 years ago
Stephane Nicoll 9ff372c915 Merge branch '2.3.x' into 2.4.x
Closes gh-26653
4 years ago
Stephane Nicoll b5ebf836e3 Document spring.profiles.default
Closes gh-26592
4 years ago
Madhura Bhave 4955c80da5 Remove test that is no long necessary 4 years ago
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
4 years ago
Stephane Nicoll 942691753d Merge branch '2.3.x' into 2.4.x
Closes gh-26645
4 years ago
Stephane Nicoll 9bdb205dba Merge pull request #26632 from dreis2211
* pr/26632:
  Remove workaround for SUREFIRE-1679

Closes gh-26632
4 years ago
dreis2211 01ee6190a2 Remove workaround for SUREFIRE-1679
See gh-26632
4 years ago
Madhura Bhave b25497c45c Set LATEST_GA flag to false 4 years ago
Phillip Webb 6bf069d9e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26622
4 years ago
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
4 years ago
Scott Frederick 8b24a80fa8 Merge branch '2.3.x' into 2.4.x 4 years ago