Commit Graph

15484 Commits

Author SHA1 Message Date
Scott Frederick ab0cc55e20 Merge branch '2.5.x' into 2.6.x
Closes gh-28904
2021-12-03 11:42:03 -06:00
Scott Frederick 467c092fdc Remove classpath index manifest attribute from repackaged war files
Fixes gh-28895
2021-12-03 11:41:28 -06:00
Andy Wilkinson a3ecdcf058 Merge branch '2.6.x' into 2.7.x
Closes gh-28892
2021-12-02 10:31:11 +00:00
Andy Wilkinson 4606e17696 Merge branch '2.5.x' into 2.6.x
Closes gh-28891
2021-12-02 10:30:51 +00:00
Andy Wilkinson af60a8a7cf Test our Gradle plugin against Gradle 7.3.1
Closes gh-28890
2021-12-02 10:29:22 +00:00
Scott Frederick 5f14cffea3 Add support for CNB platform API 0.5 through 0.8
Fixes gh-28850
2021-12-01 14:05:20 -06:00
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 2021-11-30 11:16:53 +00:00
Stephane Nicoll 46a8673bf8 Merge branch '2.5.x'
Closes gh-28839
2021-11-29 09:44:31 +01:00
Stephane Nicoll 1876b4bcd7 Update copyright year of changed files
See gh-28809
2021-11-29 09:43:44 +01:00
Leo Li f3c93d30a8 Fix reference to matching-strategy property
See gh-28809
2021-11-29 09:39:40 +01:00
izeye c7921468fc Polish
See gh-28836
2021-11-29 09:38:07 +01:00
Stephane Nicoll 88aa849f90 Merge branch '2.5.x' 2021-11-29 09:37:31 +01:00
Stephane Nicoll 1bb3f906a7 Polish
See gh-28836
2021-11-29 09:35:51 +01:00
Stephane Nicoll e4082ee5d9 Merge branch '2.5.x'
Closes gh-28834
2021-11-28 11:18:57 +01:00
fml2 1d786e49e9 Fix typos in the "External Application Properties" section
See gh-28830
2021-11-28 11:17:22 +01:00
Stephane Nicoll 9719930496 Merge branch '2.5.x'
Closes gh-28833
2021-11-28 11:14:52 +01:00
Xavier Bouclet dce979d51f Fix output of "spring --version" in reference documentation
See gh-28831
2021-11-28 11:14:14 +01:00
Andy Wilkinson 4bd86a6e20 Allow spring-boot-image-tests to run without an existing snapshot
Closes gh-28817
2021-11-26 13:01:34 +00:00
Željko Tomić 1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization
See gh-28779
2021-11-25 09:38:44 +01:00
Madhura Bhave 27eb992252 Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
2021-11-24 10:29:35 -08:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
2021-11-24 10:20:29 -08:00
Madhura Bhave 49e408828c Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Fixes gh-28776
2021-11-24 10:17:02 -08:00
Madhura Bhave e6b5be900a Make ErrorPageSecurityFilter Servlet 3.1 compatible
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.

Fixes gh-28790
2021-11-24 09:59:27 -08:00
Madhura Bhave f621937d3b Skip error page security filter for non-error dispatch type
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.

Fixes gh-28759
2021-11-24 09:55:59 -08:00
Scott Frederick 4eed637481 Merge branch '2.5.x'
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties
Closes gh-28762
2021-11-22 10:03:21 +00:00
Yanming Zhou da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources
See gh-28767
2021-11-22 09:49:07 +01:00
Stephane Nicoll 490ec8974d Merge branch '2.5.x'
Closes gh-28761
2021-11-20 17:30:35 +01:00
Stephane Nicoll 667bca05ec Polish "Add package info for Spring Data metrics support"
See gh-28756
2021-11-20 17:29:52 +01:00
charissathomas 42ae5114ef Create package-info.java
Closes #28731
2021-11-20 17:29:22 +01:00
Andy Wilkinson 0074d621d0 Merge branch '2.5.x'
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson 258222781a Merge branch '2.5.x'
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson 96d98a0f6f Declare dir task inputs with relative path sensitivity
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson 4a0fa62d2e Polish "Replace "you're""
See gh-28710
2021-11-19 13:24:17 +00:00
Jay Bryant e629e77b29 Replace "you're"
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.

Also checked for words that end with "'ll" and "n't" but did not find
any.

See gh-28710
2021-11-19 13:23:10 +00:00
Andy Wilkinson 00fa0fb769 Merge branch '2.5.x'
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson 29725ec68a Update links to Spring Security's reference docs
Closes gh-28618
2021-11-18 11:59:48 +00:00
Madhura Bhave 6b79d2860f Merge branch '2.5.x' into main
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave 64270eca51 Convert environment used by SpringBootTestContextLoader
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
2021-11-17 16:40:53 -08:00
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
2021-11-17 16:14:25 +01:00
Stephane Nicoll a6163f6acf Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28720
2021-11-17 15:03:59 +01:00
Stephane Nicoll fc69be302a Upgrade to HttpClient5 5.1.2
Closes gh-28719
2021-11-17 15:03:57 +01:00
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28718
2021-11-17 15:02:27 +01:00
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8
Closes gh-28717
2021-11-17 15:02:25 +01:00
Stephane Nicoll ba3d0d7771 Upgrade to Spring Session 2021.1.0
Closes gh-28522
2021-11-17 14:14:08 +01:00
Andy Wilkinson ea0613c7d7 Merge branch '2.5.x'
Closes gh-28261
2021-11-17 10:07:18 +00:00
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x
Closes gh-28250
2021-11-17 10:06:41 +00:00
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4
Closes gh-28230
2021-11-17 10:04:51 +00:00
Stephane Nicoll afa006986b Merge branch '2.5.x'
Closes gh-28713
2021-11-17 09:01:53 +01:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll 37864f6e66 Upgrade to Spring Integration 5.5.6
Closes gh-28521
2021-11-17 08:51:20 +01:00
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
2021-11-17 08:50:32 +01:00
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor
Closes gh-28705
2021-11-16 16:24:32 +01:00
Stephane Nicoll dbcd0524a5 Upgrade to Logback 1.2.7
Closes gh-28699
2021-11-16 11:02:02 +01:00
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4
Closes gh-28697
2021-11-16 11:02:02 +01:00
Stephane Nicoll 4b64f36356 Upgrade to Spring Security 5.6.0
Closes gh-28520
2021-11-16 09:43:30 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
2021-11-16 09:08:15 +01:00
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
2021-11-16 09:08:14 +01:00
Stephane Nicoll 44b644c770 Merge branch '2.5.x'
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
Stephane Nicoll cdc14250c4 Merge branch '2.5.x'
Closes gh-28691
2021-11-16 08:34:39 +01:00
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter
See gh-28683
2021-11-16 08:33:56 +01:00
Stephane Nicoll 52ecc1e0dd Polish "Create EndpointWebExtension only if necessary"
See gh-28475
2021-11-16 08:22:35 +01:00
davidh44 b658013a97 Create EndpointWebExtension only if necessary
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.

See gh-28475
2021-11-16 08:15:19 +01:00
Stephane Nicoll a4c5f07391 Upgrade to Spring Kafka 2.8.0
Closes gh-28519
2021-11-15 19:58:47 +01:00
Stephane Nicoll d058af5be2 Upgrade to Spring AMQP 2.4.0
Closes gh-28518
2021-11-15 19:58:29 +01:00
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9
Closes gh-28539
2021-11-15 19:57:41 +01:00
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12
Closes gh-28600
2021-11-15 19:57:15 +01:00
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics
Fixes gh-28535
2021-11-15 12:24:50 -06:00
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique
Fixes gh-28536
2021-11-15 12:23:25 -06:00
Andy Wilkinson a1e7375fc0 Polish 2021-11-15 13:03:10 +00:00
Andy Wilkinson 2d7e0314f3 Merge branch '2.5.x'
# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
2021-11-15 12:51:43 +00:00
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3
Closes gh-28679
2021-11-15 12:47:51 +00:00
Andy Wilkinson b1ff60c728 Merge branch '2.5.x'
Closes gh-28681
2021-11-15 12:09:06 +00:00
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x
Closes gh-28680
2021-11-15 12:08:49 +00:00
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc
See gh-28677
2021-11-15 12:07:22 +00:00
Filip Hrisafov d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
2021-11-15 09:59:20 +01:00
Stephane Nicoll 6e06e69bba Merge branch '2.5.x'
Closes gh-28673
2021-11-14 08:25:01 +01:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x
Closes gh-28672
2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file
See gh-28532
2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition
See gh-28532
2021-11-14 08:19:43 +01:00
Stephane Nicoll 854d8723cc Upgrade to Spring Data 2021.1.0
Closes gh-28517
2021-11-13 16:22:40 +01:00
Stephane Nicoll 818abdc70d Upgrade to Spring HATEOAS 1.4.0
Closes gh-28610
2021-11-13 16:22:05 +01:00
Stephane Nicoll 113a7bd525 Upgrade to Neo4j Java Driver 4.3.6
Closes gh-28667
2021-11-13 16:21:43 +01:00
Stephane Nicoll 83151a3a72 Upgrade to MongoDB 4.4.0
Closes gh-28666
2021-11-13 16:21:42 +01:00
Stephane Nicoll 7f3cff062d Upgrade to Elasticsearch 7.15.2
Closes gh-28665
2021-11-13 16:21:40 +01:00
Stephane Nicoll e638ded7e9 Upgrade to Couchbase Client 3.2.3
Closes gh-28664
2021-11-13 16:21:39 +01:00
Stephane Nicoll e396aa310f Upgrade to Spring Data 2021.0.7
Closes gh-28512
2021-11-13 16:17:57 +01:00
Stephane Nicoll 52098229c0 Upgrade to Spring HATEOAS 1.3.6
Closes gh-28609
2021-11-13 16:17:35 +01:00
Stephane Nicoll e7d62ffb01 Upgrade to Spring Data 2020.0.15
Closes gh-28508
2021-11-13 16:16:51 +01:00
Stephane Nicoll f3e2a40424 Upgrade to Spring HATEOAS 1.2.11
Closes gh-28608
2021-11-13 16:16:17 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson 3ba8184cb1 Merge branch '2.5.x'
Closes gh-28660
2021-11-12 20:04:09 +00:00
Andy Wilkinson ef02db9ed1 Merge branch '2.4.x' into 2.5.x
Closes gh-28659
2021-11-12 20:03:53 +00:00
Andy Wilkinson 0889cdd516 Add dependency management for Glassfish JSTL
To be used in place of javax.servlet:jstl

Closes gh-28657
2021-11-12 20:03:15 +00:00
Stephane Nicoll 303dd4cfe0 Upgrade to Micrometer 1.8.0
Closes gh-28516
2021-11-12 10:14:04 +01:00
Andy Wilkinson 5f1103f381 Add missing @Deprecated annotation
Closes gh-28602
2021-11-11 12:03:33 +00:00
Andy Wilkinson 925ddd6b09 Merge branch '2.5.x' 2021-11-11 10:34:13 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 6fa523ed6f Start building against Spring HATEOAS 1.4.0 snapshots
See gh-28610
2021-11-11 10:01:37 +00:00
Andy Wilkinson 1d1ab21ac3 Start building against Spring HATEOAS 1.3.6 snapshots
See gh-28609
2021-11-11 10:00:37 +00:00
Andy Wilkinson ede3e4e6a0 Start building against Spring HATEOAS 1.2.11 snapshots
See gh-28608
2021-11-11 09:59:05 +00:00
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x'
Closes gh-28607
2021-11-11 09:55:42 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28606
2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI
Closes gh-28594
2021-11-11 09:54:50 +00:00
Stephane Nicoll 74c57bbefa Upgrade to Spring Framework 5.3.13
Closes gh-28515
2021-11-11 10:00:04 +01:00
Stephane Nicoll 0b808fdd3c Upgrade to Micrometer 1.7.6
Closes gh-28511
2021-11-11 09:59:21 +01:00
Stephane Nicoll f969b60031 Upgrade to Spring Framework 5.3.13
Closes gh-28510
2021-11-11 09:57:53 +01:00
Stephane Nicoll 24c578e3ad Upgrade to Micrometer 1.6.13
Closes gh-28507
2021-11-11 09:57:22 +01:00
Stephane Nicoll c8d9f94821 Upgrade to Spring Framework 5.3.13
Closes gh-28506
2021-11-11 09:56:52 +01:00
Andy Wilkinson ceacb1533a Merge branch '2.5.x' 2021-11-10 20:18:09 +00:00
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 2021-11-10 20:17:36 +00:00
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering
See gh-28506
2021-11-10 20:15:56 +00:00
Stephane Nicoll 4229039ba4 Start building against Spring AMQP 2.3.12 snapshots
See gh-28600
2021-11-10 19:51:53 +01:00
Stephane Nicoll 85e06438e3 Start building against Spring AMQP 2.3.12 snapshots
See gh-28599
2021-11-10 19:50:24 +01:00
Leo Li 508841b444 Replace "e.g." by "for example"
See gh-28583
2021-11-09 19:50:11 +01:00
Stephane Nicoll 07e3c1f565 Upgrade to Reactor 2020.0.13
Closes gh-28514
2021-11-09 19:44:32 +01:00
Stephane Nicoll e5b168a227 Upgrade to Reactor 2020.0.13
Closes gh-28505
2021-11-09 19:43:48 +01:00
Stephane Nicoll ab1748f06f Upgrade to Reactor 2020.0.13
Closes gh-28505
2021-11-09 19:42:57 +01:00
Stephane Nicoll c27a77341e Upgrade to Postgresql 42.3.1
Closes gh-28581
2021-11-09 08:51:40 +01:00
Stephane Nicoll 5c86823548 Upgrade to Netty tcNative 2.0.45.Final
Closes gh-28580
2021-11-09 08:51:40 +01:00
Stephane Nicoll ac1f85011b Upgrade to Netty 4.1.70.Final
Closes gh-28579
2021-11-09 08:51:40 +01:00
Stephane Nicoll 5442b36982 Upgrade to Neo4j Java Driver 4.3.5
Closes gh-28578
2021-11-09 08:51:39 +01:00
Stephane Nicoll 653c3424f3 Upgrade to Johnzon 1.2.15
Closes gh-28576
2021-11-09 08:51:39 +01:00
Stephane Nicoll b33a99ce15 Upgrade to HttpClient5 5.1.1
Closes gh-28575
2021-11-09 08:51:39 +01:00
Stephane Nicoll e7e7158ab8 Upgrade to Hibernate 5.6.1.Final
Closes gh-28574
2021-11-09 08:51:39 +01:00
Stephane Nicoll 179b9136ad Upgrade to Gson 2.8.9
Closes gh-28573
2021-11-09 08:51:38 +01:00
Stephane Nicoll 629e1d3ac5 Upgrade to Flyway 8.0.3
Closes gh-28572
2021-11-09 08:51:38 +01:00
Stephane Nicoll bbb9a0df12 Upgrade to Byte Buddy 1.11.22
Closes gh-28571
2021-11-09 07:29:33 +01:00
Stephane Nicoll 4a88a5fb07 Upgrade to Awaitility 4.1.1
Closes gh-28570
2021-11-09 07:29:32 +01:00
Stephane Nicoll 21c5f46182 Upgrade to AppEngine SDK 1.9.92
Closes gh-28569
2021-11-09 07:29:31 +01:00
Jay Bryant 3422b1f38b Replace "refer to" with "see"
Update documentation to replace "refer to" with "see" and to drop
"please" when it is present.

See gh-28537
2021-11-08 14:40:57 -08:00
Jay Bryant 9f2c8f65ee Replace "check out" with more formal language
Update documentation to use more formal language rather than
"check out".

See gh-28503
2021-11-08 14:36:32 -08:00
Phillip Webb c7e61e448e Polish "Remove 'etc' in reference documentation"
See gh-28497
2021-11-08 13:27:24 -08:00
Jay Bryant 0d025b672e Remove 'etc' in reference documentation
Update the reference documentation to replace 'etc' with 'other'.

See gh-28497
2021-11-08 13:24:33 -08:00
Phillip Webb d8629fc63d Merge branch '2.5.x' 2021-11-08 13:14:52 -08:00
Phillip Webb ddd38a7ac3 Merge branch '2.4.x' into 2.5.x 2021-11-08 13:14:35 -08:00
Phillip Webb 75bf430eb1 Polish ImportsContextCustomizerTests
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
2021-11-08 13:13:04 -08:00
Phillip Webb 0a6991e744 Merge branch '2.5.x'
Closes gh-28566
2021-11-08 13:11:03 -08:00
Phillip Webb 6406ee5609 Merge branch '2.4.x' into 2.5.x
Closes gh-28565
2021-11-08 13:08:52 -08:00
Phillip Webb 8a14e1e2e9 Polish 'Ignore JUnit annotations when caching test contexts'
See gh-28563
2021-11-08 13:07:26 -08:00
Loïc Ledoyen 23876d8a32 Ignore JUnit annotations when caching test contexts
Update `ImportsContextCustomizer` to ignore JUnit annotations.

See gh-28563
2021-11-08 13:06:23 -08:00
Stephane Nicoll 59151616eb Switch bomr policy to same-minor-version 2021-11-08 09:37:38 +01:00
Stephane Nicoll f37406f7b1 Upgrade to Netty tcNative 2.0.45.Final
Closes gh-28561
2021-11-08 08:59:23 +01:00
Stephane Nicoll 4c8dbd7469 Upgrade to Netty 4.1.70.Final
Closes gh-28560
2021-11-08 08:59:22 +01:00
Stephane Nicoll 92193caff6 Upgrade to Johnzon 1.2.15
Closes gh-28559
2021-11-08 08:59:21 +01:00
Stephane Nicoll 019971f375 Upgrade to Hazelcast 4.1.6
Closes gh-28558
2021-11-08 08:59:20 +01:00
Stephane Nicoll 388f8a33a5 Upgrade to Gson 2.8.9
Closes gh-28557
2021-11-08 08:59:19 +01:00
Stephane Nicoll c8a1734e0f Upgrade to AppEngine SDK 1.9.92
Closes gh-28556
2021-11-08 08:59:18 +01:00
Stephane Nicoll e802d6b102 Upgrade to Netty tcNative 2.0.45.Final
Closes gh-28555
2021-11-08 08:32:07 +01:00
Stephane Nicoll c14b07717c Upgrade to Netty 4.1.70.Final
Closes gh-28554
2021-11-08 08:32:05 +01:00
Stephane Nicoll e06bb693f8 Upgrade to Johnzon 1.2.15
Closes gh-28553
2021-11-08 08:32:04 +01:00
Stephane Nicoll 2584463fed Upgrade to Gson 2.8.9
Closes gh-28552
2021-11-08 08:32:03 +01:00
Stephane Nicoll c5830b083c Upgrade to AppEngine SDK 1.9.92
Closes gh-28551
2021-11-08 08:32:02 +01:00
Stephane Nicoll 98d3e99ac9 Merge branch '2.5.x'
Closes gh-28550
2021-11-08 08:29:56 +01:00
Stephane Nicoll 91f7ff3ba3 Merge branch '2.4.x' into 2.5.x
Closes gh-28549
2021-11-08 08:29:43 +01:00
Stephane Nicoll 188278ae4a Polish "Fix typo"
See gh-28548
2021-11-08 08:29:11 +01:00
slowjoe007 5a121197fc Fix typo
See gh-28548
2021-11-08 08:28:28 +01:00
Stephane Nicoll c05223d9c8 Merge branch '2.5.x'
Closes gh-28545
2021-11-06 12:06:14 +01:00
Stephane Nicoll 4304eea319 Polish contribution
See gh-28531
2021-11-06 12:03:22 +01:00
dreis2211 7d594aa301 Avoid duplicate AOP proxy class definition with FilteredClassLoader
See gh-28531
2021-11-06 11:58:28 +01:00
Stephane Nicoll bf88405121 Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure
Closes gh-28540
2021-11-05 14:20:37 +01:00
Stephane Nicoll 11a5055b8f Merge branch '2.5.x' 2021-11-05 13:45:01 +01:00
Stephane Nicoll cd5508a679 Polish 2021-11-05 13:43:38 +01:00
Stephane Nicoll 86bb8de815 Start building against Spring Batch 4.3.4 snapshots
See gh-28261
2021-11-05 13:37:30 +01:00
Stephane Nicoll 1c68a3460d Start building against Spring Session 2021.1.0 snapshots
See gh-28522
2021-11-05 13:37:30 +01:00
Stephane Nicoll 1ae4691a98 Start building against Spring Integration 5.5.6 snapshots
See gh-28521
2021-11-05 13:37:30 +01:00
Stephane Nicoll c618e7c279 Start building against Spring Security 5.6.0 snapshots
See gh-28520
2021-11-05 13:37:30 +01:00
Stephane Nicoll 94a99c1167 Start building against Spring Kafka 2.8.0 snapshots
See gh-28519
2021-11-05 13:37:29 +01:00
Stephane Nicoll a5a33fc4bf Start building against Spring AMQP 2.4.0 snapshots
See gh-28518
2021-11-05 13:37:29 +01:00
Stephane Nicoll 7eb1acb5e1 Start building against Spring Data 2021.1.0 snapshots
See gh-28517
2021-11-05 13:37:29 +01:00
Stephane Nicoll 9dd4c8588d Start building against Micrometer 1.8.0 snapshots
See gh-28516
2021-11-05 13:37:29 +01:00
Stephane Nicoll 98b9e1ab21 Start building against Spring Framework 5.3.13 snapshots
See gh-28515
2021-11-05 13:37:29 +01:00
Stephane Nicoll 71151c27e7 Start building against Reactor 2020.0.13 snapshots
See gh-28514
2021-11-05 11:08:55 +01:00
Stephane Nicoll 79c9d21926 Start building against Spring Batch 4.3.4 snapshots
See gh-28250
2021-11-05 10:44:30 +01:00
Stephane Nicoll 45deb1ac56 Start building against Spring Kafka 2.7.9 snapshots
See gh-28539
2021-11-05 10:43:59 +01:00
Stephane Nicoll 6984d80389 Start building against Spring Integration 5.5.6 snapshots
See gh-28513
2021-11-05 10:43:28 +01:00
Stephane Nicoll b9e1bf6b1a Start building against Spring Data 2021.0.7 snapshots
See gh-28512
2021-11-05 10:43:00 +01:00
Stephane Nicoll d36c0f21b3 Start building against Micrometer 1.7.6 snapshots
See gh-28511
2021-11-05 10:42:34 +01:00
Stephane Nicoll 71fb6ef9e1 Start building against Spring Framework 5.3.13 snapshots
See gh-28510
2021-11-05 10:42:04 +01:00
Stephane Nicoll 8426fd9488 Start building against Reactor 2020.0.13 snapshots
See gh-28509
2021-11-05 10:41:39 +01:00
Stephane Nicoll 190d39a4f9 Start building against Spring Batch 4.3.4 snapshots
See gh-28230
2021-11-05 10:06:58 +01:00
Stephane Nicoll 5c995a2d9b Start building against Spring Data 2020.0.15 snapshots
See gh-28508
2021-11-05 10:06:27 +01:00
Stephane Nicoll 176496bd18 Start building against Micrometer 1.6.13 snapshots
See gh-28507
2021-11-05 10:05:38 +01:00
Stephane Nicoll 7ae68b6ccc Start building against Spring Framework 5.3.13 snapshots
See gh-28506
2021-11-05 10:05:11 +01:00
Stephane Nicoll d887e438eb Start building against Reactor 2020.0.13 snapshots
See gh-28505
2021-11-05 10:04:46 +01:00
Stephane Nicoll fbe614a61b Fix bean type visibility
See gh-28437
2021-11-02 14:41:32 +01:00
Stephane Nicoll 2be0161f9a Fix bean type visibility
See gh-28437
2021-11-02 12:35:19 +01:00
Leo Li 73e9c355f1 Polish
See gh-28501
2021-11-02 09:05:44 +01:00
Stephane Nicoll 7ad60df844 Merge branch '2.5.x' 2021-11-02 09:05:11 +01:00
Stephane Nicoll 06e9991e6a Polish
See gh-28501
2021-11-02 09:04:32 +01:00
izeye 3e1bc01839 Fix whenThereIsNoMeterRegistryThenClientResourcesCustomizationBacksOff()
See gh-28492
2021-11-01 09:00:19 +01:00
izeye 5d8dce70dc Polish
See gh-28494
2021-11-01 08:58:40 +01:00
Andy Wilkinson 875479abeb Merge branch '2.5.x'
Closes gh-28490
2021-10-29 15:52:18 +01:00
Andy Wilkinson 33249e9414 Merge branch '2.4.x' into 2.5.x
Closes gh-28489
2021-10-29 15:52:08 +01:00
Andy Wilkinson 12d8f942be Stop logging to the file used in the generated documentation
Closes gh-28488
2021-10-29 15:51:32 +01:00
Andy Wilkinson e54b876536 Merge branch '2.5.x'
Closes gh-28487
2021-10-29 15:50:01 +01:00
Andy Wilkinson 5e42f27b36 Merge branch '2.4.x' into 2.5.x
Closes gh-28486
2021-10-29 15:49:49 +01:00
Andy Wilkinson e4e1958b65 Make Logback fall back to JVM's default charset
The charset "default" is an alias for US-ASCII, not the JVM's default
charset. This commit updates the built-in Logback configuration to
use Charset.defaultCharset().name() in place of "default" in the
Java-based configuration. In the XML-based configuration where
Charset.defaultCharset().name() cannot be called, we emulate its
behaviour [1] by using the file.encoding system property, falling back
to UTF-8 when it's not set.

Fixes gh-27230

[1] 19be6113dd/jdk/src/share/classes/java/nio/charset/Charset.java (L604-L617)
2021-10-29 14:40:05 +01:00
Andy Wilkinson ef2bcdd3ed Merge branch '2.5.x'
Closes gh-28483
2021-10-29 11:37:43 +01:00
Andy Wilkinson 07ed7ab944 Merge branch '2.4.x' into 2.5.x
Closes gh-28482
2021-10-29 11:37:33 +01:00
Andy Wilkinson 2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default
Closes gh-28481
2021-10-29 11:23:35 +01:00
Andy Wilkinson c9dd6b7e86 Merge branch '2.5.x'
Closes gh-28480
2021-10-29 11:12:18 +01:00
Andy Wilkinson ae93bb3a11 Merge branch '2.4.x' into 2.5.x
Closes gh-28479
2021-10-29 11:12:04 +01:00
Andy Wilkinson 10f0017d69 Fix method validation in child contexts
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
2021-10-29 10:08:57 +01:00
Andy Wilkinson 4a15a816ce Polish 'Replace "via" with words more suited to an international audience'
See gh-28464
2021-10-28 19:22:11 +01:00
Jay Bryant 73a18c73f4 Replace "via" with words more suited to an international audience
See gh-28464
2021-10-28 17:54:14 +01:00
Stephane Nicoll 9241f228d5 Add .gitattributes
Closes gh-28474
2021-10-28 15:31:40 +02:00
Stephane Nicoll 66553ac8c7 Add .gitattributes
Closes gh-28473
2021-10-28 15:27:49 +02:00
Stephane Nicoll 1b3f52d609 Harmonize line endings
See gh-27615
2021-10-28 15:22:57 +02:00
Andy Wilkinson 24ef4e6fb9 Merge branch '2.5.x'
Closes gh-28471
2021-10-28 13:07:22 +01:00
Andy Wilkinson 7fbbb4e08a Merge branch '2.4.x' into 2.5.x
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson 72f80f3ae6 Upgrade to Testcontainers 1.16.1
Closes gh-28468
2021-10-28 13:06:41 +01:00
Andy Wilkinson e340429a1a Merge branch '2.5.x'
Closes gh-28469
2021-10-28 12:50:23 +01:00
Andy Wilkinson b375f9fac0 Ignore parameters when checking if */* is accepted
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.

This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.

Fixes gh-28446
2021-10-28 12:27:34 +01:00
Stephane Nicoll ea8a8ecd0e Merge branch '2.5.x'
Closes gh-28467
2021-10-28 11:53:34 +02:00
Stephane Nicoll ce38d592f9 Merge branch '2.4.x' into 2.5.x
Closes gh-28466
2021-10-28 11:53:19 +02:00
Stephane Nicoll 265199f42b Polish "Fix description of "logging.logback.rollingpolicy.max-history""
See gh-28448
2021-10-28 11:50:38 +02:00
Guillaume Husta a05b2207f8 Fix description of "logging.logback.rollingpolicy.max-history"
See gh-28448
2021-10-28 11:45:42 +02:00
Phillip Webb 9cb5f035e7 Fix typo
See gh-20971
2021-10-23 08:29:51 -07:00
Stephane Nicoll 837e2ac277 Fix bean type visibility
Closes gh-28437
2021-10-23 07:31:27 +02:00
Phillip Webb c384fbd14e Polish 'Support both kebab-case and camelCase as Spring init CLI Options'
Refine the command so that camelCase options are supported but not
advertised.

See gh-28138
2021-10-22 11:23:14 -07:00
vignesh1992 ad3473208f Support both kebab-case and camelCase as Spring init CLI Options
Update `InitCommand` to support both camelCase and kebab-case.

See gh-28138
2021-10-22 11:23:14 -07:00
Andy Wilkinson b9f0ec5df8 Merge branch '2.5.x'
Closes gh-28443
2021-10-22 15:48:43 +01:00
Andy Wilkinson 4d811f66ec Merge branch '2.4.x' into 2.5.x
Closes gh-28442
2021-10-22 15:48:28 +01:00
Andy Wilkinson 7607587b6c Stabilize liveReloadOnClassPathChanged()
Closes gh-28441
2021-10-22 15:47:51 +01:00
Andy Wilkinson 3605388787 Merge branch '2.5.x'
Closes gh-28440
2021-10-22 15:24:13 +01:00
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x
Closes gh-28439
2021-10-22 15:23:07 +01:00
Andy Wilkinson a545b6e0b4 Polish "Polish"
See gh-28367
2021-10-22 15:19:13 +01:00
Leo Li 1586232761 Polish
See gh-28367
2021-10-22 15:11:57 +01:00
Stephane Nicoll 475e9c9969 Polish "Fix classpath condition for Lettuce metrics auto-configuration"
See gh-28436
2021-10-22 14:49:33 +02:00
sokomishalov 1f86fe3d48 Fix classpath condition for Lettuce metrics auto-configuration
See gh-28436
2021-10-22 14:47:56 +02:00
Andy Wilkinson 1005159eab Merge branch '2.5.x'
Closes gh-28435
2021-10-22 12:30:47 +01:00
Andy Wilkinson 3fb5af9dd3 Merge branch '2.4.x' into 2.5.x
Closes gh-28434
2021-10-22 12:29:14 +01:00
Andy Wilkinson 8a78864edd Polish "Explain how to disable/configure the ActiveMQ embedded broker"
See gh-28183
2021-10-22 12:27:50 +01:00
Moritz Kammerer 0c5f0efcea Explain how to disable/configure the ActiveMQ embedded broker
See gh-28183
2021-10-22 12:27:37 +01:00
Stephane Nicoll 1edd1e8c20 Merge branch '2.4.x' into 2.5.x
Closes gh-28433
2021-10-22 11:26:54 +02:00
Stephane Nicoll 773b0f93b7 Upgrade to Commons Compress 1.21
Closes gh-28429
2021-10-22 11:26:22 +02:00
Andy Wilkinson 47da70632f Merge branch '2.5.x'
Closes gh-28430
Closes gh-28431
2021-10-22 10:12:53 +01:00
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
2021-10-22 10:10:50 +01:00
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages"
See 2f6651c3cb.

Closes gh-28408
2021-10-22 10:08:27 +01:00
Scott Frederick e84c1abb0f Prevent Docker volume name clashes in tests during parallel builds
See gh-28292
2021-10-21 15:07:15 -05:00
Phillip Webb e25f216eab Merge branch '2.5.x'
Closes gh-28425
2021-10-21 11:28:33 -07:00
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
2021-10-21 11:27:29 -07:00
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages
Closes gh-28408
2021-10-21 11:24:54 -07:00
Andy Wilkinson d52b649bd7 Fix links to Spring Security's reference documentation
Closes gh-28407
2021-10-21 19:11:52 +01:00
Andy Wilkinson 284725f5be Polish "Expose Stackdriver's useSemanticMetricTypes property"
See gh-28403
2021-10-21 17:57:23 +01:00
Jonatan Ivanov 9397121a98 Expose Stackdriver's useSemanticMetricTypes property
See gh-28403
2021-10-21 17:57:07 +01:00
Andy Wilkinson 4903ce1806 Merge pull request #28400 from jonatan-ivanov
* gh-28400:
  Polish "Expose Elastic's apiKeyCredentials property"
  Expose Elastic's apiKeyCredentials property

Closes gh-28400
2021-10-21 17:52:01 +01:00
Andy Wilkinson 8bf3780c15 Polish "Expose Elastic's apiKeyCredentials property"
See gh-28400
2021-10-21 17:35:32 +01:00
Jonatan Ivanov dd475a2445 Expose Elastic's apiKeyCredentials property
See gh-28400
2021-10-21 17:17:01 +01:00
Andy Wilkinson 2ffcda3415 Upgrade to XmlUnit2 2.8.3
Closes gh-28422
2021-10-21 14:50:37 +01:00
Andy Wilkinson eee699aa6e Upgrade to SendGrid 4.7.6
Closes gh-28421
2021-10-21 14:50:37 +01:00
Andy Wilkinson a929734f2c Upgrade to Selenium HtmlUnit 2.54.0
Closes gh-28420
2021-10-21 14:50:37 +01:00
Andy Wilkinson 124bf2604a Upgrade to Postgresql 42.3.0
Closes gh-28418
2021-10-21 14:43:24 +01:00
Andy Wilkinson 5e7c023273 Upgrade to MySQL 8.0.27
Closes gh-28417
2021-10-21 14:43:22 +01:00
Andy Wilkinson 733b5eee41 Upgrade to HtmlUnit 2.54.0
Closes gh-28415
2021-10-21 14:43:17 +01:00
Andy Wilkinson 96e9421c8e Upgrade to Flyway 8.0.2
Closes gh-28414
2021-10-21 14:43:16 +01:00
Andy Wilkinson cdc9d5b1fc Upgrade to Elasticsearch 7.15.1
Closes gh-28413
2021-10-21 14:43:14 +01:00
Andy Wilkinson b46fc940e9 Upgrade to Byte Buddy 1.11.21
Closes gh-28412
2021-10-21 14:43:12 +01:00
Andy Wilkinson 700f872164 Upgrade to Artemis 2.19.0
Closes gh-28411
2021-10-21 14:43:09 +01:00
Andy Wilkinson 2541c0cbdc Disable on Windows tests that use embedded Kafka
Closes gh-28406
2021-10-21 10:46:50 +01:00
Stephane Nicoll 6cdafc4b72 Upgrade to Spring Session 2021.0.3
Closes gh-28248
2021-10-21 09:13:41 +02:00
Phillip Webb 1ad39b5fce Fix ReactiveSessionAutoConfigurationRedisTests
See gh-26714
2021-10-21 00:10:40 -07:00
Stephane Nicoll 3abda656f0 Upgrade to Spring Session 2020.0.7
Closes gh-28229
2021-10-21 09:00:26 +02:00
Stephane Nicoll 1b2a1fa685 Upgrade to Spring Session 2021.1.0-RC1
Closes gh-28260
2021-10-21 08:55:16 +02:00
Stephane Nicoll b9fe9e12aa Upgrade to Spring Framework 5.3.12
Closes gh-28252
2021-10-21 08:54:54 +02:00
Stephane Nicoll d80d692029 Upgrade to Spring Framework 5.3.12
Closes gh-28241
2021-10-21 08:53:57 +02:00
Stephane Nicoll 91524ccc95 Upgrade to Spring Framework 5.3.12
Closes gh-28223
2021-10-21 08:53:23 +02:00
Phillip Webb ec79f14639 Drop AbstractJettyServletWebServerFactoryTests
Drop `AbstractJettyServletWebServerFactoryTests` and merge the existing
code into `JettyServletWebServerFactoryTests`.
2021-10-20 22:58:46 -07:00
Phillip Webb cf9156e497 Add SameSite cookie support for servlet web servers
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.

The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.

Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.

Closes gh-20971

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-10-20 22:58:31 -07:00
Phillip Webb b72ff25220 Relocate and unify reactive cookie properties
Relocate the recently introduced `spring.webflux.session` properties
to `server.reactive.session` and create a unified `Cookie` properties
class.

Reactive session properties now mirror the existing
`server.servlet.session` properties and better reflect the fact that
they are related to the server and not just for WebFlux.

See gh-26714
2021-10-20 22:09:33 -07:00
Phillip Webb 3c71637fa2 Polish 'Add more session properties for reactive web servers'
See gh-26714
2021-10-20 22:09:30 -07:00
weixsun a2a802a14a Add more session properties for reactive web servers
Expand the session properties supported by reactive web servers to
include `timeout` support and additional `cookie` properties.

See gh-26714
2021-10-20 22:09:21 -07:00
Phillip Webb 3729c4909a Polish package name for web sample code
See gh-27132
2021-10-20 21:31:41 -07:00
Madhura Bhave ea65c28bfa Polish 2021-10-20 19:45:46 -07:00
Madhura Bhave 07aeb2156d Merge pull request #28123 from timtebeek
* pr/28123:
  Polish "Support PEM format for Kafka SSL certs and private key"
  Support PEM format for Kafka SSL certs and private key

Closes gh-28123
2021-10-20 19:38:11 -07:00
Madhura Bhave 0d06a2854d Polish "Support PEM format for Kafka SSL certs and private key"
See gh-28123
2021-10-20 17:10:49 -07:00
Tim te Beek 7a98364a23 Support PEM format for Kafka SSL certs and private key
See gh-28123
2021-10-20 17:10:13 -07:00
Andy Wilkinson 56b8494f15 Disable the env info contributor by default
Closes gh-28311
2021-10-20 12:42:17 +01:00
Andy Wilkinson f98c1e7231 Disable the java info contributor by default
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
2021-10-20 12:18:54 +01:00
Andy Wilkinson f2b3f1f41f Make URL- and property-based pooling config mutually exclusive
Closes gh-28144
2021-10-20 11:22:05 +01:00
Stephane Nicoll 7328f609c2 Upgrade to XmlUnit2 2.8.3
Closes gh-28397
2021-10-20 09:26:11 +02:00
Stephane Nicoll 8d3e67e561 Upgrade to SendGrid 4.7.6
Closes gh-28396
2021-10-20 09:26:10 +02:00
Stephane Nicoll 80e3c9a9cc Upgrade to MySQL 8.0.27
Closes gh-28395
2021-10-20 09:26:09 +02:00
Stephane Nicoll cae0b50393 Upgrade to Ehcache3 3.9.7
Closes gh-28394
2021-10-20 09:26:07 +02:00
Stephane Nicoll 3d2091136a Upgrade to Nimbus JOSE JWT 8.23
Closes gh-28392
2021-10-20 08:47:14 +02:00
Stephane Nicoll 3e6da7ee2b Upgrade to MySQL 8.0.27
Closes gh-28391
2021-10-20 08:47:13 +02:00
Stephane Nicoll 5865246920 Upgrade to Ehcache3 3.9.7
Closes gh-28390
2021-10-20 08:47:12 +02:00
Stephane Nicoll 9b1660a111 Upgrade to Spring Integration 5.5.5
Closes gh-28249
2021-10-20 08:43:36 +02:00
Stephane Nicoll 052726f5d9 Upgrade to Spring Integration 5.5.5
Closes gh-28259
2021-10-20 08:43:03 +02:00
Madhura Bhave 40a3824279 Reinstate ConditionalOnBean
See gh-28131
2021-10-19 21:23:48 -07:00
Madhura Bhave b7521e2fda Auto-configure health web components only if endpoint is exposed over HTTP
Fixes gh-28131

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-10-19 20:26:44 -07:00
Scott Frederick 871468931f Polish "Add option to customize cache volume names when building an image"
See gh-28292
2021-10-19 15:38:12 -05:00
Julian Liebig dc36346285 Add option to customize cache volume names when building an image
This commit adds configuration to the Maven and Gradle plugins to
allow specifying the names of build and launch cache volumes provided
to the CNB builder.

See gh-28292
2021-10-19 15:38:12 -05:00
Andy Wilkinson 9d6a0cfd24 Starting building against Spring Framework 5.3.12 snapshots
This reverts commit 3969e63ced, reversing
changes made to f01d086a8d.

Closes gh-28385
See gh-28252
2021-10-19 18:43:53 +01:00
Andy Wilkinson f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots
This reverts commit 196013fc39, reversing
changes made to 8b0c563832.

Closes gh-28384
See gh-28241
2021-10-19 18:41:23 +01:00
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
2021-10-19 17:50:59 +01:00
Andy Wilkinson 6c43914652 Merge branch '2.5.x'
Closes gh-28383
2021-10-19 17:43:40 +01:00
Andy Wilkinson 76272ffb62 Merge branch '2.4.x' into 2.5.x
Closes gh-28382
2021-10-19 17:43:30 +01:00
Andy Wilkinson 54ce51e43c Polish "Fix typos in EnvironmentPostProcessor javadoc"
See gh-28376
2021-10-19 17:43:16 +01:00
fml2 ded396b728 Fix typos in EnvironmentPostProcessor javadoc
See gh-28376
2021-10-19 17:41:46 +01:00
Andy Wilkinson 356554311f Merge branch '2.5.x'
Closes gh-28381
2021-10-19 17:17:29 +01:00
Artem Bilan 344d008848 Remove redundant info about DefaultMetricsFactory
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
2021-10-19 16:55:51 +01:00
Andy Wilkinson 9b77151caa Polish "Make UserDetailsService back off with AuthManagerResolver bean"
See gh-28361
2021-10-19 16:30:06 +01:00
Bartosz Jaszczak 31cdfd524e Make UserDetailsService back off with AuthManagerResolver bean
See gh-28361
2021-10-19 16:19:12 +01:00
Andy Wilkinson 791f3f57c6 Upgrade to Spring Kafka 2.8.0-RC1
Closes gh-28257
2021-10-19 14:45:44 +01:00
Andy Wilkinson ab3396de26 Upgrade to Spring Security 5.5.3
Closes gh-28247
2021-10-19 14:35:22 +01:00
Andy Wilkinson d767e0e1f1 Upgrade to Spring Kafka 2.7.8
Closes gh-28246
2021-10-19 14:34:39 +01:00
Andy Wilkinson ce8671ff37 Upgrade to Spring Security 5.4.9
Closes gh-28228
2021-10-19 14:32:57 +01:00
Andy Wilkinson 669caa92f8 Upgrade to Spring Kafka 2.6.11
Closes gh-28227
2021-10-19 14:32:33 +01:00
Andy Wilkinson a27dfcb9b0 Make R2DBC auto-config back off without a connection provider
Closes gh-26439
2021-10-19 14:18:34 +01:00
Andy Wilkinson 2af2a02fbb Merge branch '2.5.x'
Closes gh-28380
2021-10-19 14:18:12 +01:00
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x
Closes gh-28379
2021-10-19 14:17:53 +01:00
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC
Fixes gh-28378
2021-10-19 13:52:45 +01:00
Andy Wilkinson 8ac2a59000 Upgrade to Spring Security 5.6.0-RC1
Closes gh-28258
2021-10-19 11:18:41 +01:00
Andy Wilkinson 657eb86dad Polish "Add a config prop to enable/disable SI's default logging"
See gh-28355
2021-10-19 11:04:32 +01:00
Artem Bilan c6891c5184 Add a config prop to enable/disable SI's default logging
See gh-28355
2021-10-19 11:04:32 +01:00
Andy Wilkinson 14fb9c437d Merge branch '2.5.x'
See gh-28377
2021-10-19 11:03:51 +01:00
Andy Wilkinson bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration
See gh-28345
2021-10-19 11:03:20 +01:00
Andy Wilkinson 89b40e1e00 Add support for Log4j2's composite configuration
Closes gh-27110
2021-10-19 10:01:30 +01:00
Phillip Webb 04123e0a0e Merge branch '2.5.x'
Closes gh-28377
2021-10-18 21:47:07 -07:00
Phillip Webb b93a629dbe Shutdown in-memory R2DBC databases before devtools restart
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.

The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.

Fixes gh-28345
2021-10-18 21:46:12 -07:00
Phillip Webb 19d3007806 Polish 2021-10-18 21:44:56 -07:00
Andy Wilkinson 9ff17edb78 Upgrade to Spring Data 2021.1.0-RC1
Closes gh-28255
2021-10-18 19:17:20 +01:00
Andy Wilkinson 43a10eab59 Upgrade to Spring AMQP 2.4.0-RC1
Closes gh-28256
2021-10-18 19:15:37 +01:00
Andy Wilkinson f87b2478d5 Upgrade to Spring AMQP 2.3.11
Closes gh-28245
2021-10-18 19:14:28 +01:00
Andy Wilkinson 754b52c6bc Upgrade to Spring AMQP 2.3.11
Closes gh-28226
2021-10-18 19:12:19 +01:00
Andy Wilkinson 31d88c3d3c Improve failure analysis action when circular references are allowed
Closes gh-27735
2021-10-18 16:02:13 +01:00
Andy Wilkinson 42ef97b9ec Merge branch '2.5.x'
Closes gh-28372
2021-10-18 15:07:16 +01:00
Andy Wilkinson 5f4c001316 Merge branch '2.4.x' into 2.5.x
Closes gh-28371
2021-10-18 15:06:58 +01:00
Andy Wilkinson a93cf64834 Make JMX endpoints available when lazy init is enabled
Closes gh-28335
2021-10-18 13:37:45 +01:00
Andy Wilkinson a722fe46fb Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 13:32:15 +01:00
Andy Wilkinson 779439311d Revert "Upgrade to Spring Data 2020.0.14"
This reverts commit 752789d3ee.

See gh-28225
2021-10-18 12:59:20 +01:00
Andy Wilkinson c39e9fa918 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit fda26703b2.

See gh-28261
2021-10-18 12:32:37 +01:00
Andy Wilkinson c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit c0605ffc71.

See gh-28250
2021-10-18 12:31:23 +01:00