Andy Wilkinson
96c2d08fc4
Remove support for Solr as it is not compatible with Jetty 11
...
Closes gh-31054
2022-05-18 11:33:55 +01:00
Andy Wilkinson
c4beca3e01
Fix Maven-based AOT generation on Windows
...
Closes gh-30525
2022-05-18 10:54:35 +01:00
Stephane Nicoll
3e0994fb53
Merge branch '2.7.x'
2022-05-18 09:00:17 +02:00
Stephane Nicoll
8b611df160
Merge branch '2.6.x' into 2.7.x
2022-05-18 09:00:03 +02:00
Stephane Nicoll
e26c58baaf
Merge branch '2.5.x' into 2.6.x
2022-05-18 08:59:54 +02:00
Stephane Nicoll
2f46928f84
Upgrade to Spring Integration 5.5.12
...
Closes gh-31062
2022-05-18 08:58:50 +02:00
Stephane Nicoll
01288b61af
Upgrade to Spring Integration 5.5.12
...
Closes gh-31061
2022-05-18 08:54:57 +02:00
Stephane Nicoll
4eb778df43
Upgrade to Spring Integration 5.5.12
...
Closes gh-31060
2022-05-18 08:54:24 +02:00
Phillip Webb
f8a41d34aa
Merge branch '2.7.x'
2022-05-17 22:22:08 -07:00
Phillip Webb
23eceb0d8a
Merge branch '2.6.x' into 2.7.x
2022-05-17 22:21:41 -07:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Phillip Webb
ea881aadc6
Merge branch '2.7.x'
2022-05-17 22:19:08 -07:00
Phillip Webb
13670e556b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31095
2022-05-17 22:18:53 -07:00
Phillip Webb
0beccde6ee
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31094
2022-05-17 22:18:38 -07:00
Phillip Webb
7da42d7139
Allow tests to pass when a NAME environment variable exists
...
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.
Closes gh-31076
2022-05-17 22:16:24 -07:00
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
