root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
31,676 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

12834 Commits

Author SHA1 Message Date
Andy Wilkinson 49baacbc1c Polish "Mark Redis as down when cluster_state is fail" 
See gh-27300
 2021-07-13 14:56:01 +01:00
Hoan Vu Hong f31141de09 Mark Redis as down when cluster_state is fail 
See gh-27300
 2021-07-13 14:35:59 +01:00
Andy Wilkinson 96e58d815d Upgrade to Reactor 2020.0.9 
Closes gh-27159
 2021-07-13 13:52:00 +01:00
Andy Wilkinson 1341ca99db Align with Framework's deprecation of getLastModified 
See gh-27160
 2021-07-13 13:12:45 +01:00
Andy Wilkinson 2354dd5ccb Include Jetty metrics in list of supported metrics 
Closes gh-27299
 2021-07-13 12:06:28 +01:00
Stephane Nicoll 895a2ed013 Upgrade to Postgresql 42.2.23 
Closes gh-27244
 2021-07-11 08:12:08 +02:00
Stephane Nicoll bed528f203 Upgrade to jOOQ 3.14.12 
Closes gh-27243
 2021-07-11 08:12:07 +02:00
Stephane Nicoll 5811b22554 Upgrade to Johnzon 1.2.14 
Closes gh-27242
 2021-07-11 08:12:07 +02:00
Stephane Nicoll 3c6db2bc28 Upgrade to Jetty 9.4.43.v20210629 
Closes gh-27241
 2021-07-11 08:12:06 +02:00
Stephane Nicoll 58b03ac56f Upgrade to Jetty Reactive HTTPClient 1.1.10 
Closes gh-27240
 2021-07-11 08:12:05 +02:00
Stephane Nicoll 88e0916ad6 Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27239
 2021-07-11 08:12:04 +02:00
Stephane Nicoll 2d671021d9 Upgrade to AspectJ 1.9.7 
Closes gh-27238
 2021-07-11 08:12:02 +02:00
Andy Wilkinson 7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed 
Fixes gh-27208
 2021-07-09 11:12:52 +01:00
Andy Wilkinson 4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers 
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
 2021-07-09 10:29:50 +01:00
Andy Wilkinson 3fec41104e Ensure that Batch schema is in place before DB is accessed 
Fixes gh-27193
 2021-07-09 09:47:48 +01:00
Madhura Bhave 42e556dd73 Handle file with name matching an optional wildcard location 
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.

Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.

Fixes gh-27120
Fixes gh-27209
 2021-07-08 13:01:15 -07:00
Phillip Webb 84110a22bc Don't change case of 'Sec-WebSocket-Key' 
Polish commit 5ca687c9a6 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
 2021-07-08 11:29:29 -07:00
Stephane Nicoll 815ccd14b5 Start building against Spring Data 2020.0.11 snapshots 
See gh-27161
 2021-07-08 08:45:17 +02:00
Stephane Nicoll 434d4a6f76 Start building against Spring HATEOAS 1.2.8 snapshots 
See gh-27183
 2021-07-08 08:44:52 +02:00
Stephane Nicoll 861f87911c Start building against Spring Framework 5.3.9 snapshots 
See gh-27160
 2021-07-08 08:44:23 +02:00
Stephane Nicoll 74d5fdbcd0 Start building against Reactor 2020.0.9 snapshots 
See gh-27159
 2021-07-08 08:43:53 +02:00
Stephane Nicoll 5ec0c7ed12 Polish "Fix duration to microseconds conversion" 
See gh-27149
 2021-07-06 09:07:48 +02:00
marckchr a406a46fa1 Fix duration to microseconds conversion 
See gh-27149
 2021-07-06 09:07:47 +02:00
Madhura Bhave 877f618a69 Clarify that HATEOAS can be used with Webflux without starter 
Closes gh-26897
 2021-07-02 15:36:39 -07:00
Madhura Bhave 6c4273b5c9 Document spring hateoas is spring mvc specific 
Closes gh-26897
 2021-07-01 15:54:01 -07:00
Madhura Bhave eb4144eb97 Add clarification on when @DevaultValue is used during binding 
Closes gh-26742
 2021-07-01 15:39:16 -07:00
Andy Wilkinson a7872f47da Minimize Instantiator's public API 
See gh-27043
 2021-06-24 09:27:08 +01:00
Phillip Webb 5088927f80 Pass ClassLoader to Instantiator 
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.

Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.

Fixes gh-27043
 2021-06-23 23:30:53 -07:00
Stephane Nicoll 6889d2adda Upgrade to Nimbus JOSE JWT 8.22 
Closes gh-27068
 2021-06-24 07:27:08 +02:00
Stephane Nicoll d4039648c7 Upgrade to OAuth2 OIDC SDK 8.36.2 
Closes gh-27067
 2021-06-24 07:27:06 +02:00
Stephane Nicoll 1f53e93b8d Upgrade to Netty tcNative 2.0.40.Final 
Closes gh-27066
 2021-06-24 07:27:05 +02:00
Stephane Nicoll 006995fef7 Upgrade to Spring Integration 5.4.8 
Closes gh-26967
 2021-06-24 06:39:11 +02:00
Stephane Nicoll 6804ae849d Upgrade to Spring AMQP 2.3.9 
Closes gh-26966
 2021-06-24 06:38:42 +02:00
Phillip Webb 1a7569056b Fix 'spring.datasource.name' property description 
Closes gh-27026
 2021-06-23 21:12:59 -07:00
Phillip Webb a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb ea62967ef4 Improve "reason" message in BindFailureAnalyzer 
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.

Closes gh-27028
 2021-06-23 20:54:01 -07:00
Phillip Webb 0e28e24123 Rethrow ConverterNotFoundException when possible 
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.

See gh-27028
 2021-06-23 20:53:35 -07:00
Phillip Webb 93d316ddd1 Add additional ConfigDataProperties tests 
Add more `isActive` tests to cover negative cases.

See gh-27017
 2021-06-23 17:46:23 -07:00
fengyuanwei b91c66b823 Fix typo in ConfigDataPropertiesTests 
See gh-27017
 2021-06-23 17:38:46 -07:00
Phillip Webb 63ed921554 Restore simple Library constructor 
See gh-15808
 2021-06-23 17:27:26 -07:00
Madhura Bhave b790c82732 Apply exclusions to existing war entries 
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.

Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin

Fixes gh-15808

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-06-23 15:08:31 -07:00
Andy Wilkinson 3746155916 Align Nimbus dependency versions with Spring Security 
Closes gh-26820
 2021-06-23 17:53:09 +01:00
Stephane Nicoll d0f12392ab Upgrade to Micrometer 1.6.8 
Closes gh-27014
 2021-06-23 17:41:25 +02:00
Stephane Nicoll fb2ed6076f Upgrade to Spring Session 2020.0.5 
Closes gh-26964
 2021-06-23 15:55:57 +02:00
Stephane Nicoll fb1cd82061 Upgrade to OAuth2 OIDC SDK 8.36.2 
Closes gh-27034
 2021-06-23 07:58:19 +02:00
Stephane Nicoll ded6b26ea5 Upgrade to Neo4j Java Driver 4.1.4 
Closes gh-27033
 2021-06-23 07:58:18 +02:00
Stephane Nicoll 6db9fe2e36 Upgrade to Lettuce 6.0.6.RELEASE 
Closes gh-27032
 2021-06-23 07:58:17 +02:00
Stephane Nicoll 9bc1c4dff2 Upgrade to Dropwizard Metrics 4.1.24 
Closes gh-27031
 2021-06-23 07:58:16 +02:00
Stephane Nicoll 7e09c1d8dc Upgrade to Spring Data 2020.0.10 
Closes gh-26963
 2021-06-22 19:21:42 +02:00
Stephane Nicoll 58320c6af9 Upgrade to Spring HATEOAS 1.2.7 
Closes gh-27013
 2021-06-22 19:21:12 +02:00
Stephane Nicoll c21099b142 Upgrade to Reactor 2020.0.8 
Closes gh-26962
 2021-06-22 14:52:39 +02:00
Andy Wilkinson ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration" 
See gh-26937
 2021-06-22 12:55:25 +01:00
Yanming Zhou a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration 
See gh-26937
 2021-06-22 12:55:25 +01:00
Stephane Nicoll b8a5d9b882 Start building against Micrometer 1.6.8 snapshots 
See gh-27014
 2021-06-22 09:35:36 +02:00
Stephane Nicoll 9ab8c625e5 Start building against Spring HATEOAS 1.2.7 snapshots 
See gh-27013
 2021-06-22 08:31:44 +02:00
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