Commit Graph

30301 Commits

Author SHA1 Message Date
Andy Wilkinson
9fd0e4245c Merge branch '2.3.x' into 2.4.x 2021-01-26 14:04:17 +00:00
Andy Wilkinson
138fe0aca9 Merge branch '2.2.x' into 2.3.x 2021-01-26 14:04:03 +00:00
Andy Wilkinson
eb07867738 Update security policy links 2021-01-26 14:03:44 +00:00
Phillip Webb
1def245a2c Support DeferredLogFactory injection
Update `ConfigDataLoader` and `ConfigDataLocationResolver` to support
`DeferredLogFactory` injection.

Closes gh-24988
2021-01-25 23:13:01 -08:00
Phillip Webb
522f68cb40 Merge branch '2.3.x' into 2.4.x
Closes gh-24994
2021-01-25 21:36:12 -08:00
Phillip Webb
464b302655 Set withTestKitDir per Gradle version
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
2021-01-25 21:35:25 -08:00
Andy Wilkinson
9c8645dec2 Merge branch '2.3.x' into 2.4.x
Closes gh-24975
2021-01-22 14:59:23 +00:00
Andy Wilkinson
46d908f632 Upgrade to Gradle 6.8.1
Closes gh-24737
2021-01-22 14:20:57 +00:00
Andy Wilkinson
5362633014 Merge branch '2.3.x' into 2.4.x
Closes gh-24973
2021-01-22 13:32:30 +00:00
Andy Wilkinson
0b06ac9938 Use AssertJ's doesNotContainKey
Closes gh-24970
2021-01-22 13:28:41 +00:00
Phillip Webb
69fbd2f8aa Delegate usesPathPatterns() call to mappings
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method
returns `true` if any of the delegate mappings return `true`.

Closes gh-24877
2021-01-20 13:49:18 -08:00
Stephane Nicoll
3e376b955d Fix build failure
See gh-24943
2021-01-20 14:41:12 +01:00
Stephane Nicoll
56ce5bdf44 Merge branch '2.3.x' into 2.4.x
See gh-24943
2021-01-20 14:06:39 +01:00
Stephane Nicoll
244a6ac7e5 Polish "Deprecate Spring Data Solr"
See gh-24942
2021-01-20 14:02:59 +01:00
Stephane Nicoll
85729d2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-24943
2021-01-20 13:57:18 +01:00
Stephane Nicoll
10b4cb8cb5 Deprecate Spring Data Solr support
Closes gh-24942
2021-01-20 13:56:50 +01:00
Phillip Webb
80dbbaf012 Add ConfigData IGNORE_PROFILES support
Add a new `ConfigData.Option` that allows profile properties to be
ignored. This update will allow Spring Cloud Config Server to provide
`ConfigData` that only has profile properties processed on the
server-side.

Closes gh-24890
2021-01-19 18:13:24 -08:00
Andy Wilkinson
7b4fbd2c85 Document WebMvcProperties.MatchingStrategt as being since 2.4.0
Closes gh-24875
2021-01-19 13:22:00 +00:00
Andy Wilkinson
3ad2832cb2 Fix pattern extraction when MVC is using a PathPatternParser
Fixes gh-24874
2021-01-19 10:34:11 +00:00
Stephane Nicoll
59b01324ae Merge branch '2.3.x' into 2.4.x
Closes gh-24872
2021-01-18 17:08:36 +01:00
Stephane Nicoll
28ed3355bd Merge pull request #24753 from izeye
* pr/24753:
  Update copyright of changed file
  Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures

Closes gh-24753
2021-01-18 17:06:22 +01:00
Stephane Nicoll
1ad5a3fe2e Update copyright of changed file
See gh-24753
2021-01-18 17:01:31 +01:00
izeye
ddfa1e632b Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures
See gh-24753
2021-01-18 17:00:26 +01:00
Stephane Nicoll
819809849f Merge pull request #24867 from izeye
* pr/24867:
  Fix property name for spring.dao.exceptiontranslation.enabled

Closes gh-24867
2021-01-18 14:44:07 +01:00
izeye
21db14227c Fix property name for spring.dao.exceptiontranslation.enabled
See gh-24867
2021-01-18 14:41:41 +01:00
Stephane Nicoll
52ca841a2e Merge branch '2.3.x' into 2.4.x
Closes gh-24869
2021-01-18 14:31:05 +01:00
Stephane Nicoll
5df401169b Fix reference to spring-javaformat-intellij-idea-plugin
Closes gh-24864
2021-01-18 14:30:24 +01:00
Stephane Nicoll
f7c855dc40 Merge pull request #24851 from dreis2211
* pr/24851:
  Fix configuration metadata for logging.charset.* properties

Closes gh-24851
2021-01-17 17:04:09 +01:00
dreis2211
b8b5e4cebf Fix configuration metadata for logging.charset.* properties
See gh-24851
2021-01-17 17:02:24 +01:00
Stephane Nicoll
7ec7569939 Merge branch '2.3.x' into 2.4.x
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll
b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll
e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll
9343633582 Merge branch '2.3.x' into 2.4.x 2021-01-15 08:25:27 +01:00
Stephane Nicoll
9a53865c8f Polish 2021-01-15 08:24:57 +01:00
Phillip Webb
909f71708f Attempt to fix homebrew tap repo update
See gh-24677
2021-01-14 21:02:39 -08:00
Phillip Webb
1e3330c375 Attempt to fix homebrew tap repo update
See gh-24677
2021-01-14 20:55:03 -08:00
Phillip Webb
a790a9079d Attempt to fix homebrew tap repo update
See gh-24677
2021-01-14 20:49:16 -08:00
Spring Buildmaster
dc76aa312e Next development version (v2.4.3-SNAPSHOT) 2021-01-15 03:19:45 +00:00
Phillip Webb
26f2caca22 Update copyright year of changed files 2021-01-14 17:25:09 -08:00
Phillip Webb
c0aef4c35f Apply SystemProperties to LoggerContext
Update `LoggingSystemProperties` so that system environment properties
are also applied to the `LoggerContext`. This is required when multiple
applications are deployed to the same Servlet container. In such setups
there's only a single JVM and the System Environment can be changed
when multiple applications start at the same time.

Fixes gh-24835
2021-01-14 17:22:37 -08:00
Madhura Bhave
68fc2329c8 Revert "Remove unnecessary code"
Fixes gh-24835
2021-01-14 16:13:30 -08:00
Scott Frederick
716dce3859 Merge branch '2.3.x' into 2.4.x 2021-01-14 14:11:51 -06:00
Spring Buildmaster
8f692a16c6 Next development version (v2.3.9.BUILD-SNAPSHOT) 2021-01-14 18:45:38 +00:00
Brian Clozel
6f51831001 Fix docs on probe state during graceful shutdown
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.

Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll
dda8b5d287 Revert "Upgrade to Kafka 2.6.1"
See gh-24247
2021-01-14 18:03:09 +01:00
Stephane Nicoll
2072e7242a Merge branch '2.3.x' into 2.4.x
Closes gh-24841
2021-01-14 18:02:28 +01:00
Stephane Nicoll
283ed48d63 Unwrap Datasource against an actual interface
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.

Closes gh-24697
2021-01-14 18:00:35 +01:00
Stephane Nicoll
51636eef97 Merge branch '2.2.x' into 2.3.x 2021-01-14 18:00:20 +01:00
Stephane Nicoll
5d85ac6838 Complete configuration metadata for spring.config.*
Closes gh-24816
2021-01-14 10:54:51 +01:00
Spring Buildmaster
4a843d40c8 Next development version (v2.2.14.BUILD-SNAPSHOT) 2021-01-14 09:32:12 +00:00