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
36,471 Commits 23 Branches 348 Tags 286 MiB
Commit Graph

16311 Commits

Author SHA1 Message Date
Phillip Webb a3615f4f77 Merge branch '2.7.x' 2022-02-04 20:04:28 -08:00
Phillip Webb d212243eef Polish 'Add Kotlin alternatives to Java documentation samples' 
See gh-29499
 2022-02-04 19:57:21 -08:00
Pavel Semyonov 197afff1d6 Add Kotlin alternatives to Java documentation samples 
See gh-29499
 2022-02-04 19:56:13 -08:00
Phillip Webb a301d8ed5d Merge branch '2.7.x' 2022-02-04 19:50:54 -08:00
Phillip Webb 0e906dc6e2 Use convention based code imports 
Closes gh-29647
 2022-02-04 19:46:44 -08:00
Phillip Webb a6b7ae2110 Merge branch '2.7.x' 2022-02-04 19:45:01 -08:00
Phillip Webb 71695d2162 Merge branch '2.6.x' into 2.7.x 
Closes gh-29658
 2022-02-04 19:44:31 -08:00
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x 
Closes gh-29657
 2022-02-04 19:44:05 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3 
Closes gh-29656
 2022-02-04 19:43:47 -08:00
Phillip Webb 50047e6d8c Merge branch '2.7.x' 2022-02-04 16:10:50 -08:00
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Phillip Webb b9e037b88f Polish 2022-02-04 16:09:22 -08:00
Andy Wilkinson e2d6516726 Remove dependency management for spring-boot-starter-jta-atomikos 
Closes gh-29653
 2022-02-04 13:06:27 +00:00
Stephane Nicoll b22e3d51dc Merge branch '2.7.x' 2022-02-04 10:10:29 +01:00
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility 
See gh-29200
 2022-02-04 09:57:59 +01:00
Stephane Nicoll 8885964a56 Merge branch '2.7.x' 2022-02-04 09:54:11 +01:00
Stephane Nicoll 37c1f47902 Merge branch '2.6.x' into 2.7.x 
Closes gh-29650
 2022-02-04 09:53:42 +01:00
Stephane Nicoll 03d393bc4c Merge branch '2.5.x' into 2.6.x 
Closes gh-29649
 2022-02-04 09:50:47 +01:00
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests 
Closes gh-29648
 2022-02-04 09:49:15 +01:00
Stephane Nicoll d1225392d3 Remove dependency management for spring-boot-starter-activemq 
Closes gh-29645
 2022-02-04 09:08:03 +01:00
Phillip Webb 0083b767e6 Merge branch '2.7.x' 2022-02-03 22:53:15 -08:00
Phillip Webb 4919683354 Use consistent packages for doc samples 
Closes gh-29646
 2022-02-03 22:50:47 -08:00
Phillip Webb a282f912e6 Organize imports 
Organize imports according to updated checkstyle rules.
 2022-02-02 19:16:13 -08:00
Phillip Webb a05903b9d1 Polish GraphQL auto-configuration 2022-02-02 12:57:17 -08:00
Phillip Webb 501d174db0 Merge branch '2.7.x' 2022-02-02 10:38:46 -08:00
Phillip Webb ce08b519b1 Merge branch '2.6.x' into 2.7.x 2022-02-02 10:37:55 -08:00
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb 2b40ce09d8 Update copyright year of changed files 2022-02-02 10:35:40 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Andy Wilkinson f88b502f7e Remove support for image banners 
Closes gh-28883
 2022-02-02 14:40:24 +00:00
Stephane Nicoll e749f30642 Merge branch '2.7.x' 2022-02-01 16:35:39 +01:00
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x 
Closes gh-29617
 2022-02-01 16:35:28 +01:00
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x 
Closes gh-29616
 2022-02-01 16:35:19 +01:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression" 
See gh-29276
 2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression 
See gh-29276
 2022-02-01 16:24:13 +01:00
Stephane Nicoll b403877cc1 Merge branch '2.7.x' 2022-02-01 13:52:17 +01:00
Stephane Nicoll 067af65152 Fix formatting violations 2022-02-01 13:52:06 +01:00
Brian Clozel b1c815830f Upgrade to RxJava 3.x and remove older generations 
As Spring Framework removed support for RxJava 1.x and 2.x, we should do
the same and only provide dependency management for RxJava 3.x.

Closes gh-28212
 2022-02-01 11:38:50 +01:00
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +01:00
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x 
Closes gh-29613
 2022-02-01 11:07:31 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x 
Closes gh-29612
 2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito" 
See gh-29178
 2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito 
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
 2022-02-01 09:37:15 +01:00
Stephane Nicoll 3a65d7b01e Merge branch '2.7.x' 2022-01-31 16:45:11 +01:00
Stephane Nicoll 19e671dd7b Merge branch '2.6.x' into 2.7.x 2022-01-31 16:45:04 +01:00
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover" 
See gh-29438
 2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover 
See gh-29438
 2022-01-31 16:28:28 +01:00
Stephane Nicoll e691cfdf3d Merge branch '2.7.x' 2022-01-31 16:24:52 +01:00
Stephane Nicoll 7bebfd06b8 Merge branch '2.6.x' into 2.7.x 
Closes gh-29601
 2022-01-31 16:24:40 +01:00
Stephane Nicoll f1dc7e7b78 Merge branch '2.5.x' into 2.6.x 
Closes gh-29600
 2022-01-31 16:24:29 +01:00
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests" 
See gh-29522
 2022-01-31 16:22:28 +01:00
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests 
See gh-29522
 2022-01-31 16:01:04 +01:00
Stephane Nicoll 42df01f193 Merge branch '2.7.x' 2022-01-29 15:44:55 +01:00
Stephane Nicoll 0c0ec64ed4 Polish "Use existing constant rather than "spring.beaninfo.ignore"" 
See gh-29592
 2022-01-29 15:39:43 +01:00
minkyu-jo 1a558292a8 Use existing constant rather than "spring.beaninfo.ignore" 
See gh-29592
 2022-01-29 15:39:28 +01:00
Stephane Nicoll 68bd6f91cf Merge branch '2.7.x' 2022-01-29 15:34:16 +01:00
Stephane Nicoll a94b176c39 Merge branch '2.6.x' into 2.7.x 
Closes gh-29595
 2022-01-29 15:34:08 +01:00
izeye 118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests 
See gh-29593
 2022-01-29 15:33:25 +01:00
Madhura Bhave 8125b46ed5 Merge branch '2.7.x' into main 2022-01-27 12:09:51 -08:00
Madhura Bhave 81bbd295e9 Merge branch '2.6.x' into 2.7.x 
Closes gh-29584
 2022-01-27 12:04:26 -08:00
Madhura Bhave 0597c6831e Configure health on additional path only when health exposed 
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
 2022-01-27 11:44:54 -08:00
Phillip Webb c820ad01a1 Fix checkstyle error 2022-01-25 14:52:30 -08:00
Phillip Webb e19fa140e7 Fix merge conflict mistake 2022-01-25 13:34:10 -08:00
Phillip Webb 8ab87ace24 Merge branch '2.7.x' 2022-01-25 13:18:33 -08:00
Phillip Webb bb024211f6 Merge branch '2.6.x' into 2.7.x 
Closes gh-29565
 2022-01-25 13:17:22 -08:00
Phillip Webb df9cf6b726 Make ErrorPageSecurityFilter compatible with Servlet 3.1 
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.

Fixes gh-29558
 2022-01-25 13:15:59 -08:00
Andy Wilkinson f2ac7d10ef Merge branch '2.7.x' 2022-01-25 12:19:51 +00:00
Andy Wilkinson 8480abca20 Merge branch '2.6.x' into 2.7.x 
Closes gh-29561
 2022-01-25 12:19:37 +00:00
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x 
Closes gh-29560
 2022-01-25 12:19:16 +00:00
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change 
Closes gh-28781
 2022-01-25 12:11:19 +00:00
Brian Clozel 03da915f56 Merge branch '2.7.x' 2022-01-25 09:22:49 +01:00
Brian Clozel 24c5f4b7ea Merge branch '2.6.x' into 2.7.x 
Closes gh-29557
 2022-01-25 09:22:19 +01:00
Brian Clozel 1204c1aa32 Merge branch '2.5.x' into 2.6.x 
Closes gh-29556
 2022-01-25 09:21:49 +01:00
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext 
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-01-25 08:58:42 +01:00
Scott Frederick 4494d3a805 Merge branch '2.7.x' into main 2022-01-24 16:21:11 -06:00
Scott Frederick 698eb94913 Merge branch '2.6.x' into 2.7.x 
Closes gh-29554
 2022-01-24 16:20:33 -06:00
Scott Frederick 909ef6d635 Merge branch '2.5.x' into 2.6.x 
Closes gh-29553
 2022-01-24 16:19:43 -06:00
Scott Frederick 000cbfa2d9 Set file permissions on all created test files 
Closes gh-29551
 2022-01-24 16:19:20 -06:00
Andy Wilkinson 191333773f Restore support for REST Assured 
Closes gh-29543
 2022-01-24 13:46:48 +00:00
Andy Wilkinson 1d7b1e1a46 Start building against snapshots for Spring REST Docs 3.0.0-M2 
See gh-29544
 2022-01-24 13:46:01 +00:00
Stephane Nicoll 5c78c2288c Merge branch '2.7.x' 2022-01-24 09:42:06 +01:00
Stephane Nicoll f9029a3584 Merge branch '2.6.x' into 2.7.x 
Closes gh-29540
 2022-01-24 09:41:56 +01:00
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x 
Closes gh-29539
 2022-01-24 09:41:35 +01:00
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain 
See gh-29523
 2022-01-24 09:35:44 +01:00
Stephane Nicoll 83e2ffe45c Merge branch '2.7.x' 2022-01-24 09:30:05 +01:00
Stephane Nicoll ba8c76ba08 Merge branch '2.6.x' into 2.7.x 
Closes gh-29538
 2022-01-24 09:29:48 +01:00
Stephane Nicoll 267cd45235 Merge branch '2.5.x' into 2.6.x 
Closes gh-29537
 2022-01-24 09:29:31 +01:00
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2 
See gh-29535
 2022-01-24 09:28:53 +01:00
Andy Wilkinson 3c5c5d9575 Merge branch '2.7.x' 2022-01-21 14:28:25 +00:00
Andy Wilkinson 5b95c89303 Upgrade to Solr 8.11.1 
Closes gh-29517
 2022-01-21 14:16:38 +00:00
Andy Wilkinson f025ab629a Switch to new coordinates for Git Commit ID Maven Plugin 
Closes gh-29515
 2022-01-20 17:37:03 +00:00
Andy Wilkinson 7f2c346f9d Upgrade to Yasson 2.0.4 
Closes gh-29514
 2022-01-20 17:37:02 +00:00
Andy Wilkinson c927105743 Upgrade to jOOQ 3.16.2 
Closes gh-29512
 2022-01-20 17:37:02 +00:00
Andy Wilkinson 0623d1e4d4 Upgrade to HSQLDB 2.6.1 
Closes gh-29511
 2022-01-20 17:37:01 +00:00
Andy Wilkinson 35650d7b59 Upgrade to HikariCP 5.0.1 
Closes gh-29510
 2022-01-20 17:37:01 +00:00
Andy Wilkinson 7b35fabf07 Upgrade to Derby 10.15.2.0 
Closes gh-29509
 2022-01-20 17:37:01 +00:00
Andy Wilkinson 75fce16633 Upgrade to Caffeine 3.0.5 
Closes gh-29508
 2022-01-20 16:09:55 +00:00
Andy Wilkinson 9b4edfe925 Permit dependencies that require Java 9 or later 2022-01-20 16:05:42 +00:00
Stephane Nicoll 5cbaf2ba44 Upgrade to MariaDB 2.7.5 
Closes gh-29506
 2022-01-20 16:43:12 +01:00
Stephane Nicoll e74eba8cea Upgrade to Hibernate 5.6.4.Final 
Closes gh-29505
 2022-01-20 16:43:11 +01:00
Stephane Nicoll 8d0263c329 Upgrade to Flyway 8.4.2 
Closes gh-29504
 2022-01-20 16:43:11 +01:00
Stephane Nicoll 1f73bff95b Merge branch '2.7.x' 2022-01-20 16:41:40 +01:00
Stephane Nicoll 6821df7c2d Upgrade to MariaDB 2.7.5 
Closes gh-29506
 2022-01-20 16:32:24 +01:00
Stephane Nicoll f099193776 Upgrade to Hibernate 5.6.4.Final 
Closes gh-29505
 2022-01-20 16:32:23 +01:00
Stephane Nicoll 0b286846fa Upgrade to Flyway 8.4.2 
Closes gh-29504
 2022-01-20 16:32:21 +01:00
Andy Wilkinson 35b5b5672d Merge branch '2.7.x' 2022-01-20 12:37:16 +00:00
Andy Wilkinson 2c049f2b40 Merge branch '2.6.x' into 2.7.x 
Closes gh-29501
 2022-01-20 12:36:49 +00:00
Madhura Bhave 3460c24a16 Ignore context path when calling privilege evaluator 
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
 2022-01-20 12:36:18 +00:00
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5 
Closes gh-29498
 2022-01-20 10:53:13 +01:00
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final 
Closes gh-29497
 2022-01-20 10:53:11 +01:00
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5 
Closes gh-29496
 2022-01-20 10:29:26 +01:00
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 2022-01-19 15:54:19 -08:00
Phillip Webb d211b0f3b3 Disable test is Docker is not available 
See gh-28843
 2022-01-19 15:53:07 -08:00
Andy Wilkinson a3bfc67249 Merge branch '2.7.x' 2022-01-19 19:09:25 +00:00
Andy Wilkinson 1e4b786ff9 Merge branch '2.6.x' into 2.7.x 
Closes gh-29489
 2022-01-19 19:09:09 +00:00
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated 
Closes gh-29488
 2022-01-19 19:08:31 +00:00
Andy Wilkinson 92fa8ae9b7 Upgrade to Spring Session 2022.0.0-M1 
Closes gh-28871
 2022-01-19 17:30:36 +00:00
Andy Wilkinson 5d11c90e6d Upgrade to Spring Batch 5.0.0-M1 
Closes gh-29278
 2022-01-19 17:29:25 +00:00
Andy Wilkinson 0829dcd572 Merge branch '2.6.x' into 2.7.x 
Closes gh-29486
 2022-01-19 17:27:51 +00:00
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x 
Closes gh-29485
 2022-01-19 17:27:36 +00:00
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java 
Closes gh-29484
 2022-01-19 17:26:55 +00:00
Andy Wilkinson de3b9a4910 Remove code deprecated for removal in 2.x 
Closes gh-29482
 2022-01-19 17:25:14 +00:00
Brian Clozel cbcc49408c Upgrade to Spring Session 2021.2.0-M1 
Closes gh-29226
 2022-01-19 17:40:22 +01:00
Brian Clozel 1e4e4f168d Upgrade to Spring for GraphQL 1.0.0-M5 
Closes gh-29285
 2022-01-19 16:46:12 +01:00
Andy Wilkinson 91060a94d4 Merge branch '2.7.x' 2022-01-19 13:20:37 +00:00
Andy Wilkinson 6fa4b942ee Merge branch '2.6.x' into 2.7.x 
Closes gh-29481
 2022-01-19 13:19:13 +00:00
Andy Wilkinson 52f612b3eb Merge branch '2.5.x' into 2.6.x 
Closes gh-29480
 2022-01-19 13:18:50 +00:00
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether 
Closes gh-29255
 2022-01-19 13:18:05 +00:00
Stephane Nicoll 0d2e3bc4c9 Merge branch '2.7.x' 2022-01-19 12:24:47 +01:00
Stephane Nicoll f510805f00 Merge branch '2.6.x' into 2.7.x 
Closes gh-29479
 2022-01-19 12:24:32 +01:00
Stephane Nicoll d92939e773 Merge branch '2.5.x' into 2.6.x 
Closes gh-29478
 2022-01-19 12:24:15 +01:00
Stephane Nicoll 4eb458f7d8 Prevent early resolution of factory beans 
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
 2022-01-19 11:49:56 +01:00
Stephane Nicoll 4d03f89a55 Harmonize dependency upgrades with Spring Boot 2.7.0-M1 
Closes gh-29476
 2022-01-19 10:39:18 +01:00
Stephane Nicoll d433f18922 Merge branch '2.7.x' 2022-01-19 09:06:31 +01:00
Stephane Nicoll 4166429fd0 Add missing dependency management for Flyway 
Closes gh-29474
 2022-01-19 09:03:32 +01:00
Stephane Nicoll 6a70daa361 Upgrade to Pooled JMS 1.2.3 
Closes gh-29473
 2022-01-19 08:37:17 +01:00
Stephane Nicoll 92f1e119b4 Upgrade to MySQL 8.0.28 
Closes gh-29472
 2022-01-19 08:37:16 +01:00
Stephane Nicoll 23d3b0f8ea Upgrade to Liquibase 4.7.0 
Closes gh-29471
 2022-01-19 08:37:15 +01:00
Stephane Nicoll 801e7c4c03 Upgrade to Flyway 8.4.1 
Closes gh-29470
 2022-01-19 08:37:13 +01:00
Stephane Nicoll dad1e0b18d Upgrade to Embedded Mongo 3.2.8 
Closes gh-29469
 2022-01-19 08:37:11 +01:00
Stephane Nicoll 7de3b6e6cd Switch bomr to "any" policy 2022-01-19 08:30:58 +01:00
Stephane Nicoll 507abe88f3 Upgrade to Spring Integration 6.0.0-M1 
Closes gh-28649
 2022-01-19 08:28:26 +01:00
Stephane Nicoll 124a3219e8 Upgrade to Pooled JMS 1.2.3 
Closes gh-29468
 2022-01-19 08:17:20 +01:00
Stephane Nicoll 60971c6fdb Upgrade to MySQL 8.0.28 
Closes gh-29467
 2022-01-19 08:17:19 +01:00
Stephane Nicoll c2f8823e4e Upgrade to Spring Integration 5.5.8 
Closes gh-29286
 2022-01-19 08:13:28 +01:00
Stephane Nicoll aba3b1dc5f Upgrade to Spring Integration 5.5.8 
Closes gh-29320
 2022-01-19 08:12:33 +01:00
Stephane Nicoll cdd479556f Upgrade to Pooled JMS 1.2.3 
Closes gh-29466
 2022-01-19 08:12:08 +01:00
Stephane Nicoll 849fb8e435 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29465
 2022-01-19 08:12:07 +01:00
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28 
Closes gh-29464
 2022-01-19 08:12:06 +01:00
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8 
Closes gh-29314
 2022-01-19 08:09:50 +01:00
Phillip Webb e4b398769f Merge branch '2.7.x' 2022-01-18 16:16:59 -08:00
Phillip Webb a77411ebd8 Merge branch '2.6.x' into 2.7.x 
Closes gh-29460
 2022-01-18 16:16:18 -08:00
Phillip Webb 3b4409305a Merge branch '2.5.x' into 2.6.x 
Closes gh-29459
 2022-01-18 16:15:20 -08:00
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic 
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
 2022-01-18 16:14:52 -08:00
Andy Wilkinson d04ece044a Merge branch '2.7.x' 2022-01-18 20:35:20 +00:00
Andy Wilkinson 654d142c95 Merge branch '2.6.x' into 2.7.x 
Closes gh-29455
 2022-01-18 20:35:06 +00:00
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x 
Closes gh-29454
 2022-01-18 20:34:51 +00:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context 
Fixes gh-28814
 2022-01-18 20:34:08 +00:00
Andy Wilkinson 4d3af14a1a Upgrade to Spring Web Services 4.0.0-M1 
Closes gh-28648
 2022-01-18 18:05:24 +00:00
Andy Wilkinson 26fecbe230 Upgrade to Thymeleaf and Security Extras 3.1.0-M1 
Closes gh-49452
Closes gh-49453
 2022-01-18 16:01:29 +00:00
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 2022-01-18 16:01:29 +00:00
Stephane Nicoll 5c9e59493d Upgrade to Spring Data 2021.2.0-M2 
Closes gh-29223
 2022-01-18 09:57:10 +01:00
rstoyanchev 68f4938367 Update GraphQL QBE auto-config 
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
 2022-01-18 09:50:31 +01:00
Stephane Nicoll f08a417462 Upgrade to Spring Security 6.0.0-M1 
Closes gh-28643
 2022-01-18 08:59:57 +01:00
Stephane Nicoll e5f981ea5f Upgrade to Spring AMQP 3.0.0-M1 
Closes gh-28646
 2022-01-18 08:58:14 +01:00
Stephane Nicoll 0ec9e6e7a8 Upgrade to Spring Kafka 3.0.0-M1 
Closes gh-28647
 2022-01-18 08:57:46 +01:00
Andy Wilkinson 964f028f75 Upgrade to Spring REST Docs 3.0.0-M1 
Closes gh-28721
 2022-01-17 18:09:07 +00:00
Andy Wilkinson db6e9a7a5f Start building against Spring Batch 5.0 snapshots 
This commit adapts to some changes in Spring Batch 5.0:

- A DataSource bean is now required by Batch
- A PlatformTransactionManager bean is no longer defined by Batch

See gh-29278
 2022-01-17 16:17:49 +00:00
Andy Wilkinson e23aaba32b Merge branch '2.6.x' into 2.7.x 
Closes gh-29323
 2022-01-17 13:21:19 +00:00
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29322
 2022-01-17 13:20:29 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE 
Closes gh-29321
 2022-01-17 13:05:15 +00:00
Stephane Nicoll 3bbdbd9e5f Upgrade to Spring Security 5.7.0-M1 
Closes gh-29225
 2022-01-17 08:47:25 +01:00
Stephane Nicoll ce6cc77ea7 Upgrade to Spring Kafka 2.8.2 
Closes gh-29224
 2022-01-17 08:46:43 +01:00
Stephane Nicoll 77e9047d31 Upgrade to Spring AMQP 2.4.2 
Closes gh-29284
 2022-01-17 08:46:16 +01:00
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2 
Closes gh-29319
 2022-01-17 08:44:50 +01:00
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2 
Closes gh-29318
 2022-01-17 08:44:15 +01:00
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10 
Closes gh-29313
 2022-01-17 08:41:47 +01:00
Stephane Nicoll 263dcde179 Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29436
 2022-01-16 12:08:10 +01:00
Stephane Nicoll 6c66ee5b82 Upgrade to MongoDB 4.4.1 
Closes gh-29435
 2022-01-16 12:08:09 +01:00
Stephane Nicoll 60d7968780 Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29434
 2022-01-16 12:08:08 +01:00
Stephane Nicoll 4304a57980 Upgrade to Jedis 3.7.1 
Closes gh-29433
 2022-01-16 12:08:07 +01:00
Stephane Nicoll 8febc140ac Upgrade to Elasticsearch 7.16.2 
Closes gh-29432
 2022-01-16 12:08:06 +01:00
Stephane Nicoll 1e719c1d07 Upgrade to Couchbase Client 3.2.4 
Closes gh-29431
 2022-01-16 12:08:05 +01:00
Stephane Nicoll 3510796ab0 Upgrade to Spring Data 2022.0.0-M1 
Closes gh-28641
 2022-01-16 11:28:22 +01:00
Stephane Nicoll 4025a8cf4c Upgrade to Spring LDAP 3.0.0-M1 
Closes gh-29430
 2022-01-16 11:26:26 +01:00
Stephane Nicoll 4f8af5a4b0 Upgrade to Spring HATEOAS 2.0.0-M1 
Closes gh-28869
 2022-01-16 11:24:29 +01:00
Stephane Nicoll 2f7d62eae9 Upgrade to SLF4J 1.7.33 
Closes gh-29427
 2022-01-15 17:50:04 +01:00
Stephane Nicoll 781ad288b0 Upgrade to SendGrid 4.8.2 
Closes gh-29426
 2022-01-15 17:50:04 +01:00
Stephane Nicoll a15ff0692c Upgrade to Rabbit AMQP Client 5.14.1 
Closes gh-29425
 2022-01-15 17:50:04 +01:00
Stephane Nicoll 6be4146907 Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29424
 2022-01-15 17:50:04 +01:00
Stephane Nicoll 0cb553c0da Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29423
 2022-01-15 17:50:04 +01:00
Stephane Nicoll 998c7996aa Upgrade to Netty 4.1.73.Final 
Closes gh-29422
 2022-01-15 17:50:03 +01:00
Stephane Nicoll 3830e7a3bb Upgrade to Neo4j Java Driver 4.4.2 
Closes gh-29421
 2022-01-15 17:50:03 +01:00
Stephane Nicoll 5676e796d0 Upgrade to MongoDB 4.4.1 
Closes gh-29420
 2022-01-15 17:50:03 +01:00
Stephane Nicoll db389d7cac Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29419
 2022-01-15 17:50:03 +01:00
Stephane Nicoll da3de9684a Upgrade to Maven Compiler Plugin 3.9.0 
Closes gh-29418
 2022-01-15 17:50:03 +01:00
Stephane Nicoll 28ecf53762 Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29417
 2022-01-15 17:50:03 +01:00
Stephane Nicoll b2c92457ab Upgrade to Jedis 3.8.0 
Closes gh-29416
 2022-01-15 17:50:02 +01:00
Stephane Nicoll 2c403cb0e8 Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29415
 2022-01-15 17:50:02 +01:00
Stephane Nicoll cf3935073f Upgrade to Byte Buddy 1.12.7 
Closes gh-29414
 2022-01-15 17:50:02 +01:00
Stephane Nicoll 998a74bf97 Upgrade to Build Helper Maven Plugin 3.3.0 
Closes gh-29413
 2022-01-15 17:50:02 +01:00
Stephane Nicoll 388b12a048 Upgrade to Spring LDAP 2.4.0-M1 
Closes gh-29222
 2022-01-15 17:50:02 +01:00
Stephane Nicoll 7c85d2bc07 Upgrade to Spring HATEOAS 1.5.0-M1 
Closes gh-29353
 2022-01-15 15:07:27 +01:00
Phillip Webb 3146465d25 Merge branch '2.7.x' 2022-01-14 22:56:52 -08:00
Phillip Webb a2e473ec31 Merge branch '2.6.x' into 2.7.x 2022-01-14 22:56:43 -08:00
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic 
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
 2022-01-14 22:55:26 -08:00
Phillip Webb d0e7ab3b70 Merge branch '2.7.x' 
Closes gh-29412
 2022-01-14 20:33:42 -08:00
Phillip Webb e4e16f81ec Merge branch '2.6.x' into 2.7.x 
Closes gh-29411
 2022-01-14 20:33:19 -08:00
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x 
Closes gh-29410
 2022-01-14 20:33:05 -08:00
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic 
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
 2022-01-14 20:32:34 -08:00
Phillip Webb 0367e13d90 Merge branch '2.7.x' 2022-01-14 17:38:49 -08:00
Phillip Webb 9c481952d8 Remove deprecated convertEnvironment method 2022-01-14 17:38:23 -08:00
Phillip Webb 32e8b30c36 Merge branch '2.7.x' 
Closes gh-29408
 2022-01-14 17:36:20 -08:00
Phillip Webb 9764b3eba0 Change getEnvironment() to return null by default 
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.

Closes gh-29405
 2022-01-14 17:35:58 -08:00
Phillip Webb 05a1ef233a Merge branch '2.7.x' 
Closes gh-29407
 2022-01-14 16:33:20 -08:00
Phillip Webb c84d3c14fb Allow test property sources to override command line args 
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.

Closes gh-29404
 2022-01-14 16:30:28 -08:00
Phillip Webb cb97aff1e7 Merge branch '2.7.x' 2022-01-14 13:57:35 -08:00
Phillip Webb 9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -08:00
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it 
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
 2022-01-14 13:47:22 -08:00
Brian Clozel fe82098d7d Merge branch '2.7.x' 2022-01-14 21:07:45 +01:00
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes 
See spring-projects/spring-graphql#244
 2022-01-14 21:05:15 +01:00
Andy Wilkinson d60da1cc59 Merge branch '2.7.x' 2022-01-14 15:56:03 +00:00
Andy Wilkinson b67cc62c37 Merge branch '2.6.x' into 2.7.x 
Closes gh-29402
 2022-01-14 15:55:54 +00:00
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x 
Closes gh-29401
 2022-01-14 15:55:41 +00:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization 
Closes gh-29394
 2022-01-14 15:51:08 +00:00
Andy Wilkinson 16447e1bce Merge branch '2.7.x' 2022-01-14 15:50:12 +00:00
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x 
Closes gh-29400
 2022-01-14 15:49:39 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x 
Closes gh-29399
 2022-01-14 15:48:57 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo 
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
 2022-01-14 15:48:31 +00:00
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2 
Closes gh-29398
 2022-01-14 15:54:48 +01:00
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33 
Closes gh-29397
 2022-01-14 15:49:56 +01:00
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29396
 2022-01-14 15:49:55 +01:00
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29395
 2022-01-14 15:49:54 +01:00
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1 
Closes gh-29317
 2022-01-14 15:44:45 +01:00
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1 
Closes gh-29283
 2022-01-14 15:44:16 +01:00
Andy Wilkinson 15dafebe0d Polish "Avoid split java.xml packages that cause JDT compile errors" 
See gh-29389
 2022-01-14 12:43:16 +00:00
Dave Syer 32a6c7df49 Avoid split java.xml packages that cause JDT compile errors 
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.

See gh-29389
 2022-01-14 12:42:02 +00:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33 
Closes gh-29392
 2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29391
 2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14 
Closes gh-29312
 2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8 
Closes gh-29311
 2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7 
Closes gh-29352
 2022-01-14 12:10:46 +01:00
Stephane Nicoll abb88b9aeb Upgrade to Micrometer 2.0.0-M1 
Closes gh-29279
 2022-01-14 09:09:17 +01:00
Andy Wilkinson a79cba129f Remove faulty javadoc styling 
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.

See gh-28101
 2022-01-13 15:39:34 +00:00
Stephane Nicoll 9a9cfa78c8 Merge branch '2.7.x' 2022-01-13 15:31:38 +01:00
Stephane Nicoll 77a9d0b6f1 Merge branch '2.6.x' into 2.7.x 
Closes gh-29381
 2022-01-13 15:31:31 +01:00
Omkar Shetkar c19e192acd Fix duplicate "Logging" link 
See gh-29380
 2022-01-13 15:30:21 +01:00
Stephane Nicoll 5161e5a5f2 Upgrade to Spring Framework 6.0.0-M2 
Closes gh-28642
 2022-01-13 14:41:50 +01:00
Stephane Nicoll d82fbcb43b Upgrade to Micrometer 1.9.0-M2 
Closes gh-29282
 2022-01-13 14:40:27 +01:00
Stephane Nicoll 7a0f7c498f Upgrade to Spring Framework 5.3.15 
Closes gh-29328
 2022-01-13 14:39:51 +01:00
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2 
Closes gh-29316
 2022-01-13 14:38:40 +01:00
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15 
Closes gh-29327
 2022-01-13 14:38:07 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8 
Closes gh-29310
 2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15 
Closes gh-29326
 2022-01-13 14:36:10 +01:00
Stephane Nicoll 4dac38cb63 Merge branch '2.7.x' 2022-01-13 08:46:08 +01:00
Stephane Nicoll 1bf13371c4 Merge branch '2.6.x' into 2.7.x 
Closes gh-29378
 2022-01-13 08:45:59 +01:00
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x 
Closes gh-29377
 2022-01-13 08:45:48 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file 
See gh-29112
 2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests 
See gh-29112
 2022-01-13 08:42:36 +01:00
Phillip Webb 13f257a706 Merge branch '2.7.x' 2022-01-12 15:44:47 -08:00
Phillip Webb 8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08:00
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb 27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb 3d6840e715 Merge branch '2.7.x' 
Closes gh-29376
 2022-01-12 15:32:51 -08:00
Phillip Webb fee45e056a Merge branch '2.6.x' into 2.7.x 
Closes gh-29375
 2022-01-12 15:32:34 -08:00
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x 
Closes gh-29374
 2022-01-12 15:32:00 -08:00
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting 
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
 2022-01-12 14:21:52 -08:00
Phillip Webb 1b7db2750d Merge branch '2.7.x' 
Closes gh-29373
 2022-01-12 14:08:04 -08:00
Phillip Webb e1c84e2972 Merge branch '2.6.x' into 2.7.x 
Closes gh-29372
 2022-01-12 14:07:48 -08:00
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x 
Closes gh-29371
 2022-01-12 14:07:31 -08:00
Phillip Webb 9cf55808fb Ensure run user actually exists 
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
 2022-01-12 14:05:30 -08:00
Phillip Webb ef9a258174 Merge branch '2.7.x' 
Closes gh-29369
 2022-01-12 13:54:52 -08:00
Phillip Webb ae4d9ccb2d Merge branch '2.6.x' into 2.7.x 
Closes gh-29368
 2022-01-12 13:54:39 -08:00
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x 
Closes gh-29367
 2022-01-12 13:54:23 -08:00
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2 
Closes gh-29366
 2022-01-12 13:52:43 -08:00
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final 
Closes gh-29351
 2022-01-12 14:33:55 +01:00
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1 
Closes gh-29350
 2022-01-12 14:33:54 +01:00
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29349
 2022-01-12 14:33:52 +01:00
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10 
Closes gh-29348
 2022-01-12 14:33:51 +01:00
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29347
 2022-01-12 14:33:50 +01:00
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29346
 2022-01-12 14:33:49 +01:00
Stephane Nicoll 98118bc480 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29345
 2022-01-12 14:33:47 +01:00
Stephane Nicoll 838cded308 Upgrade to Infinispan 12.1.11.Final 
Closes gh-29344
 2022-01-12 14:33:46 +01:00
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3 
Closes gh-29343
 2022-01-12 14:33:45 +01:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final 
Closes gh-29341
 2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29340
 2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10 
Closes gh-29339
 2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29338
 2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29337
 2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29336
 2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final 
Closes gh-29335
 2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3 
Closes gh-29334
 2022-01-12 13:51:15 +01:00
Stephane Nicoll 315fa45f46 Start building against Spring Security 5.7.0-M1 snapshots 
See gh-29225
 2022-01-12 13:43:22 +01:00
Stephane Nicoll 90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll be55ea9c29 Start building against Spring Framework 5.3.15 snapshots 
See gh-29328
 2022-01-12 09:31:04 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots 
See gh-29327
 2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots 
See gh-29326
 2022-01-12 09:29:36 +01:00
Andy Wilkinson 2a95bfed5c Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29323
 2022-01-11 20:28:10 +00:00
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29322
 2022-01-11 20:27:19 +00:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots 
See gh-29321
 2022-01-11 20:09:39 +00:00
Stephane Nicoll fb399ec284 Merge branch '2.7.x' 2022-01-11 17:33:18 +01:00
Stephane Nicoll 34576f07d8 Upgrade to Reactor 2020.0.15 
Closes gh-29280
 2022-01-11 17:27:03 +01:00
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots 
See gh-29320
 2022-01-11 17:24:50 +01:00
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots 
See gh-29319
 2022-01-11 17:24:49 +01:00
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots 
See gh-29318
 2022-01-11 17:24:49 +01:00
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots 
See gh-29317
 2022-01-11 17:24:49 +01:00
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots 
See gh-29316
 2022-01-11 17:24:48 +01:00
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15 
Closes gh-29315
 2022-01-11 17:24:46 +01:00
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots 
See gh-29314
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots 
See gh-29313
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots 
See gh-29312
 2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots 
See gh-29310
 2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15 
Closes gh-29309
 2022-01-11 17:22:18 +01:00
Stephane Nicoll 1c9e7d7c8e Start building against Spring Session 2021.2.0-M1 snapshots 
See gh-29226
 2022-01-11 11:15:28 +01:00
Stephane Nicoll 88049ff11a Merge branch '2.7.x' 2022-01-11 11:09:11 +01:00
Stephane Nicoll ca432309aa Polish "Add option to allow Spring Batch custom isolation levels" 
See gh-28859
 2022-01-11 11:07:08 +01:00
stibi a8d1d3104e Add option to allow Spring Batch custom isolation levels 
See gh-28859
 2022-01-11 10:39:01 +01:00
Brian Clozel fc794f17e1 Update GraphiQlHandler configuration 
This commit updates the `GraphiQlHandler` auto-configuration after a
constructor change was done in Spring GraphQL for WebSocket support in
GraphiQL.
 2022-01-10 18:27:50 +01:00
Stephane Nicoll 2078a7f3e1 Merge branch '2.7.x' 2022-01-10 16:28:36 +01:00
Stephane Nicoll e92e35d56f Polish "Stop configuring a default user with SAML 2.0 Login" 
See gh-29263
 2022-01-10 16:25:43 +01:00
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login 
See gh-29263
 2022-01-10 16:22:00 +01:00
Brian Clozel b7de02d908 Fix build after Spring GraphQL changes 
See pring-projects/spring-graphql#229
 2022-01-10 14:17:31 +01:00
Stephane Nicoll 8ec8268a77 Merge branch '2.7.x' 2022-01-10 12:07:19 +01:00
Stephane Nicoll c02faea9c9 Allow WebMvcFilter to be overridden by user configuration 
Closes gh-28428
 2022-01-10 12:02:08 +01:00
Stephane Nicoll 0af6761993 Merge branch '2.7.x' 2022-01-10 10:29:58 +01:00
Stephane Nicoll 270e162479 Stop aliasing MariaDB to MySQL 
Closes gh-28728
 2022-01-10 10:29:49 +01:00
Brian Clozel b17412eb38 Fix Auto-configured Spring GraphQL Tests docs 
Prior to this change, the reference docs would point to "spring-webflux"
as the required additional testing dependency to get
`WebGraphQlTester` support in Spring Boot tests.

While this is enough for `WebEnvironment.MOCK` tests, we need an actual
HTTP client for `WebEnvironment.RANDOM_PORT` tests. This commit amends
this part of the documentation to recommend the
"spring-boot-starter-webflux" dependency in all cases.

Fixes gh-29250
 2022-01-10 10:10:10 +01:00
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch 
See gh-29292
 2022-01-09 22:24:05 +01:00
Stephane Nicoll f8aa8a9742 Remove unnecessary exclude 
See gh-29292
 2022-01-09 15:23:43 +01:00
Stephane Nicoll 0f93c6c475 Start building against Spring Integration 5.5.8 snapshots 
See gh-29286
 2022-01-09 10:23:22 +01:00
Stephane Nicoll 0412e86a4f Start building against Spring LDAP 2.4.0-M1 snapshots 
See gh-29222
 2022-01-09 10:08:47 +01:00
Stephane Nicoll 066bfb3635 Start building against Spring Kafka 2.8.2 snapshots 
See gh-29224
 2022-01-09 10:08:06 +01:00
Stephane Nicoll 6cbc0e7ac5 Start building against Spring AMQP 2.4.2 snapshots 
See gh-29284
 2022-01-09 10:07:39 +01:00
Stephane Nicoll 6e27448744 Start building against Micrometer 1.9.0-M2 snapshots 
See gh-29282
 2022-01-09 10:07:06 +01:00
Stephane Nicoll 9e27bddfc7 Start building against Spring Data 2021.2.0-M1 snapshots 
This commit also upgrades to Elasticsearch 7.16.2

See gh-29223
See gh-29292
 2022-01-08 19:57:50 +01:00
Stephane Nicoll 3d927a093d Start building against Spring HATEOAS 1.4.1 snapshots 
See gh-29283
 2022-01-08 10:56:21 +01:00
Stephane Nicoll cad11addb2 Merge branch '2.7.x' 2022-01-07 17:58:35 +01:00
Stephane Nicoll 980aa616c8 Fix build failure 
See gh-29290
 2022-01-07 17:58:15 +01:00
Andy Wilkinson 894f83fb13 Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API 
Closes gh-29203
 2022-01-07 15:26:39 +00:00
Andy Wilkinson 89e79e826e Reinstate support for Apache Artemis 
See gh-29203
 2022-01-07 15:26:29 +00:00
Stephane Nicoll 9392ff59f7 Merge branch '2.7.x' 2022-01-07 15:40:59 +01:00
Stephane Nicoll 7afae4aad9 Start building against Reactor 2020.0.15 snapshots 
See gh-29280
 2022-01-07 15:39:34 +01:00
Stephane Nicoll a9d8befe72 Fix build failures 
See gh-29290
 2022-01-07 15:39:33 +01:00
Andy Wilkinson eba2c8c8fe Merge branch '2.7.x' 2022-01-07 14:04:07 +00:00
Andy Wilkinson 94fa50af1c Polish 2022-01-07 14:03:07 +00:00
Stephane Nicoll 11e604af41 Merge branch '2.7.x' 2022-01-07 14:43:19 +01:00
Stephane Nicoll 9821cdfd8b Remove deprecated code 
Closes gh-29290
 2022-01-07 14:42:14 +01:00
Stephane Nicoll aec6c1ed92 Merge branch '2.7.x' 2022-01-07 10:23:07 +01:00
Stephane Nicoll c62aa0deab Remove support for Hazelcast 3 
Closes gh-29287
 2022-01-07 10:22:27 +01:00
Stephane Nicoll 164c2f7164 Polish 
See gh-29265
 2022-01-07 10:20:11 +01:00
Andy Wilkinson 9a05eb63c4 Use built-in basic auth support as it no longer requires JAX-B 
Closes gh-28829
 2022-01-06 18:12:14 +00:00
Andy Wilkinson 29c654530c Upgrade to Prometheus Client 0.14.1 
Closes gh-29288
 2022-01-06 17:38:54 +00:00
Stephane Nicoll 025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll 69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2 
See gh-29265
 2022-01-06 17:38:06 +01:00
Andy Wilkinson 35b32bb3ff Update Javadoc to link to Java SE 17 and Jakarta EE 9 
Closes gh-29277
 2022-01-06 14:39:33 +00:00
Andy Wilkinson c2e86096cd Reinstate support for jOOQ as it now supports Jakarta EE 9 
Closes gh-29271
 2022-01-05 15:46:54 +00:00
Andy Wilkinson ccc924b908 Merge branch '2.7.x' 2022-01-05 11:58:50 +00:00
Andy Wilkinson 508d0af453 Merge branch '2.6.x' into 2.7.x 
Closes gh-29269
 2022-01-05 11:58:33 +00:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x 
Closes gh-29268
 2022-01-05 11:58:03 +00:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new 
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
 2022-01-05 11:49:48 +00:00
Stephane Nicoll bc273d6327 Merge branch '2.7.x' 2022-01-05 09:46:39 +01:00
Stephane Nicoll 8b0ea24ac2 Upgrade to Kotlin Coroutines 1.6.0 
Closes gh-29264
 2022-01-05 09:45:36 +01:00
Stephane Nicoll fed89f98aa Merge branch '2.7.x' 2022-01-05 09:36:07 +01:00
Stephane Nicoll ce7a3d0ef2 Upgrade to Flyway 8.3.0 
Closes gh-29249
 2022-01-05 09:18:23 +01:00
Stephane Nicoll 73b7b147a1 Merge branch '2.7.x' 2022-01-05 09:17:25 +01:00
Stephane Nicoll dda46fbe2b Upgrade to Liquibase 4.6.2 
Closes gh-29257
 2022-01-05 09:14:57 +01:00
Phillip Webb 06398eabed Merge branch '2.7.x' 2022-01-04 12:26:24 -08:00
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 2022-01-04 12:24:02 -08:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 760dcffd8b Merge branch '2.7.x' 2022-01-04 12:22:54 -08:00
Phillip Webb f09bde2b60 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:20:31 -08:00
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 2022-01-04 12:17:35 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Phillip Webb dc054943bf Merge branch '2.7.x' 
Closes gh-29262
 2022-01-04 12:14:18 -08:00
Phillip Webb c839ebbce4 Merge branch '2.6.x' into 2.7.x 
Closes gh-29261
 2022-01-04 12:13:55 -08:00
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors 
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
 2022-01-04 12:12:03 -08:00
Andy Wilkinson 1dbfcf8b57 Reinstate support for Spring Data Couchbase 
Closes gh-28976
 2022-01-04 16:38:16 +00:00
Stephane Nicoll e5cab660cb Upgrade to Infinispan 13.0.5.Final 
Closes gh-29256
 2022-01-04 16:51:58 +01:00
Stephane Nicoll b214841e2c Merge branch '2.7.x' 2022-01-04 16:14:28 +01:00
Stephane Nicoll 605ec2fb0e Polish "Add vendor version to JavaInfo" 
See gh-29090
 2022-01-04 16:10:02 +01:00
Jonatan Ivanov c6e6d109ad Add vendor version to JavaInfo 
See gh-29090
 2022-01-04 16:09:45 +01:00
Stephane Nicoll 9bfe3c21e5 Merge branch '2.7.x' 2022-01-04 15:57:21 +01:00
Stephane Nicoll 4799d2a71a Polish "Add transactionIdPrefix Property to KafkaTemplate" 
See gh-29089
 2022-01-04 15:54:23 +01:00
Gary Russell 33814a4a42 Add transactionIdPrefix Property to KafkaTemplate 
See gh-29089
 2022-01-04 15:39:31 +01:00
Stephane Nicoll e2f274f01d Merge branch '2.7.x' 2022-01-04 15:36:12 +01:00
Stephane Nicoll 9b34c31916 Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest" 
See gh-29003
 2022-01-04 15:32:23 +01:00
raviu 7f8dd81947 Include AbstractJdbcConfiguration beans in @DataJdbcTest 
See gh-29003
 2022-01-04 15:30:54 +01:00
Stephane Nicoll e87b4cfb5b Merge branch '2.7.x' 2022-01-04 15:04:33 +01:00
Stephane Nicoll c943ef18ca Polish "Add principal resolution in RSocket handler methods" 
See gh-28444
 2022-01-04 15:02:56 +01:00
Guirong Hu cf05964499 Add principal resolution in RSocket handler methods 
See gh-28444
 2022-01-04 14:35:12 +01:00
Stephane Nicoll abb622023d Merge branch '2.7.x' 2022-01-04 14:23:48 +01:00
Stephane Nicoll d24720d958 Polish "Expose OS information as an InfoContributor" 
See gh-28907
 2022-01-04 14:08:24 +01:00
Jonatan Ivanov c700f686c6 Expose OS information as an InfoContributor 
See gh-28907
 2022-01-04 13:58:39 +01:00
Stephane Nicoll 4442f91f63 Merge branch '2.7.x' 2022-01-04 12:46:33 +01:00
Stephane Nicoll 076ddc8579 Polish "Add server.netty.max-keep-alive-requests" 
See gh-28875
 2022-01-04 10:42:34 +01:00
Leo Li 0e94b2ce6e Add server.netty.max-keep-alive-requests 
See gh-28875
 2022-01-04 10:42:34 +01:00
Stephane Nicoll 8cb6a79e60 Merge branch '2.7.x' 2022-01-04 10:41:59 +01:00
Stephane Nicoll 578855f512 Restore support for Hazelcast 3 
See gh-28801
 2022-01-04 10:39:20 +01:00
Stephane Nicoll 64062adf0d Merge branch '2.7.x' 2022-01-04 09:58:24 +01:00
Stephane Nicoll e1a5be83d2 Polish "Inject SpringManagedContext into Hazelcast configuration" 
See gh-28801
 2022-01-04 09:57:48 +01:00
Jaromir Hamala b875b55711 Inject SpringManagedContext into Hazelcast configuration 
This commit makes it possible to inject Spring managed beans into
objects instantiated by Hazelcast.

See gh-28801
 2022-01-04 09:04:49 +01:00
Stephane Nicoll e378705383 Merge branch '2.7.x' 2022-01-04 08:40:15 +01:00
Stephane Nicoll f26bee1196 Polish "Upgrade to Embedded Mongo 3.2.5" 
See gh-28543
 2022-01-04 08:39:11 +01:00
Julien Herr 679231c120 Upgrade to Embedded Mongo 3.2.5 
See gh-28543
 2022-01-03 17:59:26 +01:00
Brian Clozel c5817f21eb Add property for disabling GraphQL schema introspection 
Prior to this commit, the GraphQL schema assembled by the
auto-configuration would provide no option for disabling the field
introspection.

While this feature is essential for many tools (including GraphiQL),
some prefer disabling it because this allows clients to gather
information about types and schema easily. This commit introduces a new
`spring.graphql.schema.introspection.enabled` configuration property.

Because potential attackers can still gather this information and this
feature is a core concern in the GraphQL spec, introspection is enabled
by default for Spring Boot applications.

Closes gh-29248
 2022-01-03 17:36:58 +01:00
izeye 728206dba0 Polish GraphQL changes 
See gh-29140
Closes gh-29194
 2022-01-03 17:36:57 +01:00
Brian Clozel 0d616b8924 Fix WebGraphQlTester auto-registration for SpringBootTest 
Prior to this commit, the `GraphQlTesterContextCustomizer` would
register a `WebGraphQlTester` instance as a `GraphQlTester` bean., only
exposing the `GraphQlTester` type. This is not in line with the
documentation and also does not register the bean definition with the
most specific type.
With this issue, a `@SpringBootTest` integration test will not be
injected with a `WebGraphQlTester` if it asks one.

This commit ensures that the `WebGraphQlTester` is registered as such
and that all related classes are renamed as a result.

Fixes gh-29250
 2022-01-03 17:36:57 +01:00
Stephane Nicoll 09a71e5047 Merge branch '2.7.x' 2022-01-03 14:50:36 +01:00
Stephane Nicoll b81c0047f8 Polish "Log the reason that led Devtools to restart the app" 
See gh-28495
 2022-01-03 14:48:39 +01:00
Artur Signell 0769b33e2e Log the reason that led Devtools to restart the app 
See gh-28495
 2022-01-03 14:25:12 +01:00
Stephane Nicoll 8b21c71fd6 Merge branch '2.7.x' 2022-01-03 14:22:25 +01:00
Stephane Nicoll 91d7295c62 Polish "Add support for IdlePartitionEventInterval" 
See gh-28290
 2022-01-03 14:20:56 +01:00
Pascal Ayotte 9274baeb68 Add support for IdlePartitionEventInterval 
See gh-28290
 2022-01-03 14:16:19 +01:00
Stephane Nicoll 5864c300e0 Merge branch '2.7.x' 2022-01-03 14:11:47 +01:00
Stephane Nicoll 6b6da22f2c Polish "Add support for RabbitStreamTemplate" 
See gh-28060
 2022-01-03 14:02:27 +01:00
Eddú Meléndez 3952046132 Add support for RabbitStreamTemplate 
See gh-28060
 2022-01-03 13:30:10 +01:00
Stephane Nicoll cd0bb8e68f Upgrade to XmlUnit2 2.8.4 
Closes gh-29247
 2022-01-03 11:05:57 +01:00
Stephane Nicoll 67f8b0484d Upgrade to Undertow 2.2.14.Final 
Closes gh-29246
 2022-01-03 11:05:57 +01:00
Stephane Nicoll 714c1cc642 Upgrade to Thymeleaf 3.0.14.RELEASE 
Closes gh-29244
 2022-01-03 11:05:57 +01:00
Stephane Nicoll 0d8fc234b5 Upgrade to Spring WS 3.1.2 
Closes gh-29243
 2022-01-03 11:05:57 +01:00
Stephane Nicoll 0106e35b61 Upgrade to Spring Integration 5.5.7 
Closes gh-29242
 2022-01-03 11:05:56 +01:00
Stephane Nicoll 7890919958 Upgrade to Spring AMQP 2.4.1 
Closes gh-29241
 2022-01-03 11:05:56 +01:00
Stephane Nicoll ec0dd5bf33 Upgrade to SnakeYAML 1.30 
Closes gh-29240
 2022-01-03 11:05:56 +01:00
Stephane Nicoll b76691a4b0 Upgrade to SendGrid 4.8.1 
Closes gh-29239
 2022-01-03 11:05:56 +01:00
Stephane Nicoll 7a016a68f1 Upgrade to Selenium HtmlUnit 3.56.0 
Closes gh-29238
 2022-01-03 11:05:56 +01:00
Stephane Nicoll a2bed160f0 Upgrade to Selenium 4.1.1 
Closes gh-29237
 2022-01-03 11:04:53 +01:00
Stephane Nicoll 017d3dc402 Upgrade to Reactor Bom 2020.0.14 
Closes gh-29236
 2022-01-03 09:42:40 +01:00
Stephane Nicoll ddc7da7766 Upgrade to Rabbit AMQP Client 5.14.0 
Closes gh-29235
 2022-01-03 09:42:38 +01:00
Stephane Nicoll 2c322b67f1 Upgrade to Prometheus Client 0.14.1 
Closes gh-29234
 2022-01-03 09:42:37 +01:00
Stephane Nicoll 86a426035d Upgrade to Oracle Database 21.4.0.0.1 
Closes gh-29233
 2022-01-03 09:42:36 +01:00
Stephane Nicoll 2c82b18f3f Upgrade to Netty 4.1.72.Final 
Closes gh-29232
 2022-01-03 09:42:35 +01:00
Stephane Nicoll 61a65c0a93 Upgrade to MSSQL JDBC 9.4.1.jre8 
Closes gh-29231
 2022-01-03 09:42:34 +01:00
Stephane Nicoll df1a9b848b Upgrade to Mockito 4.2.0 
Closes gh-29230
 2022-01-03 09:42:33 +01:00
Stephane Nicoll 765c81c2f0 Upgrade to Logback 1.2.10 
Closes gh-29229
 2022-01-03 09:42:32 +01:00
Stephane Nicoll 179414c7f3 Upgrade to JUnit Jupiter 5.8.2 
Closes gh-29227
 2022-01-03 09:42:29 +01:00
Stephane Nicoll 78873706cf Upgrade to JDOM2 2.0.6.1 
Closes gh-29221
 2022-01-03 09:34:40 +01:00
Stephane Nicoll de22f47541 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29220
 2022-01-03 09:34:40 +01:00
Stephane Nicoll 23a1dc9938 Upgrade to Jackson Bom 2.13.1 
Closes gh-29219
 2022-01-03 09:34:39 +01:00
Stephane Nicoll 18df80df17 Upgrade to HttpCore5 5.1.3 
Closes gh-29218
 2022-01-03 09:34:39 +01:00
Stephane Nicoll 46f17d8a50 Upgrade to HttpCore 4.4.15 
Closes gh-29217
 2022-01-03 09:34:39 +01:00
Stephane Nicoll 5a641fd50e Upgrade to HttpAsyncClient 4.1.5 
Closes gh-29216
 2022-01-03 09:34:39 +01:00
Stephane Nicoll 8da7be8e32 Upgrade to HtmlUnit 2.56.0 
Closes gh-29215
 2022-01-03 09:34:39 +01:00
Stephane Nicoll 464ea36ef5 Upgrade to Hibernate 5.6.3.Final 
Closes gh-29214
 2022-01-03 09:34:39 +01:00
Stephane Nicoll 9e443d772f Upgrade to Hazelcast 4.2.4 
Closes gh-29213
 2022-01-03 09:34:38 +01:00