3680 Commits

Author SHA1 Message Date
Stephane Nicoll
4823b8ef7b Merge branch '2.7.x'
Closes gh-32104
2022-08-17 13:33:33 +02:00
Stephane Nicoll
3fcfcc4a3b Merge branch '2.6.x' into 2.7.x
Closes gh-32103
2022-08-17 13:33:24 +02:00
Stephane Nicoll
3b01325c6b Use asList consistently
Closes gh-32102
2022-08-17 13:32:36 +02:00
Stephane Nicoll
d6f6bcb770 Polish "Add socketKeepAlive configuration property for Elasticsearch"
See gh-32051
2022-08-17 08:25:51 +02:00
puppylpg
122d40a110 Add socketKeepAlive configuration property for Elasticsearch
See gh-32051
2022-08-17 08:25:39 +02:00
Andy Wilkinson
8e3346c24f Catch exception that's thrown on Java 11 and later
See gh-32034
2022-08-10 11:20:33 +01:00
Andy Wilkinson
889c40355c Tolerate Flyway 9
Closes gh-32034
2022-08-09 17:50:47 +01:00
Andy Wilkinson
c6872e57a9 Remove support for Flyway 8.x and earlier
Closes gh-32036
2022-08-09 15:38:16 +01:00
Andy Wilkinson
ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Madhura Bhave
0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Andy Wilkinson
2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2022-08-03 15:20:34 +01:00
Andy Wilkinson
700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson
fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Johnny Lim
6a4681baf5 Polish
See gh-31948
2022-08-02 15:14:23 +02:00
Brian Clozel
38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Stephane Nicoll
0e9f8a5994 Merge branch '2.7.x'
Closes gh-31922
2022-07-29 14:47:20 +02:00
Stephane Nicoll
4806881716 Merge branch '2.6.x' into 2.7.x
Closes gh-31921
2022-07-29 14:35:15 +02:00
Stephane Nicoll
3a5b40645a Restore support for C3P0
Closes gh-31920
2022-07-29 14:07:59 +02:00
Phillip Webb
22144987e9 Update copyright year of changed files 2022-07-29 12:10:03 +01:00
Andy Wilkinson
44beb11d38 Merge branch '2.7.x'
Closes gh-31915
2022-07-29 07:06:30 +01:00
Andy Wilkinson
6d279abe21 Merge branch '2.6.x' into 2.7.x
Closes gh-31914
2022-07-29 07:06:09 +01:00
Andy Wilkinson
d39e146a7d Polish "Allow config prop annotation processor to find reactive cookie props"
See gh-31912
2022-07-29 07:05:21 +01:00
Kalpesh
1f0d5f1130 Allow config prop annotation processor to find reactive cookie props
See gh-31912
2022-07-29 07:05:21 +01:00
Phillip Webb
57e967576e Adapt to upstream Spring Framework AOT changes 2022-07-27 21:44:18 +01:00
Andy Wilkinson
a4bafa88bc Disable schema validation when testing against Hazelcast 3
We have hazelcast configuration files that are used with multiple
versions of Hazelcast. Version 3's scheme doesn't allow us to set
<auto-detection enabled="false" />. To work around this, we
configure a system property that causes Hazelcast to disable schema
validation.

See gh-38163
2022-07-27 18:29:54 +01:00
Stephane Nicoll
fdb1ee5f97 Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
2022-07-27 18:18:09 +02:00
Stephane Nicoll
aac3ccf59c Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27780
2022-07-27 17:47:02 +02:00
Stephane Nicoll
c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2022-07-27 09:23:39 +02:00
Stephane Nicoll
53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2022-07-27 09:23:05 +02:00
Stephane Nicoll
9cb614c626 Migrate Hazelcast 3 sanity tests to Hazelcast 4
Closes gh-31881
2022-07-27 09:09:35 +02:00
Stephane Nicoll
59139e632b Polish "Disable auto-detection in tests that start Hazelcast"
See gh-31863
2022-07-27 08:30:17 +02:00
Adrian Bob
aad9c8906a Disable auto-detection in tests that start Hazelcast
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
2022-07-27 08:16:48 +02:00
Stephane Nicoll
782e3f75b6 Polish Hazelcast configuration
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
2022-07-27 08:15:53 +02:00
Madhura Bhave
aac1829106 Make Batch auto-configuration back-off is spring-jdbc isn't present
See gh-29487
2022-07-26 15:11:00 -07:00
Madhura Bhave
2804c84648 Adapt to spring-jdbc being required by Spring Batch
Closes gh-29487
2022-07-26 14:03:22 -07:00
Phillip Webb
7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb
a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Andy Wilkinson
0980362a88 Merge branch '2.7.x'
Closes gh-31843
2022-07-22 12:20:17 +01:00
Andy Wilkinson
64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson
a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Madhura Bhave
4057dd198b Change preference of session store implementations
The order has been determined based on usage statistics.

Closes gh-27756
2022-07-20 15:36:52 -07:00
Andy Wilkinson
4bd82bb5af Polish "Upgrade to Flyway 9.0.1"
See gh-31723
2022-07-20 15:44:01 +01:00
Vedran Pavic
f1bf80f5e1 Upgrade to Flyway 9.0.1
See gh-31723
2022-07-20 15:44:00 +01:00
Andy Wilkinson
2814175505 Polish "Add auto-configuration for JdkClientHttpConnector"
See gh-31709
2022-07-20 12:18:50 +01:00
lihan
e16734f937 Add auto-configuration for JdkClientHttpConnector
See gh-31709
2022-07-20 12:16:14 +01:00
Stephane Nicoll
c31ad5f175 Merge branch '2.7.x'
Closes gh-31802
2022-07-20 09:52:51 +02:00
Stephane Nicoll
6469a02c35 Merge branch '2.6.x' into 2.7.x
Closes gh-31801
2022-07-20 09:52:41 +02:00
Stephane Nicoll
585a57be76 Update copyright year of changed file
See gh-31798
2022-07-20 09:45:57 +02:00