Commit Graph

13609 Commits

Author SHA1 Message Date
Stephane Nicoll 11d31edf0a Upgrade to Neo4j Java Driver 4.2.6
Closes gh-26808
2021-06-08 08:24:54 +02:00
Stephane Nicoll 88b9b88cd9 Upgrade to jOOQ 3.14.11
Closes gh-26807
2021-06-08 08:24:53 +02:00
Stephane Nicoll b755eacd86 Upgrade to Johnzon 1.2.13
Closes gh-26806
2021-06-08 08:24:51 +02:00
Stephane Nicoll 3d5caf0863 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26805
2021-06-08 08:24:50 +02:00
Stephane Nicoll a74fb0c2f0 Upgrade to Infinispan 12.1.4.Final
Closes gh-26804
2021-06-08 08:24:50 +02:00
Stephane Nicoll b4d0c3df6d Upgrade to Hibernate 5.4.32.Final
Closes gh-26803
2021-06-08 08:24:49 +02:00
Stephane Nicoll 7ea263548c Upgrade to Gson 2.8.7
Closes gh-26802
2021-06-08 08:24:48 +02:00
Stephane Nicoll e2a877ca07 Upgrade to Ehcache3 3.9.4
Closes gh-26801
2021-06-08 08:24:47 +02:00
Stephane Nicoll 5a18553b50 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26800
2021-06-08 08:24:45 +02:00
Stephane Nicoll b9d29130fb Upgrade to Couchbase Client 3.1.6
Closes gh-26799
2021-06-08 08:24:44 +02:00
Stephane Nicoll cd8a9d3705 Upgrade to AppEngine SDK 1.9.89
Closes gh-26798
2021-06-08 08:24:43 +02:00
Phillip Webb f5b93da90f Fix conversion failures when using DefaultResolver
Update `ConfigurationPropertySourcesPropertyResolver` so that calls to
the `DefaultResolver` do not attempt conversion.

Prior to this commit, the delegate resolver was accidentally called
with the target type which could cause a `ConversionFailedException`
to be thrown. We should have always used `Object.class` and let the
`convertValueIfNecessary` method perform conversion.

Fixes gh-26732
2021-06-07 22:07:22 -07:00
Phillip Webb be23a29651 Polish 2021-06-07 20:44:23 -07:00
Andy Wilkinson 87d35250a5 Test our Gradle plugin against 7.1-rc-1
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.

Closes gh-26793
2021-06-07 13:35:52 +01:00
Stephane Nicoll bac89a3919 Upgrade to Undertow 2.2.8.Final
Closes gh-26791
2021-06-07 07:57:54 +02:00
Stephane Nicoll d6f22f0802 Upgrade to jOOQ 3.14.11
Closes gh-26790
2021-06-07 07:57:53 +02:00
Stephane Nicoll 99169af57c Upgrade to Johnzon 1.2.13
Closes gh-26789
2021-06-07 07:57:52 +02:00
Stephane Nicoll fe249dd772 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26788
2021-06-07 07:57:51 +02:00
Stephane Nicoll 5be4a9ab50 Upgrade to Hibernate 5.4.32.Final
Closes gh-26787
2021-06-07 07:57:50 +02:00
Stephane Nicoll e496d2e321 Upgrade to Gson 2.8.7
Closes gh-26786
2021-06-07 07:57:49 +02:00
Stephane Nicoll 16ff9318b5 Upgrade to Ehcache3 3.9.4
Closes gh-26785
2021-06-07 07:57:48 +02:00
Stephane Nicoll 90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26784
2021-06-07 07:57:47 +02:00
Stephane Nicoll cfaab0904b Upgrade to AppEngine SDK 1.9.89
Closes gh-26783
2021-06-07 07:57:46 +02:00
Phillip Webb abd926788f Merge branch '2.4.x'
Closes gh-26782
2021-06-06 21:53:10 -07:00
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
2021-06-06 21:05:54 -07:00
Stephane Nicoll 1e680241ed Upgrade to Johnzon 1.2.13
Closes gh-26781
2021-06-06 20:25:54 +02:00
Stephane Nicoll 3a0794da4b Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26780
2021-06-06 20:25:52 +02:00
Stephane Nicoll 84a4693dcf Upgrade to Hibernate 5.4.32.Final
Closes gh-26779
2021-06-06 20:25:51 +02:00
Stephane Nicoll 790a8c1f47 Upgrade to Gson 2.8.7
Closes gh-26778
2021-06-06 20:25:50 +02:00
Stephane Nicoll 7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26777
2021-06-06 20:25:48 +02:00
Stephane Nicoll f3049e8e94 Upgrade to AppEngine SDK 1.9.89
Closes gh-26776
2021-06-06 20:25:47 +02:00
Stephane Nicoll 5391f028a7 Start building against Spring Kafka 2.7.2 snapshots
See gh-26765
2021-06-06 20:23:37 +02:00
Stephane Nicoll caacee5f1c Start building against Spring AMQP 2.3.8
See gh-26764
2021-06-06 20:23:11 +02:00
Stephane Nicoll c435f6337c Start building against Spring Framework 5.3.8 snapshots
See gh-26761
2021-06-06 20:22:45 +02:00
Stephane Nicoll 39f259554b Start building against Spring Integration 5.3.8 snapshots
See gh-26772
2021-06-05 18:24:22 +02:00
Stephane Nicoll 37625854b6 Start building against Spring Kafka 2.5.14 snapshots
See gh-26771
2021-06-05 18:23:57 +02:00
Stephane Nicoll 323d1e224d Start building against Spring AMQP 2.2.18 snapshots
See gh-26770
2021-06-05 18:23:27 +02:00
Stephane Nicoll de06bbb4dc Start building against Spring Kafka 2.6.9 snapshots
See gh-26763
2021-06-04 17:50:30 +02:00
Stephane Nicoll 4c31ccb576 Start building against Spring AMQP 2.3.8 snapshots
See gh-26762
2021-06-04 17:50:30 +02:00
Stephane Nicoll d2fe417bbb Start building against Spring Framework 5.3.8 snapshots
See gh-26760
2021-06-04 17:50:30 +02:00
Stephane Nicoll 5ac5038176 Merge branch '2.4.x' 2021-06-04 17:49:52 +02:00
Stephane Nicoll aea8597114 Merge branch '2.3.x' into 2.4.x 2021-06-04 17:49:40 +02:00
Stephane Nicoll 6490edc16d Polish 2021-06-04 17:46:42 +02:00
Stephane Nicoll aff1366731 Polish "Fix typo in 'Reacting to the Maven plugin' title"
See gh-26751
2021-06-04 09:51:48 +02:00
Abel Salgado Romero 9eea502c3e Fix typo in 'Reacting to the Maven plugin' title
See gh-26751
2021-06-04 09:46:47 +02:00
Phillip Webb e73062aefa Merge branch '2.4.x'
Closes gh-26755
2021-06-03 22:24:17 -07:00
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
2021-06-03 22:24:01 -07:00
Phillip Webb 3c7a0d3bf2 Merge branch '2.4.x'
Closes gh-26754
2021-06-03 22:23:27 -07:00
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
2021-06-03 22:22:44 -07:00
Stephane Nicoll 75f31f6bc4 Merge branch '2.4.x'
Closes gh-26748
2021-06-03 09:27:01 +02:00
Stephane Nicoll ad99aa2f4a Merge branch '2.3.x' into 2.4.x
Closes gh-26747
2021-06-03 09:26:38 +02:00
dreis2211 f470151535 Remove reference to surefirebooter JAR
See gh-26737
2021-06-03 09:24:56 +02:00
Phillip Webb 02494d63d2 Merge branch '2.4.x'
Closes gh-26744
2021-06-02 17:26:05 -07:00
Phillip Webb 1cda557d03 Merge branch '2.3.x' into 2.4.x
Closes gh-26743
2021-06-02 17:25:51 -07:00
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
2021-06-02 17:24:05 -07:00
Madhura Bhave 554cf9d7c7 Merge branch '2.4.x' into main
Closes gh-26741
2021-06-02 12:24:36 -07:00
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
2021-06-02 12:20:02 -07:00
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
2021-06-02 12:18:57 -07:00
Scott Frederick 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
Madhura Bhave e2cba40db0 Merge branch '2.4.x' into main
Closes gh-26739
2021-06-02 12:02:53 -07:00
Madhura Bhave b102fdd392 Merge branch '2.3.x' into 2.4.x
Closes gh-26738
2021-06-02 12:02:11 -07:00
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
2021-06-02 12:00:25 -07:00
Stephane Nicoll e9ed92a305 Polish 2021-06-02 14:14:04 +02:00
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 3f858ed8a4
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 01dd68e29e 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