Commit Graph

31760 Commits (176496bd185d252c42ea021bb4683a3279d0a54a)
 

Author SHA1 Message Date
Andy Wilkinson d1e1796f76 Consider overridden getRootUri() when getting root URI
Fixes gh-26812
3 years ago
Phillip Webb d5264664e6 Merge branch '2.3.x' into 2.4.x
Closes gh-26822
3 years ago
Phillip Webb 1f6983c4c9 Make CompositeHealth.getDetails() public
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.

Fixes gh-26797
3 years ago
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 3 years ago
Phillip Webb 9e1c78da99 Update copyright year of changed files 3 years ago
Stephane Nicoll bac89a3919 Upgrade to Undertow 2.2.8.Final
Closes gh-26791
4 years ago
Stephane Nicoll d6f22f0802 Upgrade to jOOQ 3.14.11
Closes gh-26790
4 years ago
Stephane Nicoll 99169af57c Upgrade to Johnzon 1.2.13
Closes gh-26789
4 years ago
Stephane Nicoll fe249dd772 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26788
4 years ago
Stephane Nicoll 5be4a9ab50 Upgrade to Hibernate 5.4.32.Final
Closes gh-26787
4 years ago
Stephane Nicoll e496d2e321 Upgrade to Gson 2.8.7
Closes gh-26786
4 years ago
Stephane Nicoll 16ff9318b5 Upgrade to Ehcache3 3.9.4
Closes gh-26785
4 years ago
Stephane Nicoll 90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26784
4 years ago
Stephane Nicoll cfaab0904b Upgrade to AppEngine SDK 1.9.89
Closes gh-26783
4 years ago
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config'
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
4 years ago
Stephane Nicoll c0cbef9aaa Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 1e680241ed Upgrade to Johnzon 1.2.13
Closes gh-26781
4 years ago
Stephane Nicoll 3a0794da4b Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26780
4 years ago
Stephane Nicoll 84a4693dcf Upgrade to Hibernate 5.4.32.Final
Closes gh-26779
4 years ago
Stephane Nicoll 790a8c1f47 Upgrade to Gson 2.8.7
Closes gh-26778
4 years ago
Stephane Nicoll 7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26777
4 years ago
Stephane Nicoll f3049e8e94 Upgrade to AppEngine SDK 1.9.89
Closes gh-26776
4 years ago
Stephane Nicoll d1652c2749 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 39f259554b Start building against Spring Integration 5.3.8 snapshots
See gh-26772
4 years ago
Stephane Nicoll 37625854b6 Start building against Spring Kafka 2.5.14 snapshots
See gh-26771
4 years ago
Stephane Nicoll 323d1e224d Start building against Spring AMQP 2.2.18 snapshots
See gh-26770
4 years ago
Stephane Nicoll de06bbb4dc Start building against Spring Kafka 2.6.9 snapshots
See gh-26763
4 years ago
Stephane Nicoll 4c31ccb576 Start building against Spring AMQP 2.3.8 snapshots
See gh-26762
4 years ago
Stephane Nicoll d2fe417bbb Start building against Spring Framework 5.3.8 snapshots
See gh-26760
4 years ago
Stephane Nicoll aea8597114 Merge branch '2.3.x' into 2.4.x 4 years ago
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