Commit Graph

50613 Commits

Author SHA1 Message Date
Phillip Webb
e83ed4fe5e Merge branch '2.7.x' 2022-05-17 22:16:02 -07:00
Phillip Webb
fbde59d635 Merge branch '2.6.x' into 2.7.x
Closes gh-31093
2022-05-17 22:14:40 -07:00
Phillip Webb
6bce0c5044 Merge branch '2.5.x' into 2.6.x
Closes gh-31092
2022-05-17 22:14:21 -07:00
Phillip Webb
44c979beb0 Reorder default property sources after @PropertySource processing
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.

Fixes gh-31068
2022-05-17 22:13:49 -07:00
Phillip Webb
06f8041e4d Merge branch '2.7.x' 2022-05-17 21:50:42 -07:00
Phillip Webb
d5d5997be7 Merge branch '2.6.x' into 2.7.x 2022-05-17 21:49:20 -07:00
Phillip Webb
99f5c781a5 Merge branch '2.5.x' into 2.6.x 2022-05-17 21:48:50 -07:00
Phillip Webb
350d27fe50 Polish code to use method references when possible 2022-05-17 21:16:42 -07:00
Scott Frederick
8a1c8b5c2c Fix deprecation warning
See gh-30978
2022-05-17 19:25:24 -05:00
Scott Frederick
8e38e28e94 Merge branch '2.7.x' 2022-05-17 18:47:13 -05:00
Scott Frederick
03deb1d067 Merge branch '2.6.x' into 2.7.x
Closes gh-31089
2022-05-17 18:46:59 -05:00
Scott Frederick
f395cfa255 Merge branch '2.5.x' into 2.6.x
Closes gh-31088
2022-05-17 18:46:38 -05:00
Scott Frederick
50e27333d2 Tolerate failures when recording WebClient metrics
Fixes gh-30978
2022-05-17 18:45:37 -05:00
Madhura Bhave
bdf23eac61 Merge branch '2.7.x' into main 2022-05-17 14:45:50 -07:00
Madhura Bhave
f3cacbe6ec Fix formatting 2022-05-17 14:42:11 -07:00
Madhura Bhave
c730ab7d0c Merge branch '2.7.x' into main 2022-05-17 14:29:36 -07:00
Scott Frederick
7d459a13c2 Add properties for SAML relying party single logout
Closes gh-30128

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
2022-05-17 14:07:48 -07:00
Andy Wilkinson
b35006f0f4 Merge branch '2.7.x' 2022-05-17 18:37:27 +01:00
Andy Wilkinson
179e37279d Merge branch '2.6.x' into 2.7.x
Closes gh-31086
2022-05-17 18:37:05 +01:00
Andy Wilkinson
e3b2088e85 Merge branch '2.5.x' into 2.6.x
Closes gh-31085
2022-05-17 18:36:54 +01:00
Andy Wilkinson
a691a6ea79 Merge branch '2.7.x' 2022-05-17 18:26:58 +01:00
Andy Wilkinson
036356b4c6 Merge branch '2.6.x' into 2.7.x
See gh-31073
2022-05-17 18:26:27 +01:00
Andy Wilkinson
a51edec150 Use DockerHub mirror when running system tests
See gh-31072
2022-05-17 18:25:18 +01:00
Andy Wilkinson
cc2d68968d Upgrade to Maven Resolver 1.6.3
This commit also expands our internal dependency management for
Maven Resolver to cover all of the modules upon which we depend.

Closes gh-31083
2022-05-17 17:51:37 +01:00
Andy Wilkinson
1238e1f20b Upgrade to Kafka 3.2.0
Closes gh-31084
2022-05-17 17:48:08 +01:00
Stephane Nicoll
2fb1f8b9f0 Merge branch '2.7.x' 2022-05-17 17:44:16 +02:00
Stephane Nicoll
26ce8cc3e2 Upgrade to Tomcat 9.0.63
Closes gh-31082
2022-05-17 16:38:07 +02:00
Stephane Nicoll
234eba327d Upgrade to Hibernate 5.6.9.Final
Closes gh-31081
2022-05-17 16:38:05 +02:00
Stephane Nicoll
b196a78787 Upgrade to Flyway 8.5.11
Closes gh-31080
2022-05-17 16:38:02 +02:00
Andy Wilkinson
bcc27c5d22 Deleting existing output before running AOT processing
Closes gh-30981
2022-05-17 15:33:45 +01:00
Andy Wilkinson
56949250ef Polish 2022-05-17 15:19:59 +01:00
Andy Wilkinson
3e19bd6165 Merge branch '2.7.x' 2022-05-17 15:07:59 +01:00
Andy Wilkinson
57598490bf Merge branch '2.6.x' into 2.7.x
Closes gh-31079
2022-05-17 15:04:53 +01:00
Andy Wilkinson
f6b095bdfd Merge branch '2.5.x' into 2.6.x
Closes gh-31078
2022-05-17 15:03:57 +01:00
Andy Wilkinson
f19d91561b Manage version of all Artemis modules upon which the build depends
Closes gh-31077
2022-05-17 15:01:23 +01:00
Stephane Nicoll
f17a00aad1 Merge pull request #31074 from izeye
* pr/31074:
  Polish LogbackRuntimeHintsRegistrarTests

Closes gh-31074
2022-05-17 13:28:45 +02:00
izeye
74a8fffe9f Polish LogbackRuntimeHintsRegistrarTests
See gh-31074
2022-05-17 13:28:26 +02:00
Andy Wilkinson
7740e7bd0a Merge branch '2.7.x' 2022-05-17 11:10:02 +01:00
Andy Wilkinson
636f66f5d4 Merge branch '2.6.x' into 2.7.x
See gh-31073
2022-05-17 11:09:45 +01:00
Andy Wilkinson
77f1b4141c Merge branch '2.5.x' into 2.6.x
See gh-31072
2022-05-17 11:09:20 +01:00
Andy Wilkinson
08bde72db5 Polish DockerHub and mirror configuration
See gh-31070
2022-05-17 11:08:41 +01:00
Andy Wilkinson
7bb72f797a Merge branch '2.7.x' 2022-05-17 10:01:17 +01:00
Andy Wilkinson
aad79aaeb9 Merge branch '2.6.x' into 2.7.x
Closes gh-31073
2022-05-17 10:01:04 +01:00
Andy Wilkinson
dabf94360d Merge branch '2.5.x' into 2.6.x
Closes gh-31072
2022-05-17 10:00:26 +01:00
Andy Wilkinson
d9bca72f1e Use Docker Hub mirror consistently on CI and avoid unneeded log in
Closes gh-31070
2022-05-17 09:57:36 +01:00
Stephane Nicoll
af04b28368 Merge branch '2.7.x' 2022-05-17 10:54:20 +02:00
Stephane Nicoll
882eb9776c Merge branch '2.6.x' into 2.7.x 2022-05-17 10:54:14 +02:00
Stephane Nicoll
6907b337f1 Merge branch '2.5.x' into 2.6.x 2022-05-17 10:54:04 +02:00
Stephane Nicoll
7a7b1cc225 Upgrade to Tomcat 9.0.63
Closes gh-31071
2022-05-17 10:53:51 +02:00
Stephane Nicoll
fb2075d399 Upgrade to Tomcat 9.0.63
Closes gh-31069
2022-05-17 10:37:56 +02:00