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

13900 Commits

Author SHA1 Message Date
Phillip Webb ad8ce2aa05 Merge branch '2.5.x' 2021-06-16 23:43:14 -07:00
Phillip Webb 5c65b1bcde Fix asciidoctor anchor references 
See gh-26939
 2021-06-16 23:42:29 -07:00
Phillip Webb 7bd6611e4c Merge branch '2.5.x' 
Closes gh-26940
 2021-06-16 22:43:52 -07:00
Phillip Webb c3b873c11d Merge branch '2.4.x' into 2.5.x 
Closes gh-26939
 2021-06-16 22:43:13 -07: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 256a523e84 Merge branch '2.5.x' 
Closes gh-26936
 2021-06-16 16:00:09 -05:00
Scott Frederick 79f47b150a Merge branch '2.4.x' into 2.5.x 
Closes gh-26935
 2021-06-16 15:59:38 -05: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 76ac18f282 Merge branch '2.5.x' 
Closes gh-26929
 2021-06-16 13:06:44 +01:00
Andy Wilkinson bc7004d9c6 Fix WebSocket support with Jetty 10.0.x 
Fixes gh-26847
 2021-06-16 12:38:33 +01:00
Andy Wilkinson 1c49ca6ff2 Merge branch '2.5.x' 
Closes gh-26924
 2021-06-16 08:28:17 +01:00
Andy Wilkinson d635e1e779 Merge branch '2.4.x' into 2.5.x 
Closes gh-26923
 2021-06-16 08:28:05 +01: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 18dc99dadb Merge branch '2.5.x' 
Closes gh-26920
 2021-06-15 17:31:21 -07:00
Phillip Webb b75c79cc7c Merge branch '2.4.x' into 2.5.x 
Closes gh-26919
 2021-06-15 17:30:31 -07: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 63976367be Merge branch '2.5.x' 
Closes gh-26918
 2021-06-15 22:21:34 +01:00
Andy Wilkinson 2c2ab69315 Merge branch '2.4.x' into 2.5.x 
Closes gh-26917
 2021-06-15 22:20:52 +01: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 e0d0be97c5 Merge branch '2.5.x' 
See gh-26902
 2021-06-15 20:01:35 +01:00
Andy Wilkinson 44187bc6bf Merge branch '2.4.x' into 2.5.x 
See gh-26901
 2021-06-15 20:01:01 +01:00
Andy Wilkinson 7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts 
See gh-26900
 2021-06-15 19:59:37 +01:00
Stephane Nicoll a1a86e75ac Merge branch '2.5.x' 
Closes gh-26912
 2021-06-15 08:38:51 +02:00
Stephane Nicoll 96029dbd8a Polish "Add Azure info to the cloud deployment docs" 
See gh-26910
 2021-06-15 08:35:56 +02:00
Andy Clement 8321faaf16 Add Azure info to the cloud deployment docs 
See gh-26910
 2021-06-15 08:34:29 +02:00
Stephane Nicoll caa87f1a90 Merge branch '2.5.x' 
Closes gh-26911
 2021-06-15 08:24:30 +02:00
izeye eeefaf4314 Fix Javadoc deprecated since 
See gh-26907
 2021-06-15 08:23:13 +02:00
Stephane Nicoll 52fedb2bb4 Add support for InfluxDB 2.x 
Closes gh-25891
 2021-06-15 08:21:37 +02:00
Andy Wilkinson 043cf88687 Merge branch '2.5.x' 
Closes gh-26905
 2021-06-14 21:02:19 +01:00
Andy Wilkinson 6a51c272b9 Test our Gradle plugin against Gradle 7.1 
Closes gh-26904
 2021-06-14 21:01:06 +01:00
Andy Wilkinson 3b613a4f2d Merge branch '2.5.x' 
Closes gh-26902
 2021-06-14 19:16:52 +01:00
Andy Wilkinson 017ba504d7 Merge branch '2.4.x' into 2.5.x 
Closes gh-26901
 2021-06-14 19:16:10 +01:00
Andy Wilkinson 32effdba0a Try to stabilize RestarterTests.testRestart 
Closes gh-26900
 2021-06-14 19:15:09 +01:00
Madhura Bhave aa873d3a22 Reorder documentation overview section 
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
 2021-06-14 10:48:49 -07:00
Madhura Bhave 91ca9763e0 Reorder documentation overview section 
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
 2021-06-14 10:25:01 -07:00
Andy Wilkinson 0ec598c99d Merge branch '2.5.x' 2021-06-14 13:36:37 +01:00
Andy Wilkinson 9e2339b5d0 Merge branch '2.4.x' into 2.5.x 2021-06-14 13:36:29 +01:00
Andy Wilkinson 16bfa669e1 Polish authors separators 2021-06-14 13:35:30 +01:00
Andy Wilkinson bc715c64b1 Merge branch '2.5.x' 
Closes gh-26892
 2021-06-14 13:33:19 +01:00
Andy Wilkinson 5f26fd9ccb Merge branch '2.4.x' into 2.5.x 
Closes gh-26891
 2021-06-14 13:28:54 +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 6982bbdc2b Merge branch '2.5.x' 
Closes gh-26890
 2021-06-14 11:06:44 +01:00
Andy Wilkinson 5de5390ef9 Merge branch '2.4.x' into 2.5.x 
Closes gh-26889
 2021-06-14 11:05:53 +01:00
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout 
Closes gh-26888
 2021-06-14 11:04:23 +01:00
Andy Wilkinson 06c6eee7c5 Merge branch '2.5.x' 
Closes gh-26887
 2021-06-14 10:53:42 +01:00
Andy Wilkinson 3858c6299d Merge branch '2.4.x' into 2.5.x 
Closes gh-26886
 2021-06-14 10:52:53 +01:00
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener() 
Closes gh-26885
 2021-06-14 10:52:12 +01:00
Stephane Nicoll e7df0a8bf2 Remove dependency management for Nimbus 
Closes gh-26819
 2021-06-14 10:18:26 +02:00
Stephane Nicoll a0cf1eed41 Add support for customizing the auto-configured ClientResources 
Closes gh-26792
 2021-06-14 09:32:43 +02:00
Stephane Nicoll f8555b9071 Add metrics for task execution and scheduling 
Closes gh-23818
 2021-06-14 09:07:40 +02:00
Stephane Nicoll 6505e03cb2 Polish "Add auto-configuration for Spring Data Envers" 
See gh-22610
 2021-06-14 08:28:17 +02:00
Stefano Cordio 91da8c9fc6 Add auto-configuration for Spring Data Envers 
See gh-22610
 2021-06-14 08:28:16 +02:00
Stephane Nicoll d17c475504 Polish "Enable Redis connection pool if commons-pool2 is available" 
See gh-26326
 2021-06-14 08:25:21 +02:00
weixsun 55ff163018 Enable Redis connection pool if commons-pool2 is available 
See gh-26326
 2021-06-14 08:25:21 +02:00
Stephane Nicoll 05acfaa690 Polish "Upgrade to Flyway 7.9.2" 
See gh-26456
 2021-06-14 08:22:09 +02:00
Kedar Joshi e6236b76bb Upgrade to Flyway 7.9.2 
See gh-26456
 2021-06-14 08:22:01 +02:00
Stephane Nicoll d5d23d73e7 Polish "Allow SpringApplicationBuilder to specify a ResourceLoader" 
See gh-26690
 2021-06-14 08:17:52 +02:00
Jamin Hitchcock 7b0ba35025 Allow SpringApplicationBuilder to specify a ResourceLoader 
See gh-26690
 2021-06-14 08:17:02 +02:00
Stephane Nicoll fc0438eda8 Polish "Allow direct use of exposed WebSessionIdResolver bean" 
See gh-26437
 2021-06-14 08:13:58 +02:00
weixsun 65ce1454e0 Allow direct use of exposed WebSessionIdResolver bean 
See gh-26437
 2021-06-14 08:13:58 +02:00
Stephane Nicoll b7f126020e Update copyright year of change file 
See gh-26422
 2021-06-12 18:00:24 +02:00
Marcus Klimstra 10ffaffb7b Improve configuration of Start and Stop goals 
See gh-26422
 2021-06-12 18:00:24 +02:00
Stephane Nicoll 6b4efcce11 Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder" 
See gh-26341
 2021-06-12 17:51:57 +02:00
nguyensach 850c653862 Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder 
See gh-26341
 2021-06-12 17:51:57 +02:00
Stephane Nicoll 69c2621a14 Polish "Add support for @Value annotation" 
See gh-26337
 2021-06-12 17:40:34 +02:00
Mark Jeffrey 14d86034a1 Add support for @Value annotation 
This commit adds support for `@Value` from project Lombok for metadata
generation. This is very similar to the existing `@Data` support.

See gh-26337
 2021-06-12 17:40:34 +02:00
Stephane Nicoll d847f4c69e Polish "Add configuration property for Tomcat's rejectIllegalHeader" 
See gh-26311
 2021-06-12 17:27:11 +02:00
David Byron e5a539d80e Add configuration property for Tomcat's rejectIllegalHeader 
See gh-26311
 2021-06-12 17:27:10 +02:00
Stephane Nicoll a1183c4641 Polish "Reproducible build for spring-boot-maven-plugin:build-info" 
See gh-26221
 2021-06-12 17:11:14 +02:00
Slawomir Jaranowski 2dec6dd552 Reproducible build for spring-boot-maven-plugin:build-info 
See gh-26221
 2021-06-12 17:11:14 +02:00
Andy Wilkinson 2bea21ed4f Merge branch '2.5.x' 
Closes gh-26874
 2021-06-11 19:53:32 +01:00
Andy Wilkinson 866f1e34c1 Merge branch '2.4.x' into 2.5.x 
Closes gh-26873
 2021-06-11 19:53:05 +01:00
Andy Wilkinson 37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test 
Closes gh-26855
 2021-06-11 19:48:34 +01:00
Stephane Nicoll a90c7181b7 Polish "Add auto-configuration for DiskSpaceMetrics" 
See gh-26001
 2021-06-11 17:01:36 +02:00
bono007 e3f03dd50a Add auto-configuration for DiskSpaceMetrics 
See gh-26001
 2021-06-11 17:01:36 +02:00
Andy Wilkinson 151e0eb2b6 Merge branch '2.5.x' 
Closes gh-26871
 2021-06-11 15:55:42 +01:00
Andy Wilkinson 0ab7144bf1 Merge branch '2.4.x' into 2.5.x 
Closes gh-26870
 2021-06-11 15:55:31 +01:00
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests 
Closes gh-26857
 2021-06-11 15:55:01 +01:00
Andy Wilkinson 5123d7c937 Merge branch '2.4.x' 
Closes gh-26869
 2021-06-11 15:50:33 +01:00
Andy Wilkinson 00b9e7f498 Merge branch '2.4.x' into 2.5.x 
Closes gh-26868
 2021-06-11 15:49:57 +01:00
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose 
Closes gh-26856
 2021-06-11 15:48:50 +01:00
Stephane Nicoll 9e46061aa6 Allow to chain ContextConsumer implementations 
Closes gh-26723
 2021-06-11 16:04:34 +02:00
Andy Wilkinson f3f119b111 Don't shutdown logging system before contexts 
Add `SpringApplicationShutdownHook` to manage orderly application
shutdown, specifically around the `LoggingSystem`. `SpringApplication`
now offers a `getShutdownHandlers()` method that can be used to add
handlers that are guaranteed to only run after the `ApplicationContext`
has been closed and is inactive.

Fixes gh-26660
 2021-06-10 07:56:48 -07:00
Andy Wilkinson 39aa27e13c Make DB init back off without DatabasePopulator 
Fixes gh-26850
 2021-06-10 11:27:25 +01:00
Phillip Webb 2835085ffb Polish 2021-06-10 00:21:38 -07:00
Phillip Webb 17671980dc Merge branch '2.4.x' 2021-06-10 00:15:48 -07: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
Stephane Nicoll 18eb88b281 Upgrade to Git Commit ID Plugin 4.0.5 
Closes gh-26845
 2021-06-10 08:38:38 +02:00
Stephane Nicoll f79f2b1594 Upgrade to Spring AMQP 2.3.8 
Closes gh-26764
 2021-06-10 07:58:19 +02:00
Stephane Nicoll ab90a948be Polish "Fix Optaplanner starter url" 
See gh-26816
 2021-06-10 07:53:07 +02:00
Geoffrey De Smet 736b0678e5 Fix Optaplanner starter url 
See gh-26816
 2021-06-10 07:52:35 +02:00
Stephane Nicoll a7c538faa0 Upgrade to RSocket 1.1.1 
Closes gh-26839
 2021-06-10 07:46:17 +02:00
Stephane Nicoll 2201315556 Upgrade to Jetty 9.4.42.v20210604 
Closes gh-26838
 2021-06-10 07:46:17 +02:00
Stephane Nicoll 5cb1bd8245 Upgrade to Jetty Reactive HTTPClient 1.1.9 
Closes gh-26837
 2021-06-10 07:46:17 +02:00
Madhura Bhave 2e2d1fe8d3 Merge branch '2.4.x' into main 2021-06-09 14:46:36 -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 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