Commit Graph

36288 Commits

Author SHA1 Message Date
Andy Wilkinson
1e1b2a062e Merge branch '2.7.x' 2022-02-18 11:42:32 +00:00
Andy Wilkinson
0e5a82522c Merge branch '2.6.x' into 2.7.x
Closes gh-29904
2022-02-18 11:42:21 +00:00
Andy Wilkinson
9da6fb4a5a Merge branch '2.5.x' into 2.6.x
Closes gh-29903
2022-02-18 11:42:10 +00:00
Andy Wilkinson
c676b8b84d Remove KafkaPropertiesKafka24Tests
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.

Closes gh-29882
2022-02-18 11:41:24 +00:00
Andy Wilkinson
41d516cb4f Merge branch '2.7.x' 2022-02-18 11:23:54 +00:00
Andy Wilkinson
b6fea07001 Merge branch '2.6.x' into 2.7.x
Closes gh-29902
2022-02-18 11:23:28 +00:00
Andy Wilkinson
0cebb332d1 Merge branch '2.5.x' into 2.6.x
Closes gh-29901
2022-02-18 11:08:21 +00:00
Andy Wilkinson
ac38a5a3e9 Update javadoc to reflect move to SecurityFilterChain
Closes gh-29900
2022-02-18 11:05:48 +00:00
Andy Wilkinson
2145396841 Merge branch '2.7.x' 2022-02-18 10:18:17 +00:00
Andy Wilkinson
fc8f55fbf4 Upgrade to OkHTTP 4.9.3
Closes gh-18506
2022-02-18 10:05:54 +00:00
Scott Frederick
cb69d01e04 Merge branch '2.7.x' into main 2022-02-17 19:07:24 -06:00
Scott Frederick
42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
2022-02-17 19:06:13 -06:00
Stephane Nicoll
5078e519b0 Merge branch '2.7.x' 2022-02-17 19:55:55 +01:00
Stephane Nicoll
55fdb9f215 Upgrade to Spring HATEOAS 1.5.0-M2
Closes gh-29893
2022-02-17 19:55:15 +01:00
Moritz Halbritter
ec31278f1e Add Moritz to the doc authors list 2022-02-17 14:57:08 +01:00
Moritz Halbritter
31446295cf Merge branch '2.7.x' 2022-02-17 12:00:32 +01:00
Moritz Halbritter
896345df23 Fix test 2022-02-17 11:56:38 +01:00
Stephane Nicoll
3def84d1db Merge branch '2.7.x' 2022-02-17 11:13:42 +01:00
Stephane Nicoll
c633b85700 Merge branch '2.6.x' into 2.7.x 2022-02-17 11:13:32 +01:00
Stephane Nicoll
828d4cebee Upgrade to Spring Framework 5.3.16
Closes gh-29761
2022-02-17 11:13:20 +01:00
Stephane Nicoll
e17ef68aa0 Merge branch '2.5.x' into 2.6.x 2022-02-17 11:12:48 +01:00
Stephane Nicoll
5b58d1bfca Upgrade to Spring Framework 5.3.16
Closes gh-29719
2022-02-17 11:12:37 +01:00
Stephane Nicoll
b1cfa402e8 Upgrade to Spring Framework 5.3.16
Closes gh-29709
2022-02-17 11:11:57 +01:00
Moritz Halbritter
42808ff13c Merge branch '2.7.x'
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
2022-02-17 10:18:46 +01:00
Stephane Nicoll
e48b753b28 Merge branch '2.7.x' 2022-02-17 10:02:34 +01:00
Stephane Nicoll
3d327f4f96 Merge branch '2.6.x' into 2.7.x 2022-02-17 10:02:25 +01:00
Stephane Nicoll
553801bd9d Upgrade to Micrometer 1.9.0-M3
Closes gh-29763
2022-02-17 10:02:09 +01:00
Stephane Nicoll
38d8344b23 Merge branch '2.5.x' into 2.6.x 2022-02-17 10:01:24 +01:00
Stephane Nicoll
6c82bb2e6f Upgrade to Micrometer 1.8.3
Closes gh-29718
2022-02-17 10:00:41 +01:00
Stephane Nicoll
0fba81adf0 Upgrade to Micrometer 1.7.9
Closes gh-29708
2022-02-17 09:59:40 +01:00
Stephane Nicoll
55c94dd255 Merge branch '2.7.x' 2022-02-17 09:58:55 +01:00
Stephane Nicoll
6fa8d81daf Start building against Spring HATEOAS 1.5.0-M2 snapshots
See gh-29893
2022-02-17 09:19:25 +01:00
Moritz Halbritter
303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter
7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
2022-02-17 09:17:23 +01:00
Stephane Nicoll
598eeb85f1 Merge branch '2.7.x' 2022-02-17 08:43:02 +01:00
Stephane Nicoll
a55759d531 Merge branch '2.6.x' into 2.7.x 2022-02-17 08:42:53 +01:00
Stephane Nicoll
97c53879e8 Upgrade Java 11 version in CI image
Closes gh-29888
2022-02-17 08:42:10 +01:00
Stephane Nicoll
5aa67fad5b Merge branch '2.5.x' into 2.6.x 2022-02-17 08:41:43 +01:00
Stephane Nicoll
a90ca0e23b Upgrade Java 11 version in CI image
Closes gh-29887
2022-02-17 08:41:28 +01:00
Stephane Nicoll
cca97ff4b7 Upgrade Java 11 version in CI image
Closes gh-29889
2022-02-17 08:40:46 +01:00
Phillip Webb
ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Phillip Webb
37263ea7dd Merge branch '2.7.x' 2022-02-16 20:43:21 -08:00
Phillip Webb
c0ffb35668 Update copyright year of changed files 2022-02-16 20:43:10 -08:00
Phillip Webb
4092afc98f Polish 2022-02-16 20:42:58 -08:00
Phillip Webb
0bf7cda230 Merge branch '2.7.x' 2022-02-16 20:30:45 -08:00
Phillip Webb
a40637cb6d Merge branch '2.6.x' into 2.7.x 2022-02-16 20:30:32 -08:00
Phillip Webb
560d576a02 Polish 2022-02-16 20:30:14 -08:00
Phillip Webb
f4b849ec95 Merge branch '2.7.x' 2022-02-16 20:27:18 -08:00
Phillip Webb
26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00