Andy Wilkinson
d79b3597bb
Upgrade to Spring AMQP 2.3.8
...
Closes gh-26762
2021-06-09 21:39:24 +01:00
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
Andy Wilkinson
c2ef7578e8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26460
2021-05-14 11:41:24 +01:00
Andy Wilkinson
444474926c
Configure JTA tests to write logs beneath build/
...
Closes gh-26440
2021-05-14 11:40:43 +01:00
Phillip Webb
83668f96af
Merge branch '2.4.x'
...
Closes gh-26458
2021-05-13 23:38:41 -07:00
Phillip Webb
73131e99da
Make BufferingApplicationStartup thread safe
...
Update `BufferingApplicationStartup` to use thread safe data structures.
Prior to this commit, it was possible for calls from different threads
(for example due to request scope beans) to cause a
NoSuchElementException to be thrown.
Closes gh-25792
2021-05-13 23:35:36 -07:00
Andy Wilkinson
f44c99df26
Merge branch '2.4.x'
...
Closes gh-26452
2021-05-13 14:01:37 +01:00
Andy Wilkinson
fd3d619670
Recommend default Servlet when using Jersey as a Filter
...
Closes gh-25733
2021-05-13 13:58:07 +01:00
Andy Wilkinson
89b5ece9b4
Use resource loader's class loader in config loading
...
Previously, classes involved in config loading used a variety of
potentially different class loaders when calling SpringFactoriesLoader.
Some classes would use their own class loader and others would use null
which results in SpringFactoriesLoader's class loader being used.
This commit updates the config loading classes to consistently use the
resource loader's class loader.
Fixes gh-26126
2021-05-13 13:25:47 +01:00
Andy Wilkinson
f92510e39d
Merge branch '2.4.x'
...
Closes gh-26451
2021-05-13 11:44:27 +01:00
Andy Wilkinson
970f933806
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26450
2021-05-13 11:44:01 +01:00
Andy Wilkinson
2dd94b5554
Polish "Use try-with-resources statement"
...
See gh-26449
2021-05-13 11:37:10 +01:00
weixsun
5ba9db391f
Use try-with-resources statements
...
See gh-26449
2021-05-13 11:36:14 +01:00
Scott Frederick
e9adb1ab88
Handle long file names in buildpack images
...
Fixes gh-26445
2021-05-12 18:14:56 -05:00
Scott Frederick
b62905b91d
Merge branch '2.4.x'
...
Closes gh-25840
2021-05-12 15:48:59 -05:00
Scott Frederick
8ac297d6f3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25839
2021-05-12 14:57:40 -05:00
Scott Frederick
32d378a348
Use test harness for image building integration tests
...
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.
Fixes gh-25838
2021-05-12 14:51:45 -05:00
Andy Wilkinson
e5af3dbfc7
Upgrade to Spring HATEOAS 1.2.6
...
Closes gh-26442
2021-05-12 17:57:54 +01:00
Andy Wilkinson
07de9e3920
Merge branch '2.4.x'
2021-05-12 17:40:58 +01:00
Andy Wilkinson
e29d2e208e
Merge branch '2.3.x' into 2.4.x
2021-05-12 17:40:48 +01:00
Andy Wilkinson
b3af6d6403
Polish
...
See gh-25798
2021-05-12 17:40:33 +01:00
Andy Wilkinson
19fa1a6107
Upgrade to Spring HATEOAS 1.3.1
...
Closes gh-26380
2021-05-12 16:28:11 +01:00
Andy Wilkinson
827e0cf80a
Upgrade to Micrometer 1.7.0
...
Closes gh-26379
2021-05-12 16:27:35 +01:00
Andy Wilkinson
0e68f3c303
Upgrade to Spring Framework 5.3.7
...
Closes gh-26361
2021-05-12 16:26:53 +01:00
Andy Wilkinson
322d6455db
Upgrade to Micrometer 1.6.7
...
Closes gh-26430
2021-05-12 14:52:05 +01:00
Andy Wilkinson
7a2d5d4eee
Upgrade to Spring Framework 5.3.7
...
Closes gh-26360
2021-05-12 14:51:33 +01:00
Andy Wilkinson
ece845a4e0
Upgrade to Micrometer 1.5.14
...
Closes gh-26427
2021-05-12 14:09:27 +01:00
Andy Wilkinson
1a32a864d4
Upgrade to Spring Framework 5.2.15.RELEASE
...
Closes gh-26425
2021-05-12 11:30:57 +01:00
Stephane Nicoll
efc0a7da44
Properly assert that auto-configured TaskExecutor is lazy
...
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
2021-05-12 07:34:58 +02:00
Madhura Bhave
eff024b0ce
Polish "Process additional profiles before config files processing"
...
See gh-25817
2021-05-11 15:04:34 -07:00
nguyensach
97fd9a7c77
Process additional profiles before config files processing
...
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.
See gh-25817
2021-05-11 15:03:36 -07:00
Madhura Bhave
38ef6b5644
Merge pull request #25817 from nguyensach
...
* pr/25817:
Polish "Process additional profiles before config files processing"
Process additional profiles before config files processing
Closes gh-25817
2021-05-11 14:46:12 -07:00
Madhura Bhave
2e1b20ce2b
Polish "Process additional profiles before config files processing"
...
See gh-25817
2021-05-11 13:06:46 -07:00
nguyensach
6f266145c7
Process additional profiles before config files processing
...
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.
See gh-25817
2021-05-11 13:05:48 -07:00
Stephane Nicoll
0e2bb5f179
Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests"
...
See gh-26416
2021-05-11 17:19:24 +02:00
nguyensach
b263f126fa
Polish SpringApplicationAdminJmxAutoConfigurationTests
...
See gh-26416
2021-05-11 17:19:24 +02:00
Stephane Nicoll
f042dcf0e0
Properly assert that auto-configured TaskExecutor is lazy
...
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
2021-05-11 17:17:28 +02:00
Stephane Nicoll
2e0481ca28
Remove useless overrides of ConditionalOnProperty#matchIfMissing
...
Closes gh-26432
2021-05-11 16:48:05 +02:00
Stephane Nicoll
0512992791
Upgrade to Reactor 2020.0.7
...
Closes gh-26359
2021-05-11 15:56:26 +02:00
Stephane Nicoll
c50afc69bd
Upgrade to Reactor 2020.0.7
...
Closes gh-26358
2021-05-11 15:55:56 +02:00
Stephane Nicoll
526af5a790
Upgrade to Reactor Dysprosium-SR20
...
Closes gh-26424
2021-05-11 15:55:14 +02:00
Stephane Nicoll
21fbb2e79c
Start building against Micrometer 1.6.7 snapshots
...
See gh-26430
2021-05-11 13:47:38 +02:00
Stephane Nicoll
5cdabc9729
Start building against Spring Kafka 2.5.13 snapshots
...
See gh-26429
2021-05-11 13:29:00 +02:00
Stephane Nicoll
47d5592035
Start building against Spring AMQP 2.2.17 snapshots
...
See gh-26428
2021-05-11 13:28:28 +02:00
Stephane Nicoll
3a8500126b
Start building against Micrometer 1.5.14 snapshots
...
See gh-26427
2021-05-11 13:27:57 +02:00
Stephane Nicoll
9772867862
Start building against Spring Batch 4.2.7 snapshots
...
See gh-26426
2021-05-11 13:26:58 +02:00
Stephane Nicoll
66fe98eb3f
Start building against Spring Framework 5.2.15 snapshots
...
See gh-26425
2021-05-11 10:05:47 +02:00
Stephane Nicoll
c059759c4d
Start building against Reactor Dysprosium-SR20 snapshots
...
See gh-26424
2021-05-11 10:05:00 +02:00
dreis2211
ba2a4781d2
Test our Gradle Plugin against Gradle 7.0.1
...
See gh-26420
2021-05-11 08:25:19 +02:00
Phillip Webb
87d8aedd3c
Use spring-pdf backend for PDF generation
...
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.
Closes gh-26373
2021-05-10 18:04:05 -07:00
Stephane Nicoll
217f6efa64
Start building against Micrometer 1.7.0 snapshots
...
See gh-26379
2021-05-10 12:46:23 +02:00
Stephane Nicoll
8d2fa26a99
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26394
2021-05-10 12:45:49 +02:00
Stephane Nicoll
14dd98c690
Start building against Spring Batch 4.3.3 snapshots
...
See gh-26392
2021-05-10 12:44:59 +02:00
Stephane Nicoll
98b48c1069
Start building against Spring WS 3.1.0 snapshots
...
See gh-26390
2021-05-10 12:44:27 +02:00
Stephane Nicoll
f5cba056d7
Start building against Spring Session 2021.0.0 snapshots
...
See gh-26389
2021-05-10 12:44:00 +02:00
Stephane Nicoll
8fcba2c333
Start building against Spring Integration 5.5.0 snapshots
...
See gh-26388
2021-05-10 12:43:29 +02:00
Stephane Nicoll
55ccf9f750
Start building against Spring Security 5.5.0 snapshots
...
See gh-26387
2021-05-10 12:43:04 +02:00
Stephane Nicoll
c9cd7cae51
Start building against Spring Kafka 2.7.1 snapshots
...
See gh-26386
2021-05-10 12:42:36 +02:00
Stephane Nicoll
c85936f004
Start building against Spring AMQP 2.3.7 snapshots
...
See gh-26384
2021-05-10 12:42:05 +02:00
Stephane Nicoll
b93263ec3c
Start building against Spring Data 2021.0.1 snapshots
...
See gh-26382
2021-05-10 12:41:37 +02:00
Stephane Nicoll
10dca8d829
Start building against Spring HATEOAS 1.3.1 snapshots
...
See gh-26380
2021-05-10 12:41:12 +02:00
Stephane Nicoll
a5cb9540ca
Start building against Spring LDAP 2.3.4 snapshots
...
See gh-26393
2021-05-10 09:38:41 +02:00
Stephane Nicoll
0d920894b7
Start building against Spring Batch 4.3.3 snapshots
...
See gh-26391
2021-05-10 09:03:43 +02:00
Stephane Nicoll
618475887c
Start building against Spring Kafka 2.6.8 snapshots
...
See gh-26385
2021-05-10 09:03:14 +02:00
Stephane Nicoll
2479f69db1
Start building against Spring AMQP 2.3.7 snapshots
...
See gh-26383
2021-05-10 09:02:27 +02:00
Stephane Nicoll
05a3b9bbeb
Start building against Spring Data 2020.0.9 snapshots
...
See gh-26381
2021-05-10 09:01:56 +02:00
Andy Wilkinson
dc5f115c04
Document support for Gradle 6.9
...
Closes gh-26409
2021-05-07 11:29:51 +01:00
Andy Wilkinson
b3071dab91
Merge branch '2.4.x'
...
Closes gh-26412
2021-05-07 11:26:18 +01:00
Andy Wilkinson
fe4d20c976
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26411
2021-05-07 11:25:10 +01:00
Andy Wilkinson
6daf67a88c
Upgrade to Gradle 6.9
...
Closes gh-26408
2021-05-07 11:21:24 +01:00
Stephane Nicoll
b4424605af
Merge branch '2.4.x'
...
Closes gh-26406
2021-05-07 09:14:46 +02:00
Stephane Nicoll
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
2021-05-07 09:14:35 +02:00
Sach Nguyen
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
2021-05-07 09:12:43 +02:00
Phillip Webb
ba1e5fb5e8
Merge branch '2.4.x'
...
Closes gh-26402
2021-05-06 19:50:52 -07:00
Phillip Webb
efad44be43
Refine mandatory location checking logic
...
Update `ConfigDataEnvironment.checkMandatoryLocations` to use the
actual locations that were imported, including those that were skipped
because the related `ConfigDataResource` had already been imported by a
different location.
Prior to this commit, any location that was skipped because it had
already been imported would throw a `ConfigDataNotFoundException`.
Closes gh-26147
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
2021-05-06 19:50:41 -07:00
Phillip Webb
777abc4aac
Merge branch '2.4.x'
...
Closes gh-26401
2021-05-06 19:50:17 -07:00
Phillip Webb
fef62f784a
Import profile specific files in correct order
...
Update `StandardConfigDataLoader` to mark profile specific files with
`Option.PROFILE` so that they are added in the correct order. This is
a variation of the same issue described in commit 5774ea3f0c
.
Closes gh-26400
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
2021-05-06 19:43:40 -07:00
Scott Frederick
922517c0e5
Polish
2021-05-06 19:43:31 -07:00
Andy Wilkinson
2976fd9165
Merge branch '2.4.x'
...
Closes gh-26397
2021-05-06 20:12:41 +01:00
Andy Wilkinson
fe696ee22a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26396
2021-05-06 20:11:59 +01:00
Andy Wilkinson
ef9e3bafff
Test our Gradle plugin against 6.9-rc-2
...
Closes gh-26395
2021-05-06 20:10:54 +01:00
Andy Wilkinson
b1f3d91f7d
Make sure the Couchbase's Jackson module is available
...
When we customize Couchbase's JacksonJsonSerializer with the
auto-configured ObjectMapper, Couchbase's JsonValueModule is lost.
This prevents the storage and retrieval of JSON objects.
This commit updates the Couchbase auto-configuration to use a copy
of the auto-configured ObjectMapper with the JsonValueModule added
to it.
Fixes gh-26363
2021-05-06 19:40:47 +01:00
Stephane Nicoll
4bbfd5a3b7
Start building against Spring Framework 5.3.7 snapshots
...
See gh-26361
2021-05-06 17:12:20 +02:00
Stephane Nicoll
d0e3b16f6d
Start building against Reactor 2020.0.7 snapshots
...
See gh-26359
2021-05-06 17:11:58 +02:00
Stephane Nicoll
3a596ed130
Start building against Spring Framework 5.3.7 snapshots
...
See gh-26360
2021-05-06 16:43:17 +02:00
Stephane Nicoll
17fdd5a79f
Start building against Reactor 2020.0.7 snapshots
...
See gh-26358
2021-05-06 16:42:45 +02:00
Phillip Webb
d3207b107c
Polish docs
2021-05-05 23:42:22 -07:00
Andy Wilkinson
aeea15be0f
Merge branch '2.4.x'
...
Closes gh-26365
2021-05-05 09:53:20 +01:00
Andy Wilkinson
f7fae8f0f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26364
2021-05-05 09:52:53 +01:00
Andy Wilkinson
b3275c5647
Align productionRuntimeClasspath with runtimeClasspath
...
Fixes gh-25798
2021-05-05 09:52:44 +01:00
Phillip Webb
65c00f373a
Polish
2021-05-04 14:07:58 -07:00
Phillip Webb
711a0c19e6
Use consistent asciidoctor subs attribute
...
Closes gh-25101
2021-05-04 13:01:20 -07:00
Phillip Webb
979fa12ca9
Polish source type for Gradle snippets
2021-05-04 10:35:39 -07:00
Phillip Webb
57e54af6f5
Delete R2dbcDatabaseInitializationConfiguration
...
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.
Closes gh-26225
2021-05-04 08:15:14 -07:00
Andy Wilkinson
a164658dab
Merge branch '2.4.x'
...
Closes gh-26349
2021-05-04 09:46:23 +01:00
Andy Wilkinson
cb1af35dde
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26348
2021-05-04 09:46:01 +01:00
Andy Wilkinson
6440843358
Do not wait indefinitely in initialize test if refresh fails
...
Closes gh-26286
2021-05-04 09:44:56 +01:00
Phillip Webb
d6d1d95741
Use American English spellings
2021-05-03 22:39:45 -07:00
Phillip Webb
b5583a4620
Polish doc code samples
...
See gh-6313
2021-05-03 22:39:44 -07:00
Phillip Webb
9aad29da0c
Extract code samples from docs
...
See gh-6313
2021-05-03 17:46:37 -07:00
Scott Frederick
0893df4a01
Merge branch '2.4.x'
...
Closes gh-26346
2021-05-03 14:53:41 -05:00
Scott Frederick
dbee0cf9f1
Ignore empty values in config location properties
...
This commit updates config data property binding to ignore empty
elements in `spring.config.location` and `spring.config.import`
property values when a value is a comma-delimited string
representing a collection.
Fixes gh-26342
2021-05-03 14:52:22 -05:00
Phillip Webb
b314d848dc
Polish docs code
...
See gh-6313
2021-04-30 18:19:52 -07:00
Phillip Webb
09e85806d6
Align docs package structure with heading IDs
...
See gh-6313
2021-04-30 16:34:35 -07:00
Andy Wilkinson
b976483852
Merge branch '2.4.x'
...
Closes gh-26330
2021-04-30 16:56:46 +01:00
Andy Wilkinson
c0fe23181c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26329
2021-04-30 16:55:10 +01:00
Andy Wilkinson
94ca2d1e78
Test the Gradle plugin against Gradle 6.9-rc-1
...
Closes gh-26267
2021-04-30 16:52:52 +01:00
Stephane Nicoll
6df3a8291e
Merge branch '2.4.x'
...
Closes gh-26328
2021-04-30 14:36:04 +02:00
Stephane Nicoll
01d2c70e8c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26327
2021-04-30 14:35:52 +02:00
Stephane Nicoll
07358c6b79
Support reactive infrastructure with DataRedisTest
...
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.
Closes gh-26319
2021-04-30 14:32:25 +02:00
Stephane Nicoll
367fd64c23
Merge branch '2.4.x'
...
Closes gh-26325
2021-04-30 13:40:32 +02:00
Stephane Nicoll
c134c38a68
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26324
2021-04-30 13:40:24 +02:00
Stephane Nicoll
af70da0e92
Update copyright year of changed file
...
See gh-26321
2021-04-30 13:35:28 +02:00
Matthias Stock
6c8c735027
Fix typo in NamedContributors Javadoc
...
See gh-26321
2021-04-30 13:35:17 +02:00
Stephane Nicoll
3475e01cda
Merge branch '2.4.x'
...
Closes gh-26323
2021-04-30 13:32:56 +02:00
Stephane Nicoll
4ccce2a74f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26322
2021-04-30 13:32:40 +02:00
Stephane Nicoll
a6e59b357f
Polish "Improve failure analysis with a single bean cycle"
...
See gh-26292
2021-04-30 13:30:58 +02:00
Roman Zabaluev
044c902a8c
Improve failure analysis with a single bean cycle
...
See gh-26292
2021-04-30 13:18:13 +02:00
Stephane Nicoll
4febe6485c
Merge branch '2.4.x'
...
Closes gh-26318
2021-04-30 08:53:31 +02:00
Stephane Nicoll
63d486158d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26317
2021-04-30 08:53:20 +02:00
Stephane Nicoll
3f528bb0eb
Mark SpringBootConfiguration as Indexed
...
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.
This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.
Closes gh-26308
2021-04-30 08:47:45 +02:00
dreis2211
ca3105920b
Fix link to Webservices reference docs
...
See gh-26316
2021-04-30 08:27:22 +02:00
Phillip Webb
33c6c600a9
Split up adoc files
...
Closes gh-23254
2021-04-29 17:32:27 -07:00
Scott Frederick
bb8188b681
Merge branch '2.4.x'
...
Closes gh-26313
2021-04-29 16:16:32 -05:00
Scott Frederick
17fa215cf5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26312
2021-04-29 15:33:33 -05:00
Scott Frederick
c37b9b8a8e
Use layout configuration in Maven build-image goal
...
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.
Fixes gh-26216
2021-04-29 15:03:08 -05:00
Andy Wilkinson
5d8a64e186
Validate section IDs in the reference documentation
...
See gh-26307
2021-04-29 15:40:54 +01:00
Andy Wilkinson
fa81b41afc
Merge branch '2.4.x'
...
Closes gh-26301
2021-04-29 11:37:13 +01:00
Andy Wilkinson
94519c33b1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26300
2021-04-29 11:36:15 +01:00
Andy Wilkinson
ef5fbb0669
Configure bootBuildImage's targetJavaVersion using a provider
...
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.
This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.
Fixes gh-26297
2021-04-29 11:36:03 +01:00
Stephane Nicoll
242f2ba6bd
Merge branch '2.4.x'
...
Closes gh-26299
2021-04-29 12:30:09 +02:00
Stephane Nicoll
f8a4aefce0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26298
2021-04-29 12:29:55 +02:00
Stephane Nicoll
0c09841013
Document property names to enable reactive health indicators
...
Closes gh-26279
2021-04-29 12:28:43 +02:00
Phillip Webb
5dce5ee595
Align adoc filename with anchors
...
See gh-26296
2021-04-28 22:34:16 -07:00
Phillip Webb
bd3f4d74be
Rationalize reference documentation anchors
...
Closes gh-26296
2021-04-28 21:56:51 -07:00
Stephane Nicoll
80248dcc13
Merge branch '2.4.x'
...
Closes gh-26283
2021-04-28 16:14:58 +02:00
Stephane Nicoll
77a231d742
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26282
2021-04-28 16:14:46 +02:00
Stephane Nicoll
e7bf0a0bd6
Fix key to datasource health indicator in reference doc
...
Closes gh-26268
2021-04-28 16:14:06 +02:00
Stephane Nicoll
52994027f4
Fix checkstyle violation
2021-04-28 15:14:33 +02:00
Stephane Nicoll
7465eb0f03
Merge branch '2.4.x'
2021-04-28 15:12:45 +02:00
Stephane Nicoll
85e1cc4d65
Fix checkstyle violation
2021-04-28 15:12:22 +02:00
Stephane Nicoll
09ae65e3b7
Merge branch '2.4.x'
...
Closes gh-26277
2021-04-28 14:13:11 +02:00
Stephane Nicoll
05b09907e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26275
2021-04-28 14:12:35 +02:00
Stephane Nicoll
d610f3c2ff
Polish "Fix ordering of metadata entries"
...
See gh-26230
2021-04-28 14:07:37 +02:00
Dmitry Pavlov
3e34b0a60a
Fix ordering of metadata entries
...
This commit provides a consistent ordering for groups that share the
same configuration property prefix.
See gh-26230
2021-04-28 14:07:37 +02:00
Stephane Nicoll
9e3c3b73ac
Merge branch '2.4.x'
2021-04-28 13:58:05 +02:00
Stephane Nicoll
d98fe36b88
Merge branch '2.3.x' into 2.4.x
2021-04-28 13:57:45 +02:00
Stephane Nicoll
20da9826cc
Disable incrementalBuildTypeRenamed test
...
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.
See gh-26271
2021-04-28 13:54:35 +02:00
Andy Wilkinson
6953da2013
Merge branch '2.4.x'
...
Closes gh-26257
2021-04-27 15:19:04 +01:00
Andy Wilkinson
a1138efc5f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26256
2021-04-27 15:18:23 +01:00
Andy Wilkinson
a470c1af3a
Align documentation with main default branch name
...
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson
31b650093d
Merge branch '2.4.x'
...
Closes gh-26251
2021-04-27 11:56:48 +01:00
Andy Wilkinson
ffc06e1e30
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26250
2021-04-27 11:51:29 +01:00
Andy Wilkinson
715c4febf9
Update maformed address to one that should fail on CI
...
Closes gh-26247
2021-04-27 11:50:52 +01:00
Andy Wilkinson
091907f762
Rename default branch to main
...
Closes gh-26248
2021-04-27 11:27:37 +01:00
Phillip Webb
d42ad237f5
Merge branch '2.4.x'
...
Closes gh-26242
2021-04-26 17:44:26 -07:00
Phillip Webb
94a70d6837
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26241
2021-04-26 17:42:00 -07:00
Phillip Webb
1e0a3a946d
Fix binding random properties test
...
See gh-26201
2021-04-26 17:36:58 -07:00
Phillip Webb
f82b33698d
Add missing asciidoctor heading anchors
...
Closes gh-26239
2021-04-26 17:35:14 -07:00
Phillip Webb
ba5b36d733
Restore support for binding random properties
...
Revert 0588e989af
so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.
Fixes gh-26201
2021-04-26 15:42:15 -07:00
Phillip Webb
5e8f383947
Extract code samples from docs
...
See gh-6313
2021-04-26 14:01:37 -07:00
Andy Wilkinson
6de10ff791
Merge branch '2.4.x'
...
Closes gh-26237
2021-04-26 15:53:37 +01:00
Andy Wilkinson
11fa850b97
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26236
2021-04-26 15:53:18 +01:00
Andy Wilkinson
4a990f3ed2
Use bean class loader when importing auto-configuration
...
Fixes gh-26234
2021-04-26 15:38:01 +01:00
Brian Clozel
1732d8ccf7
Merge branch '2.4.x'
...
Closes gh-26233
2021-04-26 11:37:20 +02:00
Brian Clozel
7be9c268b8
Fix ignored use-last-modified property in Spring MVC
...
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.
This is due to an invalid test that missed this unintended change. This
commit fixes both problems.
Fixes gh-26212
2021-04-26 11:34:47 +02:00
Phillip Webb
32a87fcbda
Extract code samples from docs
...
See gh-6313
2021-04-25 16:07:26 -07:00
Phillip Webb
2f852fa256
Update copyright year of changed files
2021-04-23 23:42:14 -07:00
Phillip Webb
f30d48e3b3
Extract code samples from docs
...
See gh-6313
2021-04-23 23:41:06 -07:00
Phillip Webb
02cc778911
Extract code samples from docs
...
See gh-6313
2021-04-23 19:10:09 -07:00
Phillip Webb
3075ac0f54
Formatting
2021-04-23 11:17:49 -07:00
Slawomir Jaranowski
50118f67fd
Test Maven plugin against latest Maven versions
...
See gh-26200
2021-04-22 14:59:16 +02:00
Stephane Nicoll
a7b0f90609
Merge branch '2.4.x'
...
Closes gh-26211
2021-04-22 14:48:30 +02:00
Stephane Nicoll
e424c1c4b4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26210
2021-04-22 14:48:15 +02:00
Shimizu, Yuko
474e460d5e
Align Maven version in system requirements with what is actually tested
...
See gh-26209
2021-04-22 14:47:29 +02:00
Stephane Nicoll
65a7422a45
Upgrade to Kafka 2.6.2
...
Closes gh-24247
2021-04-22 14:12:55 +02:00
Stephane Nicoll
e3f81f0243
Merge branch '2.4.x'
2021-04-21 17:23:42 +02:00
Stephane Nicoll
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
Stephane Nicoll
3ca6ed6246
Polish
...
Closes gh-26190
2021-04-21 17:20:22 +02:00
izeye
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +02:00
Stephane Nicoll
6c68f3652c
Merge branch '2.4.x'
...
Closes gh-26186
2021-04-21 10:03:41 +02:00
Stephane Nicoll
8edeb2c7a9
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26185
2021-04-21 10:03:32 +02:00
Stephane Nicoll
856e0d0535
Document that MeterFilters are only applied to a managed registry
...
Closes gh-25610
2021-04-21 10:02:57 +02:00
Stephane Nicoll
d403103aac
Merge branch '2.4.x'
...
Closes gh-26182
2021-04-20 17:58:30 +02:00
Stephane Nicoll
6fc803c5a2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26181
2021-04-20 17:58:14 +02:00
Stephane Nicoll
6f73fd6785
Upgrade to Testcontainers 1.15.3
...
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson
b9348c6d28
Merge branch '2.4.x'
...
Closes gh-26169
2021-04-20 11:26:46 +01:00
Andy Wilkinson
bc1a462143
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson
82198a99e0
Polish nohttp configuration
...
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll
55b9fc12c7
Merge branch '2.4.x'
...
Closes gh-26165
2021-04-20 10:23:57 +02:00
Stephane Nicoll
52543b84c1
Fix sourceType for spring.profiles.include
...
Closes gh-26163
2021-04-20 10:23:42 +02:00
Stephane Nicoll
cf5334da35
Merge branch '2.4.x'
...
Closes gh-26164
2021-04-20 10:22:55 +02:00
Stephane Nicoll
2bd4ccce8a
Document spring.profiles.group in configuration metadata
...
Closes gh-26127
2021-04-20 10:22:43 +02:00
izeye
e53453c69c
Fix broken assertions in tests
...
This commit also restores the HTTP response body
assertion that has been dropped in 5873ddd
.
See gh-26162
2021-04-20 10:02:26 +02:00
Stephane Nicoll
57d35aba12
Merge branch '2.4.x'
...
Closes gh-26160
2021-04-19 17:09:45 +02:00
Stephane Nicoll
6bbd36c77a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26159
2021-04-19 17:01:28 +02:00
Stephane Nicoll
03b65f3260
Polish "Enhance multiple entity manager factories how-to"
...
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson
0d9db46f68
Enhance multiple entity manager factories how-to
...
See gh-14928
2021-04-19 16:53:50 +02:00
Stephane Nicoll
531ee83c6a
Merge branch '2.4.x'
...
Closes gh-26156
2021-04-19 14:33:17 +02:00
Stephane Nicoll
54613c77d4
Exclude beans with scheduled methods from global lazy init
...
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.
Closes gh-25315
2021-04-19 14:04:03 +02:00
Andy Wilkinson
177152e007
Merge branch '2.4.x'
...
Closes gh-26155
2021-04-19 10:24:25 +01:00
Andy Wilkinson
0c30a5930d
Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
...
See gh-26149
2021-04-19 10:23:27 +01:00
Sriram
4268f8da84
Use ConfigDataLocationResolvers' class loader to load resolver names
...
See gh-26149
2021-04-19 10:06:07 +01:00
Stephane Nicoll
221f36ba93
Add missing value provider metadata for SQL init resources
...
Closes gh-26154
2021-04-19 09:51:51 +02:00
Stephane Nicoll
548baf7914
Update copyright year of changed file
...
See gh-26145
2021-04-19 09:34:56 +02:00
izeye
996472b42d
Polish
...
See gh-26145
2021-04-19 09:34:55 +02:00
zuisong
95a9f36ac1
Fix wrong replacements for spring.datasource.[schema|data]
...
See gh-26150
2021-04-19 09:27:24 +02:00
Stephane Nicoll
bac101647a
Polish contribution
...
See gh-25532
2021-04-16 09:29:48 +02:00
katielevy1
bd9dd9d5eb
Polish KotlinConstructorParametersBinderTests
...
See gh-25532
2021-04-16 09:22:45 +02:00
Phillip Webb
e1ad2cdab3
Fix Windows build failures
...
See gh-23098
2021-04-15 18:31:01 -07:00
Phillip Webb
a48c98b469
Revert "Switch default MVC path matching strategy"
...
This reverts commit ab8e599cfe
.
See gh-24805
2021-04-15 17:35:24 -07:00
Phillip Webb
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
Phillip Webb
238d0fed71
Improve Log4J log level reset support
...
Update `Log4J2LoggingSystem` so that call to `setLevel` with a `null`
level with remove the logger if it was previously configured by a
`LoggingSystem` call.
To track which loggers have been configured by us, and which have been
configure directly by the user, a custom `LoggerConfig` subclass is
used. We'll only remove `LevelSetLoggerConfig` classes, for any others
we'll call `setLevel(null)` on the config.
Prior to this commit, it was impossible to set then reset a logger
level using the actuator endpoint. This is because Log4J doesn't provide
a way to get the actual configured level. If the `setLevel(null)` has
been applied, then `getLevel()` will return the value of the parent
logger or a default value of `ERROR`.
Fixes gh-24298
2021-04-15 12:22:24 -07:00
Phillip Webb
96823869a9
Merge branch '2.4.x'
...
Closes gh-26139
2021-04-15 12:02:01 -07:00
Phillip Webb
302d500ee9
Add StandardConfigDataResource.getProfile method
...
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.
Fixes gh-25940
2021-04-15 12:01:34 -07:00
Andy Wilkinson
5142fe9b8e
Fix typo in Initialize a Database using basic SQL scripts
...
Closes gh-26137
2021-04-15 17:03:31 +01:00
izeye
e27c85698d
Polish
...
See gh-26135
2021-04-15 16:31:10 +02:00
izeye
fb5a1270e8
Add RepositoryMetricsAutoConfiguration to spring.factories
...
See gh-26134
2021-04-15 16:27:49 +02:00
dreis2211
beb7f7b02d
Avoid some redirects in docs
...
See gh-26129
2021-04-15 10:39:07 +02:00
Stephane Nicoll
f814beacec
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:05:10 +02:00
Stephane Nicoll
e8eb68a458
Upgrade to Spring Session Dragonfruit-SR3
...
Closes gh-25907
2021-04-15 09:01:55 +02:00
Stephane Nicoll
f558ceda9a
Upgrade to Spring WS 3.1.0-RC1
...
Closes gh-25933
2021-04-15 08:49:08 +02:00
Stephane Nicoll
0146ced614
Upgrade to Spring Session 2021.0.0-RC1
...
Closes gh-25932
2021-04-15 08:48:41 +02:00
Stephane Nicoll
28d27f5fe7
Upgrade to Spring Kafka 2.7.0
...
Closes gh-25930
2021-04-15 08:48:09 +02:00
Stephane Nicoll
28665ee93b
Upgrade to Spring Integration 5.5.0-RC1
...
Closes gh-25929
2021-04-15 08:47:41 +02:00
Phillip Webb
282a8e09d0
Merge branch '2.4.x'
...
Closes gh-26125
2021-04-14 17:43:12 -07:00
Phillip Webb
5b836f3aee
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26124
2021-04-14 17:42:38 -07:00
Phillip Webb
61ff3c98bf
Polish 'Don't detect CloudPlatform when property is set'
...
See gh-25455
2021-04-14 17:29:30 -07:00
nguyensach
70f44d3a56
Don't detect CloudPlatform when property is set
...
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.
See gh-25455
2021-04-14 17:24:37 -07:00
Phillip Webb
b4c9bb0d5c
Merge branch '2.4.x'
...
Closes gh-26122
2021-04-14 15:05:55 -07:00
Phillip Webb
fb3796dae8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87
Include optional shade plugin in published pom
...
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.
This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.
Fixes gh-21992
2021-04-14 15:02:42 -07:00
Scott Frederick
bf8051cd47
Log ApplicationAvailability state changes
...
Fixes gh-23098
2021-04-14 13:54:59 -05:00
Andy Wilkinson
1f0127036c
Upgrade to Spring Integration 5.4.6
...
Closes gh-26113
2021-04-14 17:26:54 +01:00
Andy Wilkinson
e6130c6ce0
Upgrade to Spring Integration 5.3.7.RELEASE
...
Closes gh-26112
2021-04-14 17:24:22 +01:00
Andy Wilkinson
9d0e1a2cb3
Include SQL init auto-config in Data RDBC test slice
...
Closes gh-24741
2021-04-14 16:37:33 +01:00
Andy Wilkinson
05adf02a47
Include SQL init auto-config in JDBC-based test slices
...
Closes gh-25323
2021-04-14 15:11:28 +01:00
Stephane Nicoll
e2252c7856
Merge branch '2.4.x'
...
Closes gh-26111
2021-04-14 15:44:10 +02:00
Stephane Nicoll
401ebc672b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26110
2021-04-14 15:43:57 +02:00
Stephane Nicoll
ab785d9417
Document limitations of using deferred JPA bootstrap
...
Closes gh-24027
2021-04-14 15:38:34 +02:00
Stephane Nicoll
fe2e57dee8
Upgrade to Spring Data 2021.0.0
...
Closes gh-25928
2021-04-14 15:18:12 +02:00
Stephane Nicoll
8c15e693d3
Merge branch '2.4.x'
...
Closes gh-26109
2021-04-14 15:07:23 +02:00
Stephane Nicoll
0d81b4d07e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26108
2021-04-14 15:04:28 +02:00
Stephane Nicoll
0fb482579b
Harmonize Neo4jContainer startup options
...
Closes gh-26084
2021-04-14 14:50:04 +02:00
Stephane Nicoll
c04d640452
Scan for ElasticSearch's @Document type
...
Closes gh-26028
2021-04-14 14:42:32 +02:00
Stephane Nicoll
517998a829
Upgrade to Infinispan 12.1.1.Final
...
Closes gh-26053
2021-04-14 13:47:57 +02:00
Stephane Nicoll
0cedbf6e06
Upgrade to Spring Data 2020.0.8
...
Closes gh-25910
2021-04-14 13:37:24 +02:00
Stephane Nicoll
1de2dd9ecb
Upgrade to Spring Data Neumann-SR9
...
Closes gh-25905
2021-04-14 13:31:16 +02:00
Stephane Nicoll
62a70475c2
Fix class condition on deprecated class
...
Closes gh-26107
2021-04-14 13:30:20 +02:00
Stephane Nicoll
c5214b3c84
Merge branch '2.4.x'
...
Closes gh-26105
2021-04-14 10:06:39 +02:00
Stephane Nicoll
1855f96d07
Polish "Document spring.config.additional-location should be used early"
...
See gh-26085
2021-04-14 10:06:06 +02:00
Shannon Carey
b0b1c04fc4
Document spring.config.additional-location should be used early
...
See gh-26085
2021-04-14 10:03:56 +02:00
Stephane Nicoll
90fccd7097
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26104
2021-04-14 08:47:27 +02:00
Stephane Nicoll
54d23bac9d
Upgrade to Micrometer 1.6.6
...
Closes gh-26103
2021-04-14 08:47:26 +02:00
Stephane Nicoll
3a8736a112
Upgrade to Lettuce 6.0.4.RELEASE
...
Closes gh-26102
2021-04-14 08:47:25 +02:00
Stephane Nicoll
0429ab4b88
Upgrade to HSQLDB 2.5.2
...
Closes gh-26101
2021-04-14 08:47:24 +02:00
Stephane Nicoll
00b53b5bdb
Upgrade to Glassfish JAXB 2.3.4
...
Closes gh-26100
2021-04-14 08:47:22 +02:00
Stephane Nicoll
cb2a7dd4cb
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26099
2021-04-14 08:28:19 +02:00
Stephane Nicoll
cb1d7a3bc8
Upgrade to Micrometer 1.5.13
...
Closes gh-26098
2021-04-14 08:28:18 +02:00
Stephane Nicoll
7c85ebc9c9
Upgrade to Lettuce 5.3.7.RELEASE
...
Closes gh-26097
2021-04-14 08:28:16 +02:00
Stephane Nicoll
274cfc0af0
Upgrade to HSQLDB 2.5.2
...
Closes gh-26096
2021-04-14 08:28:14 +02:00
Stephane Nicoll
4a5cb3f29e
Upgrade to Glassfish JAXB 2.3.4
...
Closes gh-26095
2021-04-14 08:28:13 +02:00
Stephane Nicoll
caa21b0fbe
Upgrade to Flatten Maven Plugin 1.2.7
...
Closes gh-26094
2021-04-14 08:28:12 +02:00
Stephane Nicoll
f8768c053a
Upgrade to Micrometer 1.7.0-RC1
...
Closes gh-25934
2021-04-14 08:17:09 +02:00
Stephane Nicoll
7723e7f130
Upgrade to Spring HATEOAS 1.3.0
...
Closes gh-25927
2021-04-14 08:16:30 +02:00
Andy Wilkinson
f45202e86f
Ensure String to RSA key converters can be used
...
Add tests to ensure that RSA key converters can be used with an
auto-configured security setup.
See gh-26089
Closes gh-24891
2021-04-13 19:13:11 -07:00
Phillip Webb
51c3e18011
Support binding with BeanFactory ConversionService
...
Update `BindConverter` so that multiple `ConverterServices` can be
specified when binding. This change allows `ConversionServiceDeducer`
to add both the `BeanFactory` conversion service as well as a
custom `ApplicationConversionService` when beans annotated with
`@ConfigurationPropertiesBinding` are found.
Fixes gh-26089
2021-04-13 19:13:06 -07:00
Phillip Webb
5581ec0e29
Make getSharedInstance() unmodifiable
...
Update `ApplicationConversionService.getSharedInstance()` so that the
instance returned is unmodifiable and converters cannot be added or
removed from it.
Closes gh-26088
2021-04-13 19:13:03 -07:00
Andy Wilkinson
b0cce645dd
Use a non-deprecated class to identify kotlin-gradle-plugin-api jar
...
See gh-26080
2021-04-13 20:29:36 +01:00
Andy Wilkinson
962fa06d9b
Merge branch '2.4.x'
...
Closes gh-26082
2021-04-13 20:14:37 +01:00
Andy Wilkinson
a58b25b5db
Add package-info to o.s.b.test.autoconfigure.data.Cassandra
...
Closes gh-26081
2021-04-13 20:14:29 +01:00
Andy Wilkinson
4cbe6836a0
Polish o.s.b.liquibase package-info
2021-04-13 20:09:38 +01:00
dreis2211
4a1924ed73
Fix Spring Data Elasticsearch deprecations
...
See gh-26078
2021-04-13 20:05:48 +01:00
Andy Wilkinson
6f2b4aa685
Upgrade to Kotlin 1.5.0-RC
...
Closes gh-26080
Closes gh-25498
2021-04-13 19:51:03 +01:00
Andy Wilkinson
5289b50a1a
Polish indentation
2021-04-13 19:07:52 +01:00
Soheel Chughtai
18b017690a
Add reference to IBM MQ Spring Boot starter
...
See gh-26041
2021-04-13 18:17:15 +01:00
Andy Wilkinson
2e25a256d5
Allow the auto-configured RabbitMQ ConnectionFactory to be customized
...
Closes gh-6719
2021-04-13 18:14:38 +01:00
Stephane Nicoll
a481b4aec2
Upgrade to HSQLDB 2.5.2
...
Closes gh-26051
2021-04-13 18:07:51 +02:00
Stephane Nicoll
15f0d3d2f3
Upgrade to Nimbus JOSE JWT 9.8.1
...
Closes gh-26077
2021-04-13 18:05:22 +02:00
Stephane Nicoll
bcd79751c6
Upgrade to OAuth2 OIDC SDK 9.3.3
...
Closes gh-26076
2021-04-13 18:05:20 +02:00
Stephane Nicoll
51dc0baf02
Upgrade to Lettuce 6.1.1.RELEASE
...
Closes gh-26075
2021-04-13 18:05:18 +02:00
Andy Wilkinson
5873dddc1c
Attempt to stabilise web server tests that use h2c
...
Apache HttpClient 5.1 doesn't cope with Jetty 10 sending
SETTINGS_ENABLE_CONNECT_PROTOCOL in the settings frame. It also appears
to be unstable when using Undertow, resulting in a failure and
"UT005032: Listener not making progress on framed channel, closing
channel to prevent infinite loop" being logged on the server-side.
Local experimentation suggests that Jetty's HTTP/2 client is more
robust and that it does not trigger the problem with Undertow. It also
fixes the problem with SETTINGS_ENABLE_CONNECT_PROTOCOL when testing
against Jetty 10 so this commit updates the tests to use Jetty's client.
Closes gh-26040
2021-04-13 16:15:49 +01:00
Stephane Nicoll
17a13de855
Upgrade to Undertow 2.2.7.Final
...
Closes gh-26073
2021-04-13 15:43:09 +02:00
Stephane Nicoll
7d5e7cecd8
Upgrade to Sun Mail 1.6.7
...
Closes gh-26071
2021-04-13 15:43:09 +02:00
Stephane Nicoll
75506df0ed
Upgrade to Selenium HtmlUnit 2.49.1
...
Closes gh-26070
2021-04-13 15:43:08 +02:00
Stephane Nicoll
bdc910fb1a
Upgrade to Rabbit AMQP Client 5.12.0
...
Closes gh-26069
2021-04-13 15:43:08 +02:00
Stephane Nicoll
888330eb9d
Upgrade to Netty tcNative 2.0.38.Final
...
Closes gh-26068
2021-04-13 15:43:08 +02:00
Stephane Nicoll
023c20594d
Upgrade to Netty 4.1.63.Final
...
Closes gh-26067
2021-04-13 15:43:08 +02:00
Stephane Nicoll
18e751a81b
Upgrade to Neo4j Java Driver 4.2.4
...
Closes gh-26066
2021-04-13 15:43:08 +02:00
Stephane Nicoll
7bf8b91b93
Upgrade to MongoDB 4.2.3
...
Closes gh-26065
2021-04-13 15:43:07 +02:00
Stephane Nicoll
50416647bb
Upgrade to Mockito 3.9.0
...
Closes gh-26064
2021-04-13 15:43:07 +02:00
Stephane Nicoll
8eff215cd0
Upgrade to MIMEPull 1.9.14
...
Closes gh-26063
2021-04-13 15:43:07 +02:00
Stephane Nicoll
041b65d9ce
Upgrade to Maven Invoker Plugin 3.2.2
...
Closes gh-26062
2021-04-13 15:43:07 +02:00
Stephane Nicoll
95d55f50e9
Upgrade to Lombok 1.18.20
...
Closes gh-26061
2021-04-13 15:43:07 +02:00
Stephane Nicoll
e7988de2e9
Upgrade to Liquibase 4.3.3
...
Closes gh-26060
2021-04-13 15:43:06 +02:00
Stephane Nicoll
e9ba79d5be
Upgrade to Lettuce 6.1.0.RELEASE
...
Closes gh-26059
2021-04-13 15:43:06 +02:00
Stephane Nicoll
979cf96cae
Upgrade to Jetty 9.4.39.v20210325
...
Closes gh-26058
2021-04-13 15:43:06 +02:00
Stephane Nicoll
2f424b15da
Upgrade to Jetty Reactive HTTPClient 1.1.7
...
Closes gh-26057
2021-04-13 15:43:06 +02:00
Stephane Nicoll
b8d3253151
Upgrade to Jaybird 4.0.3.java8
...
Closes gh-26056
2021-04-13 15:43:05 +02:00
Stephane Nicoll
db5ef657d6
Upgrade to Jakarta Mail 1.6.7
...
Closes gh-26055
2021-04-13 15:43:05 +02:00
Stephane Nicoll
7c32389dd0
Upgrade to Jackson Bom 2.12.3
...
Closes gh-26054
2021-04-13 15:43:05 +02:00