Commit Graph

33172 Commits

Author SHA1 Message Date
Stephane Nicoll
90ee8b5a2a Upgrade to Spring Integration 5.3.3
Closes gh-23780
2020-10-28 20:26:59 +01:00
Stephane Nicoll
47a5d7aab6 Upgrade to Micrometer 1.5.6
Closes gh-23791
2020-10-28 20:26:17 +01:00
Stephane Nicoll
a7503d82ec Merge branch '2.2.x' into 2.3.x 2020-10-28 20:25:40 +01:00
Stephane Nicoll
f2afd28b9a Upgrade to Spring AMQP 2.2.12
Closes gh-23783
2020-10-28 20:24:56 +01:00
Stephane Nicoll
560be634e0 Merge branch '2.1.x' into 2.2.x 2020-10-28 20:24:30 +01:00
Stephane Nicoll
b75e196de0 Upgrade to Spring Integration 5.1.13
Closes gh-23798
2020-10-28 20:23:35 +01:00
Phillip Webb
f86598ea73 Merge pull request #23935 from nohn
* pr/23935:
  Upgrade to Log4j 2.13.3 in Maven tests

Closes gh-23935
2020-10-28 12:16:55 -07:00
Sebastian Nohn
b3c4d5fe5c Upgrade to Log4j 2.13.3 in Maven tests
See gh-23935
2020-10-28 12:15:33 -07:00
Stephane Nicoll
0fe08632eb Upgrade to Spring Data 2020.0.0
Closes gh-23778
2020-10-28 17:52:20 +01:00
Stephane Nicoll
a6c6aba40d Upgrade to Flyway 7.1.0
Closes gh-23932
2020-10-28 17:51:27 +01:00
Andy Wilkinson
8f2e58e301 Merge branch '2.3.x'
Closes gh-23933
2020-10-28 16:03:11 +00:00
Andy Wilkinson
58aa34489f Wait for DataSource init before allowing context refresh to complete
Closes gh-22852
2020-10-28 16:01:14 +00:00
Stephane Nicoll
893cfbe7a1 Merge branch '2.3.x' 2020-10-28 16:40:32 +01:00
Stephane Nicoll
b94fe90f24 Upgrade to Spring Data Neumann-SR5
Closes gh-23777
2020-10-28 16:37:08 +01:00
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