Sviatoslav Hryb
2252deb69b
Document uuid support in RandomValuePropertySource
...
See gh-26975
2021-06-22 08:16:55 +02:00
Stephane Nicoll
333c7a7cd8
Upgrade to Spring Security 5.4.7
...
Closes gh-26965
2021-06-22 07:39:35 +02:00
Phillip Webb
8189e82c02
Allow nested profile-specific resolution
...
Effectively revert commit 0da0d2d46
so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is again called when resolving
imports declared in a profile-specific file.
Fixes gh-26960
2021-06-21 18:30:03 -07:00
Stephane Nicoll
5dc1065876
Revert "Upgrade to Dropwizard Metrics 4.1.23"
...
This reverts commit ce24270271
.
See gh-26983
2021-06-21 16:53:34 +02:00
Andy Wilkinson
e18eb08222
Fix additional metadata locations with config cache
...
Previously, a project with a dependency on Spring Boot's configuration
processor would fail to build when the configuration cache is enabled
due to it accessing the Project during task execution.
Instead of accessing the project during task execution, this commit
updates the code to retrieve the resource locations from the matching
source set in advance. The locations are then stored in the action
that configures the compile task when needed.
Closes gh-26880
2021-06-21 14:31:04 +01:00
Stephane Nicoll
1374491305
Upgrade to SLF4J 1.7.31
...
Closes gh-26986
2021-06-21 08:46:27 +02:00
Stephane Nicoll
799f6b0bdd
Upgrade to Postgresql 42.2.22
...
Closes gh-26985
2021-06-21 08:46:26 +02:00
Stephane Nicoll
c9a787c7ac
Upgrade to Jetty EL 8.5.68
...
Closes gh-26984
2021-06-21 08:46:25 +02:00
Stephane Nicoll
ce24270271
Upgrade to Dropwizard Metrics 4.1.23
...
Closes gh-26983
2021-06-21 08:46:24 +02:00
Stephane Nicoll
cc6c53f040
Start building against Spring Integration 5.4.8 snapshots
...
See gh-26967
2021-06-18 18:22:42 +02:00
Stephane Nicoll
9477231c51
Start building against Spring AMQP 2.3.9 snapshots
...
See gh-26966
2021-06-18 18:21:36 +02:00
Stephane Nicoll
fa37fb0a69
Start building against Spring Security 5.4.7 snapshots
...
See gh-26965
2021-06-18 18:21:08 +02:00
Stephane Nicoll
2f30449d11
Start building against Spring Session 2020.0.5 snapshots
...
See gh-26964
2021-06-18 18:20:41 +02:00
Stephane Nicoll
b462feaa58
Start building against Spring Data 2020.0.10 snapshots
...
See gh-26963
2021-06-18 18:20:02 +02:00
Stephane Nicoll
22c4c6ea80
Start building against Reactor 2020.0.8 snapshots
...
See gh-26962
2021-06-18 18:19:01 +02:00
Andy Wilkinson
cd808d2f18
Only get Kotlin plugin's version once we know we need it
...
Fixes gh-26946
2021-06-17 17:27:03 +01:00
Andy Wilkinson
204dd29c51
Fix test on Windows
...
See gh-26821
2021-06-17 11:54:24 +01:00
Phillip Webb
b5c92d5174
Allow indirect standard profile-specific imports
...
Effectively revert commit d1b256a169
so that profile-specific imports
can again be used with or without a parent import.
Fixes gh-26858
2021-06-16 22:30:29 -07:00
Scott Frederick
5147fcacdf
Improve BeanNotOfRequiredTypeFailureAnalyzer output
...
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.
Fixes gh-26821
2021-06-16 14:44:11 -05:00
Andy Wilkinson
fe078c8afc
Avoid capturing URI template when interceptor won't use it
...
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.
This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.
Fixes gh-26915
2021-06-16 08:27:51 +01:00
Phillip Webb
5ca687c9a6
Polish 'Make livereload websocket headers case insensitive'
...
See gh-26813
Closes gh-26813
2021-06-15 17:29:45 -07:00
Francis Lavoie
8755512719
Make livereload websocket headers case insensitive
...
Update livereload `Connection` handling code so that websocket headers
are no longer case sensitive.
See gh-26813
2021-06-15 16:50:34 -07:00
Andy Wilkinson
a1e279f736
Make Flyway and Liquibase auto-config back off without spring-jdbc
...
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.
This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.
Closes gh-26849
2021-06-15 22:00:11 +01:00
Andy Wilkinson
7ba575d392
Prevent RestarterTests.testRestart from triggering unwanted restarts
...
See gh-26900
2021-06-15 19:59:37 +01:00
Andy Wilkinson
32effdba0a
Try to stabilize RestarterTests.testRestart
...
Closes gh-26900
2021-06-14 19:15:09 +01:00
Andy Wilkinson
16bfa669e1
Polish authors separators
2021-06-14 13:35:30 +01:00
Andy Wilkinson
f6b7730dac
Use Asciidoctor's revision line to provide document's version
...
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.
Closes gh-26851
2021-06-14 13:24:01 +01:00
Andy Wilkinson
c89430e174
Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
...
Closes gh-26888
2021-06-14 11:04:23 +01:00
Andy Wilkinson
7a14a53250
Try to stabilize TunnelClientTests.addListener()
...
Closes gh-26885
2021-06-14 10:52:12 +01:00
Andy Wilkinson
37d395bad2
Try to stabilize flaky MetricsWebClientFilterFunction test
...
Closes gh-26855
2021-06-11 19:48:34 +01:00
Andy Wilkinson
608c4509f8
Try to stabilise SocketTargetServerConnectionTests
...
Closes gh-26857
2021-06-11 15:55:01 +01:00
Andy Wilkinson
186658cc12
Attempt to stabilize stopTriggersTunnelClose
...
Closes gh-26856
2021-06-11 15:48:50 +01:00
Phillip Webb
7c4f178c17
Merge branch '2.3.x' into 2.4.x
2021-06-10 00:15:28 -07:00
Phillip Webb
3b48526732
Polish
2021-06-10 00:12:34 -07:00
Madhura Bhave
e3042b38f5
Merge branch '2.3.x' into 2.4.x
2021-06-09 14:45:23 -07:00
Madhura Bhave
63806d5bac
Remove duplicate copyright notice from docs
2021-06-09 14:44:44 -07:00
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
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
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
e9592229fc
Upgrade to Spring Framework 5.3.8
...
Closes gh-26760
2021-06-09 12:01:55 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Stephane Nicoll
3fbf5eeb5b
Document spring.profiles.default in the reference guide
...
Closes gh-26592
2021-05-26 09:20:58 +02: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
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
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
4955c80da5
Remove test that is no long necessary
2021-05-24 21:10:50 -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
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
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
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
29d1e22b91
Fix rawtypes
2021-05-19 15:26:53 -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
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
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
6874c42d3c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26605
2021-05-19 16:46:09 +01:00
Andy Wilkinson
2a89b11df3
Exclude SmartInitializingSingletones from lazy initialization
...
Fixes gh-26470
2021-05-19 16:26:48 +01: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
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
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
04e3165c15
Upgrade to Spring Integration 5.4.7
...
Closes gh-26587
2021-05-19 08:33:14 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
77bb7f6139
Upgrade to Spring Data 2020.0.9
...
Closes gh-26381
2021-05-14 13:50:31 +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
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
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
fd3d619670
Recommend default Servlet when using Jersey as a Filter
...
Closes gh-25733
2021-05-13 13:58:07 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f82b33698d
Add missing asciidoctor heading anchors
...
Closes gh-26239
2021-04-26 17:35:14 -07: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
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
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
db7460ddd5
Polish contribution based on Andy's review
...
See gh-26188
2021-04-21 17:23:21 +02:00
izeye
4be48d0d50
Polish
...
See gh-26188
2021-04-21 15:20:06 +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
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
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
52543b84c1
Fix sourceType for spring.profiles.include
...
Closes gh-26163
2021-04-20 10:23:42 +02:00
Stephane Nicoll
2bd4ccce8a
Document spring.profiles.group in configuration metadata
...
Closes gh-26127
2021-04-20 10:22:43 +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
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
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
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
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
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
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
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
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
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
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
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
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
Stephane Nicoll
d10409a8ad
Upgrade to Spring Framework 5.3.6
...
Closes gh-25909
2021-04-13 14:34:53 +02:00
Stephane Nicoll
9854a96f6e
Upgrade to Spring Framework 5.2.14
...
Closes gh-25903
2021-04-13 14:34:08 +02:00
Stephane Nicoll
65dd408785
Upgrade to Spring Security 5.4.6
...
Closes gh-25911
2021-04-13 08:26:46 +02:00
Stephane Nicoll
3e4ee05aaa
Upgrade to Reactor 2020.0.6
...
Closes gh-25908
2021-04-13 08:26:46 +02:00
Stephane Nicoll
75b65ddf62
Upgrade to Spring Security 5.3.9
...
Closes gh-25906
2021-04-13 08:20:13 +02:00
Stephane Nicoll
a3502accbf
Upgrade to Reactor Dysprosium-SR19
...
Closes gh-25902
2021-04-13 08:19:32 +02:00
Scott Frederick
91ee590fd4
Remove @Persistent from MongoDB entity scanning
...
This commit removes `org.springframework.data.annotation.Persistent`
from the annotation types used for MongoDB entity scanning to align
with Spring Data MongoDB.
Fixes gh-25797
2021-04-12 16:04:38 -05:00