Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,319 Commits 23 Branches 0 Tags
8884d89dc6796b8d262c6cf2bb7eb8c82d85ef8b
Commit Graph

11867 Commits

Author SHA1 Message Date
Phillip Webb
0fcc52ccaf Protect against NPE with Option.IGNORE_IMPORTS 
Update `ConfigDataEnvironmentContributor` to deal with the fact that
the `properties` instance can be `null`.

Fixes gh-25029
 2021-01-27 14:17:41 -08:00
Phillip Webb
7f32fa6723 Allow 'on-profile' in profile specific files 
Restore the ability to use `spring.config.activate.on-profile` or
`spring.profiles` in profile specific files.

Closes gh-24990
 2021-01-27 14:07:02 -08:00
Phillip Webb
d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb
99f7bc1aba Build against Spring Data 2020.0.4-SNAPSHOT 
See gh-25002
 2021-01-26 17:35:54 -08:00
Phillip Webb
d95d7a0245 Update code for Spring Framework 5.3.4 
See gh-24998
 2021-01-26 17:35:54 -08:00
Phillip Webb
b7ae5558f6 Build against Spring Framework 5.3.4-SNAPSHOT 
See gh-24998
 2021-01-26 17:31:27 -08: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
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
izeye
21db14227c Fix property name for spring.dao.exceptiontranslation.enabled 
See gh-24867
 2021-01-18 14:41:41 +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
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
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
5d85ac6838 Complete configuration metadata for spring.config.* 
Closes gh-24816
 2021-01-14 10:54:51 +01:00
Stephane Nicoll
3aa960a060 Upgrade to Spring Kafka 2.6.5 
Closes gh-24703
 2021-01-14 08:54:02 +01:00
Stephane Nicoll
d6d0abcfd5 Upgrade to Spring AMQP 2.3.4 
Closes gh-24702
 2021-01-14 08:53:30 +01:00
Stephane Nicoll
da8a8b9712 Upgrade to Spring Integration 5.4.3 
Closes gh-24701
 2021-01-14 08:52:51 +01:00
Stephane Nicoll
bb33574ad4 Upgrade to Netty tcNative 2.0.36.Final 
Closes gh-24829
 2021-01-14 08:52:16 +01:00
Stephane Nicoll
e73c124b2d Upgrade to Netty 4.1.58.Final 
Closes gh-24828
 2021-01-14 08:52:15 +01:00
Stephane Nicoll
27162bc3b9 Upgrade to Dependency Management Plugin 1.0.11.RELEASE 
Closes gh-24827
 2021-01-14 08:52:14 +01:00
Stephane Nicoll
3ecd1001a1 Upgrade to Spring Kafka 2.5.11.RELEASE 
Closes gh-24826
 2021-01-14 08:38:29 +01:00
Stephane Nicoll
696539c68f Upgrade to Spring Integration 5.3.5.RELEASE 
Closes gh-24825
 2021-01-14 08:38:27 +01:00
Stephane Nicoll
8908969a6c Upgrade to Spring AMQP 2.2.14.RELEASE 
Closes gh-24824
 2021-01-14 08:38:26 +01:00
Stephane Nicoll
92f132ae35 Upgrade to Netty tcNative 2.0.36.Final 
Closes gh-24823
 2021-01-14 08:38:25 +01:00