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
32,661 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

13610 Commits

Author SHA1 Message Date
Andy Wilkinson eecb7dd101 Remove stale jboss-transaction-spi dependencies 
Closes gh-26569
 2021-05-17 13:49:16 +01:00
Andy Wilkinson 513dd82bed Upgrade to Kotlin Coroutines 1.5.0 
Closes gh-26568
 2021-05-17 13:39:59 +01:00
Andy Wilkinson af506685be Upgrade to Thymeleaf Layout Dialect 2.5.3 
Closes gh-26566
 2021-05-17 13:39:58 +01:00
Andy Wilkinson 17506c7e13 Upgrade to Solr 8.8.2 
Closes gh-26565
 2021-05-17 13:39:58 +01:00
Andy Wilkinson 6d786ecfe1 Upgrade to SAAJ Impl 1.5.3 
Closes gh-26564
 2021-05-17 13:39:58 +01:00
Andy Wilkinson d3e8d1533f Upgrade to R2DBC Bom Arabba-SR10 
Closes gh-26563
 2021-05-17 13:39:58 +01:00
Andy Wilkinson b62a011643 Upgrade to Postgresql 42.2.20 
Closes gh-26562
 2021-05-17 13:39:58 +01:00
Andy Wilkinson f6d89fd940 Upgrade to Pooled JMS 1.2.2 
Closes gh-26561
 2021-05-17 13:39:58 +01:00
Andy Wilkinson ef89622a10 Upgrade to Netty tcNative 2.0.39.Final 
Closes gh-26560
 2021-05-17 13:39:57 +01:00
Andy Wilkinson 2d39269368 Upgrade to Netty 4.1.64.Final 
Closes gh-26559
 2021-05-17 13:39:57 +01:00
Andy Wilkinson c9814abe16 Upgrade to Neo4j Java Driver 4.2.5 
Closes gh-26558
 2021-05-17 13:39:57 +01:00
Andy Wilkinson 0e16c58ed6 Upgrade to MySQL 8.0.25 
Closes gh-26557
 2021-05-17 13:39:57 +01:00
Andy Wilkinson 0575f2f60a Upgrade to MariaDB 2.7.3 
Closes gh-26556
 2021-05-17 13:39:57 +01:00
Andy Wilkinson 27d599b9e2 Upgrade to Liquibase 4.3.5 
Closes gh-26555
 2021-05-17 13:39:57 +01:00
Andy Wilkinson 23c957a563 Upgrade to Lettuce 6.1.2.RELEASE 
Closes gh-26554
 2021-05-17 13:39:56 +01:00
Andy Wilkinson 4bbcc3edda Upgrade to Kafka 2.7.1 
Closes gh-26552
 2021-05-17 13:39:56 +01:00
Andy Wilkinson 4b132628a7 Upgrade to JUnit Jupiter 5.7.2 
Closes gh-26551
 2021-05-17 13:39:56 +01:00
Andy Wilkinson f1e4cc1c28 Upgrade to Json-smart 2.4.7 
Closes gh-26550
 2021-05-17 13:39:56 +01:00
Andy Wilkinson 7729755cd6 Upgrade to jOOQ 3.14.9 
Closes gh-26549
 2021-05-17 13:39:56 +01:00
Andy Wilkinson 875a31a70d Upgrade to Johnzon 1.2.11 
Closes gh-26548
 2021-05-17 13:39:56 +01:00
Andy Wilkinson 6f72007d77 Upgrade to Jetty 9.4.40.v20210413 
Closes gh-26547
 2021-05-17 13:39:55 +01:00
Andy Wilkinson ed316c43d5 Upgrade to Jetty Reactive HTTPClient 1.1.8 
Closes gh-26546
 2021-05-17 13:39:55 +01:00
Andy Wilkinson 416511bb98 Upgrade to Jedis 3.6.0 
Closes gh-26545
 2021-05-17 13:39:55 +01:00
Andy Wilkinson 0322a3931f Upgrade to JBoss Transaction SPI 7.6.1.Final 
Closes gh-26544
 2021-05-17 13:39:55 +01:00
Andy Wilkinson 2f4fbfdcf8 Upgrade to Janino 3.1.4 
Closes gh-26543
 2021-05-17 13:39:55 +01:00
Andy Wilkinson b7c8badfe8 Upgrade to Infinispan 12.1.3.Final 
Closes gh-26542
 2021-05-17 13:39:55 +01:00
Andy Wilkinson 23e02cada1 Upgrade to HttpCore5 5.1.1 
Closes gh-26541
 2021-05-17 13:39:55 +01:00
Andy Wilkinson a78e50bcc3 Upgrade to HttpClient5 5.0.4 
Closes gh-26540
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 544abfd9ae Upgrade to Hibernate 5.4.31.Final 
Closes gh-26539
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 93b385421d Upgrade to Hazelcast 4.1.3 
Closes gh-26538
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 466a9e3421 Upgrade to Groovy 3.0.8 
Closes gh-26537
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 53e178e1c4 Upgrade to Glassfish JAXB 2.3.4 
Closes gh-26536
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 2a28f34717 Upgrade to Elasticsearch 7.12.1 
Closes gh-26535
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 25f529a5f2 Upgrade to Ehcache3 3.9.3 
Closes gh-26534
 2021-05-17 13:39:54 +01:00
Andy Wilkinson 0bc37852a3 Upgrade to Ehcache 2.10.9.2 
Closes gh-26533
 2021-05-17 13:39:53 +01:00
Andy Wilkinson 3099866cf4 Upgrade to Dropwizard Metrics 4.1.21 
Closes gh-26532
 2021-05-17 13:39:53 +01:00
Andy Wilkinson 24d252e322 Upgrade to Couchbase Client 3.1.5 
Closes gh-26531
 2021-05-17 13:39:53 +01:00
Andy Wilkinson 78f7044097 Upgrade to Cassandra Driver 4.11.1 
Closes gh-26530
 2021-05-17 13:39:53 +01:00
Andy Wilkinson a27b34680e Upgrade to Caffeine 2.9.1 
Closes gh-26529
 2021-05-17 13:39:53 +01:00
Andy Wilkinson 9a981f0bc5 Upgrade to ActiveMQ 5.16.2 
Closes gh-26528
 2021-05-17 13:39:53 +01:00
Andy Wilkinson 7526ea860d Update upgrade policy following release of RC1 
Closes gh-26527
 2021-05-17 13:39:53 +01:00
Stephane Nicoll 582d7b46fd Merge branch '2.4.x' 
Closes gh-26571
 2021-05-17 14:36:44 +02:00
Stephane Nicoll ef093bc9c6 Merge branch '2.3.x' into 2.4.x 
Closes gh-26570
 2021-05-17 14:24:03 +02:00
Stephane Nicoll 306b6f6999 Configure SessionCookieConfig in MockServletWebServer 
Closes gh-26479
 2021-05-17 14:05:45 +02:00
Andy Wilkinson 4bf5ff8a68 Merge branch '2.4.x' 
Closes gh-26526
 2021-05-17 11:52:53 +01:00
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x 
Closes gh-26525
 2021-05-17 11:48:34 +01:00
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies" 
See gh-25944
 2021-05-17 11:44:23 +01:00
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies 
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
 2021-05-17 11:29:36 +01:00
Andy Wilkinson e317079446 Merge branch '2.4.x' 
Closes gh-26524
 2021-05-17 11:27:57 +01:00
Andy Wilkinson 49d362fd7f Merge branch '2.3.x' into 2.4.x 
Closes gh-26523
 2021-05-17 11:27:46 +01:00
weixsun 7f445630e4 Remove unnecessary semicolon 
See gh-26446
 2021-05-17 11:26:57 +01:00
Andy Wilkinson 05a64ecb2c Merge branch '2.4.x' 
Closes gh-26522
 2021-05-17 11:24:29 +01:00
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26521
 2021-05-17 11:22:48 +01:00
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance" 
See gh-26227
 2021-05-17 11:07:42 +01:00
Carlos Rafael de Oliveira Carneiro a6fa8addb9 Improve documentation of TestRestTemplate's fault tolerance 
See gh-26227
 2021-05-17 11:07:42 +01:00
Stephane Nicoll d3c817b7ba Polish "Remove unnecessary throws declaration in tests" 
See gh-26441
 2021-05-17 09:36:53 +02:00
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests 
See gh-26441
 2021-05-17 09:31:51 +02:00
Stephane Nicoll 87d986f9b8 Upgrade to Thymeleaf Layout Dialect 2.5.3 
Closes gh-26518
 2021-05-17 08:51:44 +02:00
Stephane Nicoll 7152c21641 Upgrade to R2DBC Bom Arabba-SR10 
Closes gh-26517
 2021-05-17 08:51:43 +02:00
Stephane Nicoll 6004835fd2 Upgrade to Postgresql 42.2.20 
Closes gh-26516
 2021-05-17 08:51:42 +02:00
Stephane Nicoll f84f9f347d Upgrade to Pooled JMS 1.2.2 
Closes gh-26515
 2021-05-17 08:51:40 +02:00
Stephane Nicoll 5efc9d5aa6 Upgrade to Netty tcNative 2.0.39.Final 
Closes gh-26514
 2021-05-17 08:51:39 +02:00
Stephane Nicoll 67b9aca437 Upgrade to Neo4j Java Driver 4.1.2 
Closes gh-26513
 2021-05-17 08:51:38 +02:00
Stephane Nicoll 35310b8f9b Upgrade to MySQL 8.0.25 
Closes gh-26512
 2021-05-17 08:51:37 +02:00
Stephane Nicoll d4c502e60c Upgrade to MariaDB 2.7.3 
Closes gh-26511
 2021-05-17 08:51:36 +02:00
Stephane Nicoll 0e1d107b82 Upgrade to Lettuce 6.0.5.RELEASE 
Closes gh-26510
 2021-05-17 08:51:35 +02:00
Stephane Nicoll f3f6294fe2 Upgrade to JUnit Jupiter 5.7.2 
Closes gh-26509
 2021-05-17 08:51:34 +02:00
Stephane Nicoll dc58916603 Upgrade to Json-smart 2.3.1 
Closes gh-26508
 2021-05-17 08:51:33 +02:00
Stephane Nicoll 4da1e1351a Upgrade to jOOQ 3.14.9 
Closes gh-26507
 2021-05-17 08:51:32 +02:00
Stephane Nicoll a4e71fb49f Upgrade to Johnzon 1.2.11 
Closes gh-26506
 2021-05-17 08:51:31 +02:00
Stephane Nicoll 496e3f1df9 Upgrade to Jetty 9.4.40.v20210413 
Closes gh-26505
 2021-05-17 08:51:30 +02:00
Stephane Nicoll 2718cfadd8 Upgrade to Jetty Reactive HTTPClient 1.1.8 
Closes gh-26504
 2021-05-17 08:51:29 +02:00
Stephane Nicoll 65b18acd81 Upgrade to JBoss Transaction SPI 7.6.1.Final 
Closes gh-26503
 2021-05-17 08:51:28 +02:00
Stephane Nicoll ef5476c764 Upgrade to Janino 3.1.4 
Closes gh-26502
 2021-05-17 08:51:27 +02:00
Stephane Nicoll 3cc04cf4a5 Upgrade to Infinispan 11.0.11.Final 
Closes gh-26501
 2021-05-17 08:51:26 +02:00
Stephane Nicoll 03a92fc632 Upgrade to Hibernate 5.4.31.Final 
Closes gh-26500
 2021-05-17 08:51:25 +02:00
Stephane Nicoll e7ac4f12f1 Upgrade to Ehcache3 3.9.3 
Closes gh-26499
 2021-05-17 08:51:24 +02:00
Stephane Nicoll 87fce0b480 Upgrade to Ehcache 2.10.9.2 
Closes gh-26498
 2021-05-17 08:51:23 +02:00
Stephane Nicoll 3b691a2bb1 Upgrade to Dropwizard Metrics 4.1.21 
Closes gh-26497
 2021-05-17 08:51:22 +02:00
Stephane Nicoll 316ad17856 Upgrade to ActiveMQ 5.16.2 
Closes gh-26496
 2021-05-17 08:51:21 +02:00
Stephane Nicoll 89be56d63c Upgrade to R2DBC Bom Arabba-SR10 
Closes gh-26494
 2021-05-17 07:46:34 +02:00
Stephane Nicoll 69ce28617c Upgrade to Postgresql 42.2.20 
Closes gh-26493
 2021-05-17 07:46:33 +02:00
Stephane Nicoll 626c21e7a1 Upgrade to Netty tcNative 2.0.39.Final 
Closes gh-26492
 2021-05-17 07:46:32 +02:00
Stephane Nicoll fc1d0af5d2 Upgrade to Neo4j OGM 3.2.22 
Closes gh-26491
 2021-05-17 07:46:32 +02:00
Stephane Nicoll a721493c88 Upgrade to MySQL 8.0.25 
Closes gh-26490
 2021-05-17 07:46:30 +02:00
Stephane Nicoll 5348a20ff5 Upgrade to Johnzon 1.2.11 
Closes gh-26489
 2021-05-17 07:46:29 +02:00
Stephane Nicoll bd73166023 Upgrade to Jetty 9.4.40.v20210413 
Closes gh-26488
 2021-05-17 07:46:28 +02:00
Stephane Nicoll ecbf7cb417 Upgrade to Jetty Reactive HTTPClient 1.1.8 
Closes gh-26487
 2021-05-17 07:46:27 +02:00
Stephane Nicoll 96e4dcc103 Upgrade to JBoss Transaction SPI 7.6.1.Final 
Closes gh-26486
 2021-05-17 07:46:26 +02:00
Stephane Nicoll 7739c3337d Upgrade to Janino 3.1.4 
Closes gh-26485
 2021-05-17 07:46:25 +02:00
Stephane Nicoll 48daeec522 Upgrade to Hibernate 5.4.31.Final 
Closes gh-26484
 2021-05-17 07:46:24 +02:00
Stephane Nicoll 7f51e43d60 Upgrade to Ehcache 2.10.9.2 
Closes gh-26483
 2021-05-17 07:46:23 +02:00
Stephane Nicoll ba863e4a5b Upgrade to Dropwizard Metrics 4.1.21 
Closes gh-26482
 2021-05-17 07:46:22 +02:00
Stephane Nicoll 5a71fa073e Upgrade to ActiveMQ 5.15.15 
Closes gh-26481
 2021-05-17 07:46:21 +02:00
Stephane Nicoll 691bbcfdfd Update copyright year of changed files 
See gh-26448
 2021-05-16 15:29:48 +02:00
weixsun d115361980 Remove redundant suppression 
See gh-26448
 2021-05-16 15:10:48 +02:00
weixsun aa8323f915 Remove unused imports 
See gh-26477
 2021-05-16 15:03:36 +02:00
Andy Wilkinson a623dab0aa Merge branch '2.4.x' 
Closes gh-26474
 2021-05-15 08:57:23 +01:00
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x 
Closes gh-26473
 2021-05-15 08:56:09 +01:00
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM 
Closes gh-26467
 2021-05-15 08:55:59 +01:00
Andy Wilkinson 01d3aa5fba Upgrade to Spring LDAP 2.3.4.RELEASE 
Closes gh-26394
 2021-05-15 08:50:00 +01:00
Andy Wilkinson fbc629a8e7 Upgrade to Spring LDAP 2.3.4.RELEASE 
Closes gh-26393
 2021-05-15 08:48:24 +01:00
Andy Wilkinson f8bf09ff02 Upgrade to Spring LDAP 2.3.4.RELEASE 
Closes gh-25528
 2021-05-15 08:44:26 +01:00
Andy Wilkinson 1db8ca60aa Test our Gradle plugin against Gradle 7.0.2 
Closes gh-26464
 2021-05-14 13:58:46 +01:00
Andy Wilkinson 07e319d139 Upgrade to Spring Data 2021.0.1 
Closes gh-26382
 2021-05-14 13:52:43 +01:00
Andy Wilkinson 77bb7f6139 Upgrade to Spring Data 2020.0.9 
Closes gh-26381
 2021-05-14 13:50:31 +01:00
Andy Wilkinson a3d68e29c2 Merge branch '2.4.x' 
Closes gh-26463
 2021-05-14 13:45:46 +01:00
Andy Wilkinson 9f279e0e96 Merge branch '2.3.x' into 2.4.x 
Closes gh-26462
 2021-05-14 13:45:29 +01:00
Andy Wilkinson 5984d4ee2b Index @ConfigurationProperties so they can be found by scanning 
Previously, @ConfigurationProperties was not annotated with @Indexed.
This meant that @ConfigurationPropertiesScan would not be able to
find them when the underlying
ClassPathScanningCandidateComponentProvider is using a
CandidateComponentsIndex.

This commit annotated @ConfigurationProperties with @Indexed so that
they can be found by index-based scanning.

Fixes gh-26459
 2021-05-14 13:41:24 +01:00
Andy Wilkinson 000d84eedd Merge branch '2.4.x' 
Closes gh-26461
 2021-05-14 11:58:31 +01:00
Andy Wilkinson c2ef7578e8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26460
 2021-05-14 11:41:24 +01:00
Andy Wilkinson 444474926c Configure JTA tests to write logs beneath build/ 
Closes gh-26440
 2021-05-14 11:40:43 +01:00
Phillip Webb 83668f96af Merge branch '2.4.x' 
Closes gh-26458
 2021-05-13 23:38:41 -07:00
Phillip Webb 73131e99da Make BufferingApplicationStartup thread safe 
Update `BufferingApplicationStartup` to use thread safe data structures.

Prior to this commit, it was possible for calls from different threads
(for example due to request scope beans) to cause a
NoSuchElementException to be thrown.

Closes gh-25792
 2021-05-13 23:35:36 -07:00
Andy Wilkinson f44c99df26 Merge branch '2.4.x' 
Closes gh-26452
 2021-05-13 14:01:37 +01:00
Andy Wilkinson fd3d619670 Recommend default Servlet when using Jersey as a Filter 
Closes gh-25733
 2021-05-13 13:58:07 +01:00
Andy Wilkinson 89b5ece9b4 Use resource loader's class loader in config loading 
Previously, classes involved in config loading used a variety of
potentially different class loaders when calling SpringFactoriesLoader.
Some classes would use their own class loader and others would use null
which results in SpringFactoriesLoader's class loader being used.

This commit updates the config loading classes to consistently use the
resource loader's class loader.

Fixes gh-26126
 2021-05-13 13:25:47 +01:00
Andy Wilkinson f92510e39d Merge branch '2.4.x' 
Closes gh-26451
 2021-05-13 11:44:27 +01:00
Andy Wilkinson 970f933806 Merge branch '2.3.x' into 2.4.x 
Closes gh-26450
 2021-05-13 11:44:01 +01:00
Andy Wilkinson 2dd94b5554 Polish "Use try-with-resources statement" 
See gh-26449
 2021-05-13 11:37:10 +01:00
weixsun 5ba9db391f Use try-with-resources statements 
See gh-26449
 2021-05-13 11:36:14 +01:00
Scott Frederick e9adb1ab88 Handle long file names in buildpack images 
Fixes gh-26445
 2021-05-12 18:14:56 -05:00
Scott Frederick b62905b91d Merge branch '2.4.x' 
Closes gh-25840
 2021-05-12 15:48:59 -05:00
Scott Frederick 8ac297d6f3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25839
 2021-05-12 14:57:40 -05:00
Scott Frederick 32d378a348 Use test harness for image building integration tests 
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
 2021-05-12 14:51:45 -05:00
Andy Wilkinson e5af3dbfc7 Upgrade to Spring HATEOAS 1.2.6 
Closes gh-26442
 2021-05-12 17:57:54 +01:00
Andy Wilkinson 07de9e3920 Merge branch '2.4.x' 2021-05-12 17:40:58 +01:00
Andy Wilkinson e29d2e208e Merge branch '2.3.x' into 2.4.x 2021-05-12 17:40:48 +01:00
Andy Wilkinson b3af6d6403 Polish 
See gh-25798
 2021-05-12 17:40:33 +01:00
Andy Wilkinson 19fa1a6107 Upgrade to Spring HATEOAS 1.3.1 
Closes gh-26380
 2021-05-12 16:28:11 +01:00
Andy Wilkinson 827e0cf80a Upgrade to Micrometer 1.7.0 
Closes gh-26379
 2021-05-12 16:27:35 +01:00
Andy Wilkinson 0e68f3c303 Upgrade to Spring Framework 5.3.7 
Closes gh-26361
 2021-05-12 16:26:53 +01:00
Andy Wilkinson 322d6455db Upgrade to Micrometer 1.6.7 
Closes gh-26430
 2021-05-12 14:52:05 +01:00
Andy Wilkinson 7a2d5d4eee Upgrade to Spring Framework 5.3.7 
Closes gh-26360
 2021-05-12 14:51:33 +01:00
Andy Wilkinson ece845a4e0 Upgrade to Micrometer 1.5.14 
Closes gh-26427
 2021-05-12 14:09:27 +01:00
Andy Wilkinson 1a32a864d4 Upgrade to Spring Framework 5.2.15.RELEASE 
Closes gh-26425
 2021-05-12 11:30:57 +01:00
Stephane Nicoll efc0a7da44 Properly assert that auto-configured TaskExecutor is lazy 
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
 2021-05-12 07:34:58 +02:00
Madhura Bhave eff024b0ce Polish "Process additional profiles before config files processing" 
See gh-25817
 2021-05-11 15:04:34 -07:00
nguyensach 97fd9a7c77 Process additional profiles before config files processing 
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.

See gh-25817
 2021-05-11 15:03:36 -07:00
Madhura Bhave 38ef6b5644 Merge pull request #25817 from nguyensach 
* pr/25817:
  Polish "Process additional profiles before config files processing"
  Process additional profiles before config files processing

Closes gh-25817
 2021-05-11 14:46:12 -07:00
Madhura Bhave 2e1b20ce2b Polish "Process additional profiles before config files processing" 
See gh-25817
 2021-05-11 13:06:46 -07:00
nguyensach 6f266145c7 Process additional profiles before config files processing 
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.

See gh-25817
 2021-05-11 13:05:48 -07:00
Stephane Nicoll 0e2bb5f179 Polish "Polish SpringApplicationAdminJmxAutoConfigurationTests" 
See gh-26416
 2021-05-11 17:19:24 +02:00
nguyensach b263f126fa Polish SpringApplicationAdminJmxAutoConfigurationTests 
See gh-26416
 2021-05-11 17:19:24 +02:00
Stephane Nicoll f042dcf0e0 Properly assert that auto-configured TaskExecutor is lazy 
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
 2021-05-11 17:17:28 +02:00
Stephane Nicoll 2e0481ca28 Remove useless overrides of ConditionalOnProperty#matchIfMissing 
Closes gh-26432
 2021-05-11 16:48:05 +02:00
Stephane Nicoll 0512992791 Upgrade to Reactor 2020.0.7 
Closes gh-26359
 2021-05-11 15:56:26 +02:00
Stephane Nicoll c50afc69bd Upgrade to Reactor 2020.0.7 
Closes gh-26358
 2021-05-11 15:55:56 +02:00
Stephane Nicoll 526af5a790 Upgrade to Reactor Dysprosium-SR20 
Closes gh-26424
 2021-05-11 15:55:14 +02:00
Stephane Nicoll 21fbb2e79c Start building against Micrometer 1.6.7 snapshots 
See gh-26430
 2021-05-11 13:47:38 +02:00
Stephane Nicoll 5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots 
See gh-26429
 2021-05-11 13:29:00 +02:00
Stephane Nicoll 47d5592035 Start building against Spring AMQP 2.2.17 snapshots 
See gh-26428
 2021-05-11 13:28:28 +02:00
Stephane Nicoll 3a8500126b Start building against Micrometer 1.5.14 snapshots 
See gh-26427
 2021-05-11 13:27:57 +02:00
Stephane Nicoll 9772867862 Start building against Spring Batch 4.2.7 snapshots 
See gh-26426
 2021-05-11 13:26:58 +02:00
Stephane Nicoll 66fe98eb3f Start building against Spring Framework 5.2.15 snapshots 
See gh-26425
 2021-05-11 10:05:47 +02:00
Stephane Nicoll c059759c4d Start building against Reactor Dysprosium-SR20 snapshots 
See gh-26424
 2021-05-11 10:05:00 +02:00
dreis2211 ba2a4781d2 Test our Gradle Plugin against Gradle 7.0.1 
See gh-26420
 2021-05-11 08:25:19 +02:00
Phillip Webb 87d8aedd3c Use spring-pdf backend for PDF generation 
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
 2021-05-10 18:04:05 -07:00
Stephane Nicoll 217f6efa64 Start building against Micrometer 1.7.0 snapshots 
See gh-26379
 2021-05-10 12:46:23 +02:00
Stephane Nicoll 8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots 
See gh-26394
 2021-05-10 12:45:49 +02:00
Stephane Nicoll 14dd98c690 Start building against Spring Batch 4.3.3 snapshots 
See gh-26392
 2021-05-10 12:44:59 +02:00
Stephane Nicoll 98b48c1069 Start building against Spring WS 3.1.0 snapshots 
See gh-26390
 2021-05-10 12:44:27 +02:00
Stephane Nicoll f5cba056d7 Start building against Spring Session 2021.0.0 snapshots 
See gh-26389
 2021-05-10 12:44:00 +02:00
Stephane Nicoll 8fcba2c333 Start building against Spring Integration 5.5.0 snapshots 
See gh-26388
 2021-05-10 12:43:29 +02:00
Stephane Nicoll 55ccf9f750 Start building against Spring Security 5.5.0 snapshots 
See gh-26387
 2021-05-10 12:43:04 +02:00
Stephane Nicoll c9cd7cae51 Start building against Spring Kafka 2.7.1 snapshots 
See gh-26386
 2021-05-10 12:42:36 +02:00
Stephane Nicoll c85936f004 Start building against Spring AMQP 2.3.7 snapshots 
See gh-26384
 2021-05-10 12:42:05 +02:00
Stephane Nicoll b93263ec3c Start building against Spring Data 2021.0.1 snapshots 
See gh-26382
 2021-05-10 12:41:37 +02:00
Stephane Nicoll 10dca8d829 Start building against Spring HATEOAS 1.3.1 snapshots 
See gh-26380
 2021-05-10 12:41:12 +02:00
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots 
See gh-26393
 2021-05-10 09:38:41 +02:00
Stephane Nicoll 0d920894b7 Start building against Spring Batch 4.3.3 snapshots 
See gh-26391
 2021-05-10 09:03:43 +02:00
Stephane Nicoll 618475887c Start building against Spring Kafka 2.6.8 snapshots 
See gh-26385
 2021-05-10 09:03:14 +02:00
Stephane Nicoll 2479f69db1 Start building against Spring AMQP 2.3.7 snapshots 
See gh-26383
 2021-05-10 09:02:27 +02:00
Stephane Nicoll 05a3b9bbeb Start building against Spring Data 2020.0.9 snapshots 
See gh-26381
 2021-05-10 09:01:56 +02:00
Andy Wilkinson dc5f115c04 Document support for Gradle 6.9 
Closes gh-26409
 2021-05-07 11:29:51 +01:00
Andy Wilkinson b3071dab91 Merge branch '2.4.x' 
Closes gh-26412
 2021-05-07 11:26:18 +01:00
Andy Wilkinson fe4d20c976 Merge branch '2.3.x' into 2.4.x 
Closes gh-26411
 2021-05-07 11:25:10 +01:00
Andy Wilkinson 6daf67a88c Upgrade to Gradle 6.9 
Closes gh-26408
 2021-05-07 11:21:24 +01:00
Stephane Nicoll b4424605af Merge branch '2.4.x' 
Closes gh-26406
 2021-05-07 09:14:46 +02:00
Stephane Nicoll 559af275a4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26405
 2021-05-07 09:14:35 +02:00
Sach Nguyen afa77b8253 Fix wrong reference to Cassandra in DockerImageNames#couchbase 
See gh-26399
 2021-05-07 09:12:43 +02:00
Phillip Webb ba1e5fb5e8 Merge branch '2.4.x' 
Closes gh-26402
 2021-05-06 19:50:52 -07:00
Phillip Webb efad44be43 Refine mandatory location checking logic 
Update `ConfigDataEnvironment.checkMandatoryLocations` to use the
actual locations that were imported, including those that were skipped
because the related `ConfigDataResource` had already been imported by a
different location.

Prior to this commit, any location that was skipped because it had
already been imported would throw a `ConfigDataNotFoundException`.

Closes gh-26147

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
 2021-05-06 19:50:41 -07:00
Phillip Webb 777abc4aac Merge branch '2.4.x' 
Closes gh-26401
 2021-05-06 19:50:17 -07:00
Phillip Webb fef62f784a Import profile specific files in correct order 
Update `StandardConfigDataLoader` to mark profile specific files with
`Option.PROFILE` so that they are added in the correct order. This is
a variation of the same issue described in commit 5774ea3f0c.

Closes gh-26400

Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
 2021-05-06 19:43:40 -07:00
Scott Frederick 922517c0e5 Polish 2021-05-06 19:43:31 -07:00
Andy Wilkinson 2976fd9165 Merge branch '2.4.x' 
Closes gh-26397
 2021-05-06 20:12:41 +01:00
Andy Wilkinson fe696ee22a Merge branch '2.3.x' into 2.4.x 
Closes gh-26396
 2021-05-06 20:11:59 +01:00
Andy Wilkinson ef9e3bafff Test our Gradle plugin against 6.9-rc-2 
Closes gh-26395
 2021-05-06 20:10:54 +01:00
Andy Wilkinson b1f3d91f7d Make sure the Couchbase's Jackson module is available 
When we customize Couchbase's JacksonJsonSerializer with the
auto-configured ObjectMapper, Couchbase's JsonValueModule is lost.
This prevents the storage and retrieval of JSON objects.

This commit updates the Couchbase auto-configuration to use a copy
of the auto-configured ObjectMapper with the JsonValueModule added
to it.

Fixes gh-26363
 2021-05-06 19:40:47 +01:00
Stephane Nicoll 4bbfd5a3b7 Start building against Spring Framework 5.3.7 snapshots 
See gh-26361
 2021-05-06 17:12:20 +02:00
Stephane Nicoll d0e3b16f6d Start building against Reactor 2020.0.7 snapshots 
See gh-26359
 2021-05-06 17:11:58 +02:00
Stephane Nicoll 3a596ed130 Start building against Spring Framework 5.3.7 snapshots 
See gh-26360
 2021-05-06 16:43:17 +02:00
Stephane Nicoll 17fdd5a79f Start building against Reactor 2020.0.7 snapshots 
See gh-26358
 2021-05-06 16:42:45 +02:00
Phillip Webb d3207b107c Polish docs 2021-05-05 23:42:22 -07:00
Andy Wilkinson aeea15be0f Merge branch '2.4.x' 
Closes gh-26365
 2021-05-05 09:53:20 +01:00
Andy Wilkinson f7fae8f0f2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26364
 2021-05-05 09:52:53 +01:00
Andy Wilkinson b3275c5647 Align productionRuntimeClasspath with runtimeClasspath 
Fixes gh-25798
 2021-05-05 09:52:44 +01:00
Phillip Webb 65c00f373a Polish 2021-05-04 14:07:58 -07:00
Phillip Webb 711a0c19e6 Use consistent asciidoctor subs attribute 
Closes gh-25101
 2021-05-04 13:01:20 -07:00
Phillip Webb 979fa12ca9 Polish source type for Gradle snippets 2021-05-04 10:35:39 -07:00
Phillip Webb 57e54af6f5 Delete R2dbcDatabaseInitializationConfiguration 
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.

Closes gh-26225
 2021-05-04 08:15:14 -07:00
Andy Wilkinson a164658dab Merge branch '2.4.x' 
Closes gh-26349
 2021-05-04 09:46:23 +01:00
Andy Wilkinson cb1af35dde Merge branch '2.3.x' into 2.4.x 
Closes gh-26348
 2021-05-04 09:46:01 +01:00
Andy Wilkinson 6440843358 Do not wait indefinitely in initialize test if refresh fails 
Closes gh-26286
 2021-05-04 09:44:56 +01:00
Phillip Webb d6d1d95741 Use American English spellings 2021-05-03 22:39:45 -07:00
Phillip Webb b5583a4620 Polish doc code samples 
See gh-6313
 2021-05-03 22:39:44 -07:00
Phillip Webb 9aad29da0c Extract code samples from docs 
See gh-6313
 2021-05-03 17:46:37 -07:00
Scott Frederick 0893df4a01 Merge branch '2.4.x' 
Closes gh-26346
 2021-05-03 14:53:41 -05:00
Scott Frederick dbee0cf9f1 Ignore empty values in config location properties 
This commit updates config data property binding to ignore empty
elements in `spring.config.location` and `spring.config.import`
property values when a value is a comma-delimited string
representing a collection.

Fixes gh-26342
 2021-05-03 14:52:22 -05:00
Phillip Webb b314d848dc Polish docs code 
See gh-6313
 2021-04-30 18:19:52 -07:00
Phillip Webb 09e85806d6 Align docs package structure with heading IDs 
See gh-6313
 2021-04-30 16:34:35 -07:00
Andy Wilkinson b976483852 Merge branch '2.4.x' 
Closes gh-26330
 2021-04-30 16:56:46 +01:00
Andy Wilkinson c0fe23181c Merge branch '2.3.x' into 2.4.x 
Closes gh-26329
 2021-04-30 16:55:10 +01:00
Andy Wilkinson 94ca2d1e78 Test the Gradle plugin against Gradle 6.9-rc-1 
Closes gh-26267
 2021-04-30 16:52:52 +01:00
Stephane Nicoll 6df3a8291e Merge branch '2.4.x' 
Closes gh-26328
 2021-04-30 14:36:04 +02:00
Stephane Nicoll 01d2c70e8c Merge branch '2.3.x' into 2.4.x 
Closes gh-26327
 2021-04-30 14:35:52 +02:00
Stephane Nicoll 07358c6b79 Support reactive infrastructure with DataRedisTest 
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.

Closes gh-26319
 2021-04-30 14:32:25 +02:00
Stephane Nicoll 367fd64c23 Merge branch '2.4.x' 
Closes gh-26325
 2021-04-30 13:40:32 +02:00
Stephane Nicoll c134c38a68 Merge branch '2.3.x' into 2.4.x 
Closes gh-26324
 2021-04-30 13:40:24 +02:00
Stephane Nicoll af70da0e92 Update copyright year of changed file 
See gh-26321
 2021-04-30 13:35:28 +02:00
Matthias Stock 6c8c735027 Fix typo in NamedContributors Javadoc 
See gh-26321
 2021-04-30 13:35:17 +02:00
Stephane Nicoll 3475e01cda Merge branch '2.4.x' 
Closes gh-26323
 2021-04-30 13:32:56 +02:00
Stephane Nicoll 4ccce2a74f Merge branch '2.3.x' into 2.4.x 
Closes gh-26322
 2021-04-30 13:32:40 +02:00
Stephane Nicoll a6e59b357f Polish "Improve failure analysis with a single bean cycle" 
See gh-26292
 2021-04-30 13:30:58 +02:00
Roman Zabaluev 044c902a8c Improve failure analysis with a single bean cycle 
See gh-26292
 2021-04-30 13:18:13 +02:00
Stephane Nicoll 4febe6485c Merge branch '2.4.x' 
Closes gh-26318
 2021-04-30 08:53:31 +02:00
Stephane Nicoll 63d486158d Merge branch '2.3.x' into 2.4.x 
Closes gh-26317
 2021-04-30 08:53:20 +02:00
Stephane Nicoll 3f528bb0eb Mark SpringBootConfiguration as Indexed 
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.

This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.

Closes gh-26308
 2021-04-30 08:47:45 +02:00
dreis2211 ca3105920b Fix link to Webservices reference docs 
See gh-26316
 2021-04-30 08:27:22 +02:00
Phillip Webb 33c6c600a9 Split up adoc files 
Closes gh-23254
 2021-04-29 17:32:27 -07:00
Scott Frederick bb8188b681 Merge branch '2.4.x' 
Closes gh-26313
 2021-04-29 16:16:32 -05:00
Scott Frederick 17fa215cf5 Merge branch '2.3.x' into 2.4.x 
Closes gh-26312
 2021-04-29 15:33:33 -05:00
Scott Frederick c37b9b8a8e Use layout configuration in Maven build-image goal 
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.

Fixes gh-26216
 2021-04-29 15:03:08 -05:00
Andy Wilkinson 5d8a64e186 Validate section IDs in the reference documentation 
See gh-26307
 2021-04-29 15:40:54 +01:00
Andy Wilkinson fa81b41afc Merge branch '2.4.x' 
Closes gh-26301
 2021-04-29 11:37:13 +01:00
Andy Wilkinson 94519c33b1 Merge branch '2.3.x' into 2.4.x 
Closes gh-26300
 2021-04-29 11:36:15 +01:00
Andy Wilkinson ef5fbb0669 Configure bootBuildImage's targetJavaVersion using a provider 
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.

This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.

Fixes gh-26297
 2021-04-29 11:36:03 +01:00
Stephane Nicoll 242f2ba6bd Merge branch '2.4.x' 
Closes gh-26299
 2021-04-29 12:30:09 +02:00
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26298
 2021-04-29 12:29:55 +02:00
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators 
Closes gh-26279
 2021-04-29 12:28:43 +02:00
Phillip Webb 5dce5ee595 Align adoc filename with anchors 
See gh-26296
 2021-04-28 22:34:16 -07:00
Phillip Webb bd3f4d74be Rationalize reference documentation anchors 
Closes gh-26296
 2021-04-28 21:56:51 -07:00
Stephane Nicoll 80248dcc13 Merge branch '2.4.x' 
Closes gh-26283
 2021-04-28 16:14:58 +02:00
Stephane Nicoll 77a231d742 Merge branch '2.3.x' into 2.4.x 
Closes gh-26282
 2021-04-28 16:14:46 +02:00
Stephane Nicoll e7bf0a0bd6 Fix key to datasource health indicator in reference doc 
Closes gh-26268
 2021-04-28 16:14:06 +02:00
Stephane Nicoll 52994027f4 Fix checkstyle violation 2021-04-28 15:14:33 +02:00
Stephane Nicoll 7465eb0f03 Merge branch '2.4.x' 2021-04-28 15:12:45 +02:00
Stephane Nicoll 85e1cc4d65 Fix checkstyle violation 2021-04-28 15:12:22 +02:00
Stephane Nicoll 09ae65e3b7 Merge branch '2.4.x' 
Closes gh-26277
 2021-04-28 14:13:11 +02:00
Stephane Nicoll 05b09907e0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26275
 2021-04-28 14:12:35 +02:00
Stephane Nicoll d610f3c2ff Polish "Fix ordering of metadata entries" 
See gh-26230
 2021-04-28 14:07:37 +02:00
Dmitry Pavlov 3e34b0a60a Fix ordering of metadata entries 
This commit provides a consistent ordering for groups that share the
same configuration property prefix.

See gh-26230
 2021-04-28 14:07:37 +02:00
Stephane Nicoll 9e3c3b73ac Merge branch '2.4.x' 2021-04-28 13:58:05 +02:00
Stephane Nicoll d98fe36b88 Merge branch '2.3.x' into 2.4.x 2021-04-28 13:57:45 +02:00
Stephane Nicoll 20da9826cc Disable incrementalBuildTypeRenamed test 
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.

See gh-26271
 2021-04-28 13:54:35 +02:00
Andy Wilkinson 6953da2013 Merge branch '2.4.x' 
Closes gh-26257
 2021-04-27 15:19:04 +01:00
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Andy Wilkinson 31b650093d Merge branch '2.4.x' 
Closes gh-26251
 2021-04-27 11:56:48 +01:00
Andy Wilkinson ffc06e1e30 Merge branch '2.3.x' into 2.4.x 
Closes gh-26250
 2021-04-27 11:51:29 +01:00
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI 
Closes gh-26247
 2021-04-27 11:50:52 +01:00
Andy Wilkinson 091907f762 Rename default branch to main 
Closes gh-26248
 2021-04-27 11:27:37 +01:00
Phillip Webb d42ad237f5 Merge branch '2.4.x' 
Closes gh-26242
 2021-04-26 17:44:26 -07:00
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x 
Closes gh-26241
 2021-04-26 17:42:00 -07:00
Phillip Webb 1e0a3a946d Fix binding random properties test 
See gh-26201
 2021-04-26 17:36:58 -07:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors 
Closes gh-26239
 2021-04-26 17:35:14 -07:00
Phillip Webb ba5b36d733 Restore support for binding random properties 
Revert 0588e989af so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.

Fixes gh-26201
 2021-04-26 15:42:15 -07:00
Phillip Webb 5e8f383947 Extract code samples from docs 
See gh-6313
 2021-04-26 14:01:37 -07:00
Andy Wilkinson 6de10ff791 Merge branch '2.4.x' 
Closes gh-26237
 2021-04-26 15:53:37 +01:00
Andy Wilkinson 11fa850b97 Merge branch '2.3.x' into 2.4.x 
Closes gh-26236
 2021-04-26 15:53:18 +01:00
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration 
Fixes gh-26234
 2021-04-26 15:38:01 +01:00
Brian Clozel 1732d8ccf7 Merge branch '2.4.x' 
Closes gh-26233
 2021-04-26 11:37:20 +02:00
Brian Clozel 7be9c268b8 Fix ignored use-last-modified property in Spring MVC 
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
 2021-04-26 11:34:47 +02:00
Phillip Webb 32a87fcbda Extract code samples from docs 
See gh-6313
 2021-04-25 16:07:26 -07:00
Phillip Webb 2f852fa256 Update copyright year of changed files 2021-04-23 23:42:14 -07:00
Phillip Webb f30d48e3b3 Extract code samples from docs 
See gh-6313
 2021-04-23 23:41:06 -07:00
Phillip Webb 02cc778911 Extract code samples from docs 
See gh-6313
 2021-04-23 19:10:09 -07:00
Phillip Webb 3075ac0f54 Formatting 2021-04-23 11:17:49 -07:00
Slawomir Jaranowski 50118f67fd Test Maven plugin against latest Maven versions 
See gh-26200
 2021-04-22 14:59:16 +02:00
Stephane Nicoll a7b0f90609 Merge branch '2.4.x' 
Closes gh-26211
 2021-04-22 14:48:30 +02:00
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26210
 2021-04-22 14:48:15 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested 
See gh-26209
 2021-04-22 14:47:29 +02:00
Stephane Nicoll 65a7422a45 Upgrade to Kafka 2.6.2 
Closes gh-24247
 2021-04-22 14:12:55 +02:00
Stephane Nicoll e3f81f0243 Merge branch '2.4.x' 2021-04-21 17:23:42 +02:00
Stephane Nicoll db7460ddd5 Polish contribution based on Andy's review 
See gh-26188
 2021-04-21 17:23:21 +02:00
Stephane Nicoll 3ca6ed6246 Polish 
Closes gh-26190
 2021-04-21 17:20:22 +02:00
izeye 4be48d0d50 Polish 
See gh-26188
 2021-04-21 15:20:06 +02:00
Stephane Nicoll 6c68f3652c Merge branch '2.4.x' 
Closes gh-26186
 2021-04-21 10:03:41 +02:00
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-26185
 2021-04-21 10:03:32 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry 
Closes gh-25610
 2021-04-21 10:02:57 +02:00
Stephane Nicoll d403103aac Merge branch '2.4.x' 
Closes gh-26182
 2021-04-20 17:58:30 +02:00
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26181
 2021-04-20 17:58:14 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3 
Closes gh-26179
 2021-04-20 17:05:58 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x' 
Closes gh-26169
 2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll 55b9fc12c7 Merge branch '2.4.x' 
Closes gh-26165
 2021-04-20 10:23:57 +02:00
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include 
Closes gh-26163
 2021-04-20 10:23:42 +02:00
Stephane Nicoll cf5334da35 Merge branch '2.4.x' 
Closes gh-26164
 2021-04-20 10:22:55 +02:00