Commit Graph

13900 Commits

Author SHA1 Message Date
Andy Wilkinson d4200a7c56 Upgrade to Spring Integration 5.3.8.RELEASE
Closes gh-26772
2021-06-09 21:20:14 +01:00
Andy Wilkinson 03e1b255ea Upgrade to Spring AMQP 2.2.18.RELEASE
Closes gh-26770
2021-06-09 21:18:37 +01:00
Andy Wilkinson 9fb7cf49e4 Upgrade to Spring Kafka 2.7.2
Closes gh-26765
2021-06-09 19:43:37 +01:00
Andy Wilkinson 4a11c6a135 Upgrade to Spring Kafka 2.6.9
Closes gh-26763
2021-06-09 19:29:23 +01:00
Andy Wilkinson 53068a2489 Upgrade to Spring Kafka 2.5.14.RELEASE
Closes gh-26771
2021-06-09 19:15:08 +01:00
Andy Wilkinson 46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning
See gh-26682
2021-06-09 19:11:20 +01:00
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
2021-06-09 18:00:45 +01:00
Stephane Nicoll 6a7a11ba59 Upgrade to RSocket 1.1.1
Closes gh-26836
2021-06-09 15:24:13 +02:00
Stephane Nicoll 66ae421f74 Upgrade to Neo4j Java Driver 4.1.3
Closes gh-26835
2021-06-09 15:24:12 +02:00
Stephane Nicoll f9a0b0308d Upgrade to Jetty 9.4.42.v20210604
Closes gh-26834
2021-06-09 15:24:11 +02:00
Stephane Nicoll 6cdbed7dc3 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26833
2021-06-09 15:24:09 +02:00
Stephane Nicoll 872ec0bf00 Upgrade to RSocket 1.0.5
Closes gh-26832
2021-06-09 15:00:55 +02:00
Stephane Nicoll f73e7bcc0c Upgrade to Neo4j OGM 3.2.24
Closes gh-26831
2021-06-09 15:00:54 +02:00
Stephane Nicoll 1ef0068b38 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26830
2021-06-09 15:00:53 +02:00
Stephane Nicoll 0563955324 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26829
2021-06-09 15:00:51 +02:00
Stephane Nicoll 8590eccac4 Polish
See gh-26682
2021-06-09 14:47:54 +02:00
Stephane Nicoll d23b07a166 Upgrade to Spring Framework 5.3.8
Closes gh-26761
2021-06-09 12:21:45 +02:00
Stephane Nicoll e9592229fc Upgrade to Spring Framework 5.3.8
Closes gh-26760
2021-06-09 12:01:55 +02:00
Andy Wilkinson 03f8a46c80 Test our Gradle plugin against 7.1-rc-2
Closes gh-26825
2021-06-09 09:41:25 +01:00
Andy Wilkinson c5728c9560 Merge branch '2.4.x'
Closes gh-26827
2021-06-09 09:13:21 +01:00
Andy Wilkinson 303edac6bb Merge branch '2.3.x' into 2.4.x
Closes gh-26826
2021-06-09 09:13:06 +01:00
Andy Wilkinson d1e1796f76 Consider overridden getRootUri() when getting root URI
Fixes gh-26812
2021-06-09 09:12:37 +01:00
Phillip Webb 850088de32 Merge branch '2.4.x'
Closes gh-26823
2021-06-08 18:17:33 -07:00
Phillip Webb d5264664e6 Merge branch '2.3.x' into 2.4.x
Closes gh-26822
2021-06-08 18:17:18 -07:00
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
2021-06-08 18:17:09 -07:00
Phillip Webb f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb 9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Phillip Webb 703eaa71f4 Remove main class configuration fallback
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.

Closes gh-26794
2021-06-08 18:00:50 -07:00
Phillip Webb b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
2021-06-08 15:44:01 -07:00
Phillip Webb f8c3e0e5aa Respect custom username/password properties
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
2021-06-08 14:58:39 -07:00
Phillip Webb d19b2681ab Rework build-image-customization table in docs
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.

Closes gh-25739
2021-06-08 14:46:53 -07:00
Phillip Webb 6ab2df5698 Order DataSourceScriptDatabaseInitializer last
Change the order of `DataSourceScriptDatabaseInitializerDetector` so
that it always runs last. This update allows script initialization to
be combined with a high-level migration tool such as Flyway.

Closes gh-26692
2021-06-08 14:10:59 -07:00
Phillip Webb dafd511284 Support DatabaseInitializerDetector ordering
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.

Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.

See gh-26692
2021-06-08 14:10:55 -07:00
Scott Frederick fba5ffc626 Fix FilePermissionsTests on Windows
See gh-26658
2021-06-08 15:58:03 -05:00
Andy Wilkinson 8df6392ca5 Polish
The use of the file's absolute path caused test failures on Windows.

See gh-26682
2021-06-08 18:28:09 +01:00
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization
Closes gh-26682
2021-06-08 15:13:55 +01:00
Andy Wilkinson 1a0e008a8c Prevent Netty tcNative from loading classes with wrong class loader
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.

It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.

Closes gh-26749
2021-06-08 11:20:02 +01:00
Stephane Nicoll faeda6f917 Polish 2021-06-08 10:32:50 +02:00
Stephane Nicoll 4c71e8124d Upgrade to Undertow 2.2.8.Final
Closes gh-26809
2021-06-08 08:24:55 +02:00
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
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
Madhura Bhave 4955c80da5 Remove test that is no long necessary 2021-05-24 21:10:50 -07:00
Madhura Bhave ae24d66af7 Merge branch '2.4.x' into main
Closes gh-26649
2021-05-24 16:42:32 -07:00
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
2021-05-24 16:37:31 -07:00
Stephane Nicoll cb7c3774a7 Merge branch '2.4.x'
Closes gh-26646
2021-05-24 11:39:57 +02:00
Stephane Nicoll 942691753d Merge branch '2.3.x' into 2.4.x
Closes gh-26645
2021-05-24 11:39:38 +02:00
dreis2211 01ee6190a2 Remove workaround for SUREFIRE-1679
See gh-26632
2021-05-24 11:15:58 +02:00
Oliver B. Fischer 11af8a816c Add link to Maven Git Commit Id Plugin
See gh-26635
2021-05-23 16:37:44 +02:00
Andy Wilkinson 7a7050879c Avoid eager initialization when configuring Data repository metrics
Fixes gh-26630
2021-05-21 13:54:35 +01:00
Phillip Webb 15042e2710 Merge branch '2.4.x'
Closes gh-26623
2021-05-20 14:43:11 -07:00
Phillip Webb 6bf069d9e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26622
2021-05-20 14:42:54 -07:00
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
2021-05-20 14:16:23 -07:00
Phillip Webb 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
Phillip Webb f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
2021-05-19 21:19:24 -07:00
Phillip Webb 1702c9fc3d Rework title anchors for gradle docs
Closes gh-26618
2021-05-19 21:19:24 -07:00
Phillip Webb f692b0e937 Rework title anchors for actuator docs
Closes gh-26615
2021-05-19 21:19:24 -07:00
Phillip Webb 2dbf39c738 Polish asciidoc formatting 2021-05-19 21:19:24 -07:00
Madhura Bhave a28072bab4 Merge branch '2.4.x' into main
Closes gh-26614
2021-05-19 16:17:34 -07:00
Madhura Bhave 27fee5fa95 Configure filter to process preflight requests for webflux actuator endpoints
Fixes gh-24541
2021-05-19 16:16:16 -07:00
Madhura Bhave 99ed291184 Merge branch '2.4.x' into main 2021-05-19 15:27:48 -07:00
Madhura Bhave 29d1e22b91 Fix rawtypes 2021-05-19 15:26:53 -07:00
Madhura Bhave 3ef9b7e634 Merge branch '2.4.x' into main
Closes gh-26612
2021-05-19 15:01:45 -07:00
Madhura Bhave 743ac4c394 Merge branch '2.3.x' into 2.4.x
Closes gh-26611
2021-05-19 14:55:53 -07:00
Madhura Bhave b26e842050 Configure CORS in default security configuration for MVC
Fixes gh-11987
2021-05-19 14:40:57 -07:00
Madhura Bhave 110c36e607 Merge branch '2.4.x' into main
Closes gh-26610
2021-05-19 13:21:39 -07:00
Madhura Bhave 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
Phillip Webb 8a3f835ffe Set Asciidoctor attribute-missing to warn
Closes gh-26590
2021-05-19 11:53:46 -07:00
Andy Wilkinson d39bb997f2 Upgrade to Spring Session 2021.0.0
Closes gh-26389
2021-05-19 19:05:49 +01:00
Andy Wilkinson 879f362c29 Merge branch '2.4.x'
Closes gh-26608
2021-05-19 19:04:45 +01:00
Andy Wilkinson 64e76badc2 Merge branch '2.3.x' into 2.4.x
Closes gh-26607
2021-05-19 19:03:12 +01:00
Andy Wilkinson b6e860b2d4 Prevent Jetty from delaying shutdown beyond grace period
Fixes gh-22689
2021-05-19 19:02:24 +01:00
Andy Wilkinson 66d087877d Merge branch '2.4.x'
Closes gh-26606
2021-05-19 16:46:27 +01:00
Andy Wilkinson 6874c42d3c Merge branch '2.3.x' into 2.4.x
Closes gh-26605
2021-05-19 16:46:09 +01:00
weixsun d2bdcddb5f Fix outdated defaults for Info endpoint
See gh-26591
2021-05-19 17:42:13 +02:00
Andy Wilkinson 2a89b11df3 Exclude SmartInitializingSingletones from lazy initialization
Fixes gh-26470
2021-05-19 16:26:48 +01:00
Stephane Nicoll b971ac8550 Upgrade to Netty 4.1.65.Final
Closes gh-26604
2021-05-19 17:24:04 +02:00
Stephane Nicoll 4caab742ca Upgrade to Jetty 9.4.41.v20210516
Closes gh-26603
2021-05-19 17:24:01 +02:00
Stephane Nicoll a5f9e3912f Upgrade to Spring WS 3.1.1
Closes gh-26390
2021-05-19 17:19:57 +02:00
Stephane Nicoll 6a45026097 Upgrade to Netty 4.1.65.Final
Closes gh-26602
2021-05-19 16:12:50 +02:00
Stephane Nicoll 8904649fcf Upgrade to Jetty 9.4.41.v20210516
Closes gh-26601
2021-05-19 16:12:49 +02:00
Stephane Nicoll 5edb788241 Upgrade to Netty 4.1.65.Final
Closes gh-26600
2021-05-19 15:51:26 +02:00
Stephane Nicoll 0d1b3fb078 Upgrade to Neo4j OGM 3.2.23
Closes gh-26599
2021-05-19 15:51:25 +02:00
Stephane Nicoll 22ec27dcd3 Upgrade to Json-smart 2.3.1
Closes gh-26598
2021-05-19 15:51:23 +02:00
Stephane Nicoll 32381ad61c Upgrade to Jetty 9.4.41.v20210516
Closes gh-26597
2021-05-19 15:51:22 +02:00
Stephane Nicoll e71b4aac7b Upgrade to Spring Batch 4.3.3
Closes gh-26392
2021-05-19 15:48:38 +02:00
Stephane Nicoll e5ab626638 Upgrade to Spring Batch 4.3.3
Closes gh-26391
2021-05-19 15:47:47 +02:00
Stephane Nicoll 7769e77775 Upgrade to Spring Batch 4.2.7
Closes gh-26426
2021-05-19 15:47:06 +02:00
Andy Wilkinson b9abcba778 Merge branch '2.4.x'
Closes gh-26596
2021-05-19 13:38:20 +01:00
Andy Wilkinson ff45e4c418 Merge branch '2.3.x' into 2.4.x
Closes gh-26595
2021-05-19 13:15:18 +01:00
Andy Wilkinson 936c31c7a7 Prevent metrics failures from adversely affecting web responses
Fixes gh-24151
2021-05-19 13:14:52 +01:00
Andy Wilkinson 55b507bccf Upgrade to Spring Integration 5.5.0
Closes gh-26388
2021-05-19 08:34:34 +01:00
Andy Wilkinson 04e3165c15 Upgrade to Spring Integration 5.4.7
Closes gh-26587
2021-05-19 08:33:14 +01:00
Phillip Webb 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
Phillip Webb 86a5c90d20 Simplify anchor-rewrite.properties 2021-05-18 21:19:09 -07:00
Andy Wilkinson abd809366b Upgrade to Spring Asciidoctor Extensions 0.6.0
Closes gh-26306
2021-05-18 21:44:24 +01:00
Phillip Webb e08d4f1fe6 Move "Use Jedis Instead of Lettuce" How-to
See gh-26262
2021-05-18 11:53:26 -07:00
Phillip Webb 499a29c415 Move "Testcontainers" How-to
See gh-26262
2021-05-18 11:49:03 -07:00
Phillip Webb 72d50ed2f8 Move "Testing With Spring Security" How-to
See gh-26262
2021-05-18 11:49:02 -07:00
Phillip Webb 5f7e3d3952 Polish 2021-05-18 11:39:20 -07:00
Andy Wilkinson 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
dreis2211 5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release
See gh-26586
2021-05-18 09:59:29 +01:00
Andy Wilkinson 2edd06fb6e Start building against Spring Integration 5.4.7 snapshots
See gh-26587
2021-05-18 09:34:33 +01:00
Andy Wilkinson d8b0aadf3b Upgrade to Spring Security 5.5.0
Closes gh-26387
2021-05-18 09:28:09 +01:00
Andy Wilkinson 33a5c31fe3 Avoid duplicate crypto classes when depending on spring-security-core
See gh-26387
2021-05-18 09:27:48 +01:00
Stephane Nicoll 9dd9a2fa33 Upgrade to Spring AMQP 2.3.7
Closes gh-26384
2021-05-18 08:34:35 +02:00
Stephane Nicoll 56ba14ad2d Upgrade to Spring Kafka 2.7.1
Closes gh-26386
2021-05-18 08:34:01 +02:00
Stephane Nicoll 83ad93844b Upgrade to Spring AMQP 2.3.7
Closes gh-26383
2021-05-18 08:33:05 +02:00
Stephane Nicoll 2205024e9d Upgrade to Spring Kafka 2.6.8
Closes gh-26385
2021-05-18 08:32:38 +02:00
Stephane Nicoll 678916fb3d Upgrade to Spring Kafka 2.5.13
Closes gh-26429
2021-05-18 08:29:35 +02:00
Phillip Webb 5c28f8f6a8 Merge branch '2.4.x'
Closes gh-26585
2021-05-17 21:35:04 -07:00
Phillip Webb 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
Phillip Webb 0c8d819150 Merge branch '2.4.x'
Closes gh-26584
2021-05-17 17:10:10 -07:00
Phillip Webb 0699fdcc8a Polish 'Allow remote devtools access with Spring Security'
See gh-25868
2021-05-17 16:54:27 -07:00
Hatef Palizgar 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
Phillip Webb ba0fe1edbd Merge branch '2.4.x'
Closes gh-26581
Closes gh-26582
Closes gh-26583
2021-05-17 16:28:52 -07:00
Madhura Bhave 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
Phillip Webb 2bbad94910 Restore hasProgrammaticallySetProfiles code
Restore code lost on merge.

See gh-26580
2021-05-17 15:34:45 -07:00
Phillip Webb 634d27679a Merge branch '2.4.x'
Closes gh-26580
2021-05-17 13:30:33 -07:00
Madhura Bhave 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
Andy Wilkinson 36b6235e86 Upgrade to Spring AMQP 2.2.17.RELEASE
Closes gh-26428
2021-05-17 18:02:53 +01:00
Stephane Nicoll e9174c1e3d Update copyright year of changed files
See gh-26478
2021-05-17 16:08:20 +02:00
weixsun 935199b6ba Polish AbstractServletWebServerFactory
See gh-26478
2021-05-17 16:08:19 +02:00
Andy Wilkinson d41fa13463 Merge branch '2.4.x'
Closes gh-26575
2021-05-17 14:39:35 +01:00
Andy Wilkinson 4eab9476a6 Polish "Detect use of spring.profiles.include as a YAML list"
See gh-26205
2021-05-17 14:13:29 +01:00
ChangYong 80ad6385f1 Detect use of spring.profiles.include as a YAML list
See gh-26205
2021-05-17 14:04:51 +01:00
Andy Wilkinson 4517f6057e Merge branch '2.4.x'
Closes gh-26573
2021-05-17 13:50:13 +01:00
Andy Wilkinson 1d5abf5af7 Merge branch '2.3.x' into 2.4.x
Closes gh-26572
2021-05-17 13:49:25 +01:00
Andy Wilkinson eecb7dd101 Remove stale jboss-transaction-spi dependencies
Closes gh-26569
2021-05-17 13:49:16 +01:00
Andy Wilkinson 513dd82bed Upgrade to Kotlin Coroutines 1.5.0
Closes gh-26568
2021-05-17 13:39:59 +01:00
Andy Wilkinson af506685be Upgrade to Thymeleaf Layout Dialect 2.5.3
Closes gh-26566
2021-05-17 13:39:58 +01:00
Andy Wilkinson 17506c7e13 Upgrade to Solr 8.8.2
Closes gh-26565
2021-05-17 13:39:58 +01:00
Andy Wilkinson 6d786ecfe1 Upgrade to SAAJ Impl 1.5.3
Closes gh-26564
2021-05-17 13:39:58 +01:00
Andy Wilkinson d3e8d1533f Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26563
2021-05-17 13:39:58 +01:00
Andy Wilkinson b62a011643 Upgrade to Postgresql 42.2.20
Closes gh-26562
2021-05-17 13:39:58 +01:00
Andy Wilkinson f6d89fd940 Upgrade to Pooled JMS 1.2.2
Closes gh-26561
2021-05-17 13:39:58 +01:00
Andy Wilkinson ef89622a10 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26560
2021-05-17 13:39:57 +01:00
Andy Wilkinson 2d39269368 Upgrade to Netty 4.1.64.Final
Closes gh-26559
2021-05-17 13:39:57 +01:00
Andy Wilkinson c9814abe16 Upgrade to Neo4j Java Driver 4.2.5
Closes gh-26558
2021-05-17 13:39:57 +01:00
Andy Wilkinson 0e16c58ed6 Upgrade to MySQL 8.0.25
Closes gh-26557
2021-05-17 13:39:57 +01:00
Andy Wilkinson 0575f2f60a Upgrade to MariaDB 2.7.3
Closes gh-26556
2021-05-17 13:39:57 +01:00
Andy Wilkinson 27d599b9e2 Upgrade to Liquibase 4.3.5
Closes gh-26555
2021-05-17 13:39:57 +01:00
Andy Wilkinson 23c957a563 Upgrade to Lettuce 6.1.2.RELEASE
Closes gh-26554
2021-05-17 13:39:56 +01:00
Andy Wilkinson 4bbcc3edda Upgrade to Kafka 2.7.1
Closes gh-26552
2021-05-17 13:39:56 +01:00
Andy Wilkinson 4b132628a7 Upgrade to JUnit Jupiter 5.7.2
Closes gh-26551
2021-05-17 13:39:56 +01:00
Andy Wilkinson f1e4cc1c28 Upgrade to Json-smart 2.4.7
Closes gh-26550
2021-05-17 13:39:56 +01:00
Andy Wilkinson 7729755cd6 Upgrade to jOOQ 3.14.9
Closes gh-26549
2021-05-17 13:39:56 +01:00
Andy Wilkinson 875a31a70d Upgrade to Johnzon 1.2.11
Closes gh-26548
2021-05-17 13:39:56 +01:00
Andy Wilkinson 6f72007d77 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26547
2021-05-17 13:39:55 +01:00
Andy Wilkinson ed316c43d5 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26546
2021-05-17 13:39:55 +01:00
Andy Wilkinson 416511bb98 Upgrade to Jedis 3.6.0
Closes gh-26545
2021-05-17 13:39:55 +01:00
Andy Wilkinson 0322a3931f Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26544
2021-05-17 13:39:55 +01:00
Andy Wilkinson 2f4fbfdcf8 Upgrade to Janino 3.1.4
Closes gh-26543
2021-05-17 13:39:55 +01:00
Andy Wilkinson b7c8badfe8 Upgrade to Infinispan 12.1.3.Final
Closes gh-26542
2021-05-17 13:39:55 +01:00
Andy Wilkinson 23e02cada1 Upgrade to HttpCore5 5.1.1
Closes gh-26541
2021-05-17 13:39:55 +01:00
Andy Wilkinson a78e50bcc3 Upgrade to HttpClient5 5.0.4
Closes gh-26540
2021-05-17 13:39:54 +01:00
Andy Wilkinson 544abfd9ae Upgrade to Hibernate 5.4.31.Final
Closes gh-26539
2021-05-17 13:39:54 +01:00
Andy Wilkinson 93b385421d Upgrade to Hazelcast 4.1.3
Closes gh-26538
2021-05-17 13:39:54 +01:00
Andy Wilkinson 466a9e3421 Upgrade to Groovy 3.0.8
Closes gh-26537
2021-05-17 13:39:54 +01:00
Andy Wilkinson 53e178e1c4 Upgrade to Glassfish JAXB 2.3.4
Closes gh-26536
2021-05-17 13:39:54 +01:00
Andy Wilkinson 2a28f34717 Upgrade to Elasticsearch 7.12.1
Closes gh-26535
2021-05-17 13:39:54 +01:00
Andy Wilkinson 25f529a5f2 Upgrade to Ehcache3 3.9.3
Closes gh-26534
2021-05-17 13:39:54 +01:00
Andy Wilkinson 0bc37852a3 Upgrade to Ehcache 2.10.9.2
Closes gh-26533
2021-05-17 13:39:53 +01:00
Andy Wilkinson 3099866cf4 Upgrade to Dropwizard Metrics 4.1.21
Closes gh-26532
2021-05-17 13:39:53 +01:00
Andy Wilkinson 24d252e322 Upgrade to Couchbase Client 3.1.5
Closes gh-26531
2021-05-17 13:39:53 +01:00
Andy Wilkinson 78f7044097 Upgrade to Cassandra Driver 4.11.1
Closes gh-26530
2021-05-17 13:39:53 +01:00
Andy Wilkinson a27b34680e Upgrade to Caffeine 2.9.1
Closes gh-26529
2021-05-17 13:39:53 +01:00
Andy Wilkinson 9a981f0bc5 Upgrade to ActiveMQ 5.16.2
Closes gh-26528
2021-05-17 13:39:53 +01:00
Andy Wilkinson 7526ea860d Update upgrade policy following release of RC1
Closes gh-26527
2021-05-17 13:39:53 +01:00
Stephane Nicoll 582d7b46fd Merge branch '2.4.x'
Closes gh-26571
2021-05-17 14:36:44 +02:00
Stephane Nicoll ef093bc9c6 Merge branch '2.3.x' into 2.4.x
Closes gh-26570
2021-05-17 14:24:03 +02:00
Stephane Nicoll 306b6f6999 Configure SessionCookieConfig in MockServletWebServer
Closes gh-26479
2021-05-17 14:05:45 +02:00
Andy Wilkinson 4bf5ff8a68 Merge branch '2.4.x'
Closes gh-26526
2021-05-17 11:52:53 +01:00
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x
Closes gh-26525
2021-05-17 11:48:34 +01:00
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies"
See gh-25944
2021-05-17 11:44:23 +01:00
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
2021-05-17 11:29:36 +01:00
Andy Wilkinson e317079446 Merge branch '2.4.x'
Closes gh-26524
2021-05-17 11:27:57 +01:00
Andy Wilkinson 49d362fd7f Merge branch '2.3.x' into 2.4.x
Closes gh-26523
2021-05-17 11:27:46 +01:00
weixsun 7f445630e4 Remove unnecessary semicolon
See gh-26446
2021-05-17 11:26:57 +01:00
Andy Wilkinson 05a64ecb2c Merge branch '2.4.x'
Closes gh-26522
2021-05-17 11:24:29 +01:00
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x
Closes gh-26521
2021-05-17 11:22:48 +01:00
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance"
See gh-26227
2021-05-17 11:07:42 +01:00
Carlos Rafael de Oliveira Carneiro a6fa8addb9 Improve documentation of TestRestTemplate's fault tolerance
See gh-26227
2021-05-17 11:07:42 +01:00
Stephane Nicoll d3c817b7ba Polish "Remove unnecessary throws declaration in tests"
See gh-26441
2021-05-17 09:36:53 +02:00
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests
See gh-26441
2021-05-17 09:31:51 +02:00
Stephane Nicoll 87d986f9b8 Upgrade to Thymeleaf Layout Dialect 2.5.3
Closes gh-26518
2021-05-17 08:51:44 +02:00
Stephane Nicoll 7152c21641 Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26517
2021-05-17 08:51:43 +02:00
Stephane Nicoll 6004835fd2 Upgrade to Postgresql 42.2.20
Closes gh-26516
2021-05-17 08:51:42 +02:00
Stephane Nicoll f84f9f347d Upgrade to Pooled JMS 1.2.2
Closes gh-26515
2021-05-17 08:51:40 +02:00
Stephane Nicoll 5efc9d5aa6 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26514
2021-05-17 08:51:39 +02:00
Stephane Nicoll 67b9aca437 Upgrade to Neo4j Java Driver 4.1.2
Closes gh-26513
2021-05-17 08:51:38 +02:00
Stephane Nicoll 35310b8f9b Upgrade to MySQL 8.0.25
Closes gh-26512
2021-05-17 08:51:37 +02:00
Stephane Nicoll d4c502e60c Upgrade to MariaDB 2.7.3
Closes gh-26511
2021-05-17 08:51:36 +02:00
Stephane Nicoll 0e1d107b82 Upgrade to Lettuce 6.0.5.RELEASE
Closes gh-26510
2021-05-17 08:51:35 +02:00
Stephane Nicoll f3f6294fe2 Upgrade to JUnit Jupiter 5.7.2
Closes gh-26509
2021-05-17 08:51:34 +02:00
Stephane Nicoll dc58916603 Upgrade to Json-smart 2.3.1
Closes gh-26508
2021-05-17 08:51:33 +02:00
Stephane Nicoll 4da1e1351a Upgrade to jOOQ 3.14.9
Closes gh-26507
2021-05-17 08:51:32 +02:00
Stephane Nicoll a4e71fb49f Upgrade to Johnzon 1.2.11
Closes gh-26506
2021-05-17 08:51:31 +02:00
Stephane Nicoll 496e3f1df9 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26505
2021-05-17 08:51:30 +02:00
Stephane Nicoll 2718cfadd8 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26504
2021-05-17 08:51:29 +02:00
Stephane Nicoll 65b18acd81 Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26503
2021-05-17 08:51:28 +02:00
Stephane Nicoll ef5476c764 Upgrade to Janino 3.1.4
Closes gh-26502
2021-05-17 08:51:27 +02:00
Stephane Nicoll 3cc04cf4a5 Upgrade to Infinispan 11.0.11.Final
Closes gh-26501
2021-05-17 08:51:26 +02:00
Stephane Nicoll 03a92fc632 Upgrade to Hibernate 5.4.31.Final
Closes gh-26500
2021-05-17 08:51:25 +02:00
Stephane Nicoll e7ac4f12f1 Upgrade to Ehcache3 3.9.3
Closes gh-26499
2021-05-17 08:51:24 +02:00
Stephane Nicoll 87fce0b480 Upgrade to Ehcache 2.10.9.2
Closes gh-26498
2021-05-17 08:51:23 +02:00
Stephane Nicoll 3b691a2bb1 Upgrade to Dropwizard Metrics 4.1.21
Closes gh-26497
2021-05-17 08:51:22 +02:00
Stephane Nicoll 316ad17856 Upgrade to ActiveMQ 5.16.2
Closes gh-26496
2021-05-17 08:51:21 +02:00
Stephane Nicoll 89be56d63c Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26494
2021-05-17 07:46:34 +02:00
Stephane Nicoll 69ce28617c Upgrade to Postgresql 42.2.20
Closes gh-26493
2021-05-17 07:46:33 +02:00
Stephane Nicoll 626c21e7a1 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26492
2021-05-17 07:46:32 +02:00
Stephane Nicoll fc1d0af5d2 Upgrade to Neo4j OGM 3.2.22
Closes gh-26491
2021-05-17 07:46:32 +02:00
Stephane Nicoll a721493c88 Upgrade to MySQL 8.0.25
Closes gh-26490
2021-05-17 07:46:30 +02:00
Stephane Nicoll 5348a20ff5 Upgrade to Johnzon 1.2.11
Closes gh-26489
2021-05-17 07:46:29 +02:00
Stephane Nicoll bd73166023 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26488
2021-05-17 07:46:28 +02:00
Stephane Nicoll ecbf7cb417 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26487
2021-05-17 07:46:27 +02:00
Stephane Nicoll 96e4dcc103 Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26486
2021-05-17 07:46:26 +02:00
Stephane Nicoll 7739c3337d Upgrade to Janino 3.1.4
Closes gh-26485
2021-05-17 07:46:25 +02:00
Stephane Nicoll 48daeec522 Upgrade to Hibernate 5.4.31.Final
Closes gh-26484
2021-05-17 07:46:24 +02:00
Stephane Nicoll 7f51e43d60 Upgrade to Ehcache 2.10.9.2
Closes gh-26483
2021-05-17 07:46:23 +02:00
Stephane Nicoll ba863e4a5b Upgrade to Dropwizard Metrics 4.1.21
Closes gh-26482
2021-05-17 07:46:22 +02:00
Stephane Nicoll 5a71fa073e Upgrade to ActiveMQ 5.15.15
Closes gh-26481
2021-05-17 07:46:21 +02:00
Stephane Nicoll 691bbcfdfd Update copyright year of changed files
See gh-26448
2021-05-16 15:29:48 +02:00
weixsun d115361980 Remove redundant suppression
See gh-26448
2021-05-16 15:10:48 +02:00
weixsun aa8323f915 Remove unused imports
See gh-26477
2021-05-16 15:03:36 +02:00
Andy Wilkinson a623dab0aa Merge branch '2.4.x'
Closes gh-26474
2021-05-15 08:57:23 +01:00
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x
Closes gh-26473
2021-05-15 08:56:09 +01:00
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM
Closes gh-26467
2021-05-15 08:55:59 +01:00
Andy Wilkinson 01d3aa5fba Upgrade to Spring LDAP 2.3.4.RELEASE
Closes gh-26394
2021-05-15 08:50:00 +01:00
Andy Wilkinson fbc629a8e7 Upgrade to Spring LDAP 2.3.4.RELEASE
Closes gh-26393
2021-05-15 08:48:24 +01:00
Andy Wilkinson f8bf09ff02 Upgrade to Spring LDAP 2.3.4.RELEASE
Closes gh-25528
2021-05-15 08:44:26 +01:00
Andy Wilkinson 1db8ca60aa Test our Gradle plugin against Gradle 7.0.2
Closes gh-26464
2021-05-14 13:58:46 +01:00
Andy Wilkinson 07e319d139 Upgrade to Spring Data 2021.0.1
Closes gh-26382
2021-05-14 13:52:43 +01:00
Andy Wilkinson 77bb7f6139 Upgrade to Spring Data 2020.0.9
Closes gh-26381
2021-05-14 13:50:31 +01:00
Andy Wilkinson a3d68e29c2 Merge branch '2.4.x'
Closes gh-26463
2021-05-14 13:45:46 +01:00
Andy Wilkinson 9f279e0e96 Merge branch '2.3.x' into 2.4.x
Closes gh-26462
2021-05-14 13:45:29 +01:00
Andy Wilkinson 5984d4ee2b Index @ConfigurationProperties so they can be found by scanning
Previously, @ConfigurationProperties was not annotated with @Indexed.
This meant that @ConfigurationPropertiesScan would not be able to
find them when the underlying
ClassPathScanningCandidateComponentProvider is using a
CandidateComponentsIndex.

This commit annotated @ConfigurationProperties with @Indexed so that
they can be found by index-based scanning.

Fixes gh-26459
2021-05-14 13:41:24 +01:00
Andy Wilkinson 000d84eedd Merge branch '2.4.x'
Closes gh-26461
2021-05-14 11:58:31 +01:00