Commit Graph

29758 Commits

Author SHA1 Message Date
Stephane Nicoll 20e21a27b9 Merge branch '2.2.x' into 2.3.x 2020-10-28 16:36:38 +01:00
Stephane Nicoll 9c4e5904e7 Upgrade to Micrometer 1.3.15
Closes gh-23790
2020-10-28 16:30:05 +01:00
Stephane Nicoll 8bd7cc417e Upgrade to Spring Data Moore-SR11
Closes gh-23776
2020-10-28 16:29:27 +01:00
Stephane Nicoll 29414c7c90 Merge branch '2.1.x' into 2.2.x 2020-10-28 16:28:52 +01:00
Stephane Nicoll 9ae2eb4007 Upgrade to Spring Data Lovelace-SR21
Closes gh-23775
2020-10-28 16:27:19 +01:00
Stephane Nicoll 472c563451 Merge branch '2.3.x'
Closes gh-23931
2020-10-28 16:20:22 +01:00
Stephane Nicoll 0424689aee Merge branch '2.2.x' into 2.3.x
Closes gh-23930
2020-10-28 16:18:00 +01:00
Stephane Nicoll 93e36a97ab Remove version elements from Maven plugin documentation
This commit removes `<version>` from the Maven Plugin documentation
where it makes sense so that versions aren't hardcoded unnecessarily.

Rather, a plugin or dependency management should be in place so those
are not needed.

Closes gh-23909
2020-10-28 13:39:03 +01:00
Stephane Nicoll a3818d690e Fix custom layout example so that tokens are replaced 2020-10-28 13:37:59 +01:00
Andy Wilkinson 74ec5f65d1 Make isPresent check more Graal-friendly
Closes gh-23925
2020-10-28 10:30:11 +00:00
Andy Wilkinson 506f7acc8d Streamline use of TestContextAnnotationUtils
See gh-12470
2020-10-28 10:20:14 +00:00
Andy Wilkinson d9084eab67 Provide Mockito with a MockResolver that removes Spring-created proxies 2020-10-28 09:43:09 +00:00
Andy Wilkinson 6b437ece54 Inherit enclosing class's configuration in nested tests
Fixes gh-12470
2020-10-28 08:56:42 +00:00
Stephane Nicoll b0a1c2a740 Upgrade to Spring HATEOAS 1.2.0
Closes gh-23779
2020-10-28 09:06:34 +01:00
Stephane Nicoll 65d76f2fe8 Upgrade to Mockito 3.6.0
Closes gh-23924
2020-10-28 08:25:50 +01:00
Stephane Nicoll a55325f0ad Upgrade to Lettuce 6.0.1.RELEASE
Closes gh-23923
2020-10-28 08:25:41 +01:00
Stephane Nicoll ff187526f9 Merge branch '2.3.x' 2020-10-28 08:25:16 +01:00
Andy Wilkinson 12dcf147be Polish
See gh-21454
2020-10-28 07:09:47 +00:00
Stephane Nicoll c02b16eeeb Upgrade to Lettuce 5.3.5.RELEASE
Closes gh-23922
2020-10-28 08:03:44 +01:00
Stephane Nicoll 36d740fd68 Merge branch '2.2.x' into 2.3.x 2020-10-28 08:02:31 +01:00
Stephane Nicoll 6d80b91ae7 Merge branch '2.1.x' into 2.2.x 2020-10-28 07:59:53 +01:00
Stephane Nicoll 505a713a08 Upgrade to Micrometer 1.1.19
Closes gh-23789
2020-10-28 07:53:39 +01:00
Stephane Nicoll e31f4bc06d Revert to Spring AMQP 2.1.17
See gh-23782
2020-10-28 07:53:07 +01:00
Phillip Webb 2e2b371679 Add auto-trimming support to configtree sources
Update `ConfigTreePropertySource` with an option to automatically trim
trailing new-line characters.

Closes gh-23826
2020-10-27 22:22:59 -07:00
Phillip Webb cf673cee55 Use stricter document properties separator logic
Update `OriginTrackedPropertiesLoader` with stricter logic around the
document separator. If the preceding or following lines are comments
then the separator will be ignored.

Closes gh-22963
2020-10-27 21:43:44 -07:00
Phillip Webb 0588e989af Don't adapt RandomPropertySource
Stop adapting `RandomPropertySource` to `ConfigurationPropertySource`
since it's not useful as a binding source.

Closes gh-21659
2020-10-27 20:41:13 -07:00
Phillip Webb 10ab477426 Merge pull request #23146 from otaconix
* pr/23146:
  Polish 'Support nested @PropertyMapping annotations'
  Support nested @PropertyMapping annotations

Closes gh-23146
2020-10-27 18:52:19 -07:00
Phillip Webb 11a153869f Polish 'Support nested @PropertyMapping annotations'
See gh-23146
2020-10-27 18:49:04 -07:00
Stefan Zwanenburg edf4c833c2 Support nested @PropertyMapping annotations
Update `AnnotationsPropertySource` so that nested annotations are
supported. Prior to this commit, annotations annotated with
`@PropertyMapping` that contained nested annotation attributes would
result in instances of `TypeMappedAnnotation` being used as properties.
This usually led to errors due to not being able to convert those to
Strings. This commit makes it so that nested annotations are recursively
mapped to properties. This should allow for more complex configuration
to be mapped from annotations.

See gh-23146
2020-10-27 18:48:46 -07:00
Andy Wilkinson f60f3cb38e Exclude property beans from method validation
Exclude `@ConfigurationProperties` beans from method validation so
that `@Validated` can be used on final classes without the method
validation post-processor throwing an exception.

This commit introduces a `FilteredMethodValidationPostProcessor` class
which will use `MethodValidationExcludeFilters` to exclude beans from
method validation processing. Using `@EnableConfigurationProperties`
will automatically register an appropriate filter.

Closes gh-21454
2020-10-27 15:43:00 -07:00
Phillip Webb a0862f9146 Support wildcard configtree imports
Update `ConfigTreeConfigDataResource` so that a wildcard suffix can
be used to import multiple folders. The pattern logic from
`StandardConfigDataLocationResolver` has been extracted into a new
`LocationResourceLoader` class so that it can be reused.

Closes gh-22958
2020-10-27 14:14:23 -07:00
Stephane Nicoll 8b6b0505fb Upgrade to Spring Framework 5.3.0
Closes gh-23774
2020-10-27 16:59:16 +01:00
Andy Wilkinson 38ba67b73e Merge branch '2.3.x' 2020-10-27 15:56:04 +00:00
Andy Wilkinson c493bd7d3b Merge branch '2.2.x' into 2.3.x 2020-10-27 15:55:52 +00:00
Andy Wilkinson 1240f43388 Merge branch '2.3.x' 2020-10-27 15:55:19 +00:00
Andy Wilkinson d605b24a32 Merge branch '2.2.x' into 2.3.x 2020-10-27 15:55:06 +00:00
Andy Wilkinson b9516bc77c Await registration of http.server.requests meter
Previously, the test would make an HTTP request and, as soon as the
response was received, it would check the presence and value of the
http.server.requests meter. This create a race condition between the
meter being registered once the response had been flushed and the
meter's presence being checked. If the check won the race, the test
would fail.

This commit updates the test to wait for up to 5 seconds for the
meter to be present and have a count of 1, matching the single request
that has been made.

Fixes gh-23919
2020-10-27 15:54:22 +00:00
Andy Wilkinson 9854e3019b Polish 2020-10-27 14:59:10 +00:00
Stephane Nicoll 003ad08cbb Merge branch '2.3.x' 2020-10-27 15:49:49 +01:00
Stephane Nicoll 41f3470e09 Upgrade to Spring Framework 5.2.10
Closes gh-23526
2020-10-27 15:49:21 +01:00
Stephane Nicoll f7be1beb4c Merge branch '2.2.x' into 2.3.x 2020-10-27 15:48:45 +01:00
Stephane Nicoll 8b49f792cb Upgrade to Spring Framework 5.2.10
Closes gh-23773
2020-10-27 15:48:17 +01:00
Stephane Nicoll 444b91073b Merge branch '2.1.x' into 2.2.x 2020-10-27 15:47:39 +01:00
Stephane Nicoll 12f0709f9f Upgrade to Spring Framework 5.1.19
Closes gh-23772
2020-10-27 15:45:34 +01:00
Stephane Nicoll 4561f068aa Upgrade to Rsocket 1.1.0
Closes gh-23912
2020-10-27 15:10:49 +01:00
Andy Wilkinson 689d0c8307 Remove skipping of spring-boot-* projects from DevTools restart triggers
Closes gh-23158
2020-10-27 12:09:17 +00:00
Andy Wilkinson 1c4b4cb0cd Provide config properties for configuring WebFlux's locale resolution
Previously, the locale context resolver used with WebFlux could only be
configured by provided a custom LocaleContextResolver bean. By
constrast, when using Spring MVC, the spring.mvc.locale and
spring.mvc.locale-resolver properties could be used to configure the
locale and the resolver (fixed or Accept header) respectively.

This commit introduces spring.web.locale and spring.web.locale-resolver
properties and deprecates their spring.mvc equivalents. The new
properties can be used to configure locale resolution with either
Spring MVC or WebFlux.

Closes gh-23449
2020-10-27 11:12:00 +00:00
Phillip Webb ef89eb6dfb Add @ConditionalOnDefaultWebSecurity annotation
Add a dedicate condition annotation to detect when Spring Security is
available but has not been configured by the user. The new annotation
helps simplify quite a few of our auto-configuration classes.

See gh-23421
2020-10-26 23:47:14 -07:00
Madhura Bhave 0818f27f44 Configure WebSecurity using WebSecurityCustomizer
Replace `WebSecurityConfigurer` and `WebSecurityConfigurerAdapter`
configurations with `WebSecurityCustomizer` or `SecurityFilterChain`
beans.

Closes gh-23421
2020-10-26 23:47:14 -07:00
Phillip Webb 79b98c9edd Add ConfigurationProperty.toString() for debugging
Update `ConfigurationProperty` with a sensible `toString()` to help
debug task failures.
2020-10-26 23:47:13 -07:00