Phillip Webb
212acf44f7
Merge branch '3.1.x'
2023-06-21 12:28:20 -07:00
Phillip Webb
7a2fc9e636
Fix checkstyle violation
...
See gh-35914
2023-06-21 12:27:56 -07:00
Phillip Webb
2ce36b15b3
Merge branch '3.1.x'
2023-06-21 12:11:07 -07:00
Phillip Webb
3c7fbf3423
Polish 'Apply SslConfigurer in addition to configured mappers'
...
See gh-35914
2023-06-21 12:10:36 -07:00
Fernando Cappi
e6b5322f3e
Apply SslConfigurer in addition to configured mappers
...
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.
Prior to this commit, SSL configuration would prevent configured
mappers from being applied.
See gh-35914
2023-06-21 12:10:36 -07:00
Andy Wilkinson
295702003d
Merge branch '3.1.x'
2023-06-21 15:29:38 +01:00
Andy Wilkinson
7266d4863b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36009
2023-06-21 15:29:23 +01:00
Andy Wilkinson
39c382713b
Initialize WebSocket infrastructure when using WebFlux and Jetty
...
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.
This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.
Fixes gh-33347
2023-06-21 14:59:50 +01:00
Andy Wilkinson
1e17d8eeea
Upgrade to Liquibase 4.22.0
...
Closes gh-35956
2023-06-19 16:30:52 +01:00
Andy Wilkinson
454aae92d6
Upgrade to Flyway 9.19.4
...
Closes gh-35948
2023-06-19 16:07:41 +01:00
Phillip Webb
23eb7ec1f8
Merge branch '3.1.x'
2023-06-16 14:35:44 -07:00
Phillip Webb
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4
Merge branch '2.7.x' into 3.0.x
2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee
Update copyright year of changed files
2023-06-16 14:32:43 -07:00
Phillip Webb
854b29b8fb
Polish
2023-06-16 14:32:14 -07:00
Phillip Webb
13f16da716
Merge branch '3.1.x'
2023-06-16 14:00:12 -07:00
Phillip Webb
baddf4c857
Merge branch '3.0.x' into 3.1.x
2023-06-16 13:54:01 -07:00
Jonatan Ivanov
85934c3919
Merge branch '3.1.x'
...
Closes gh-35930
2023-06-16 13:03:08 -07:00
Johnny Lim
06157837e5
Polish
...
See gh-35872
2023-06-16 12:39:03 -07:00
Phillip Webb
691b549e36
Merge branch '2.7.x' into 3.0.x
2023-06-16 10:18:43 -07:00
Phillip Webb
f3f8610539
Polish
2023-06-16 10:17:08 -07:00
Andy Wilkinson
2c06f274dc
Merge branch '3.1.x'
2023-06-15 12:21:08 +01:00
Andy Wilkinson
cb36df47c8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35905
2023-06-15 12:20:55 +01:00
Andy Wilkinson
6def7252d6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson
088006ff60
Use ephemeral port for Hazelcast
...
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.
This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.
Closes gh-35903
2023-06-15 12:19:34 +01:00
Moritz Halbritter
140c37ceba
Enable virtual threads on Jetty
...
Closes gh-35703
2023-06-15 11:01:11 +02:00
Moritz Halbritter
3e4a9f5204
Add property to limit maximum connections for Jetty
...
Closes gh-35899
2023-06-15 09:42:51 +02:00
Moritz Halbritter
f81787e65d
Enable virtual threads on Tomcat
...
Closes gh-35704
2023-06-15 08:30:09 +02:00
Moritz Halbritter
6e604ad65c
Implement @ConditionalOnVirtualThreads
...
Closes gh-35892
2023-06-15 08:30:09 +02:00
Scott Frederick
4950e2a6b7
Merge branch '3.1.x'
2023-06-13 16:42:38 -05:00
Scott Frederick
7e6452edee
Fix Redis URL property userinfo parsing
...
Fixes gh-35850
2023-06-13 16:42:19 -05:00
Stephane Nicoll
8589401b65
Merge branch '3.1.x'
2023-06-10 10:23:45 +02:00
Stephane Nicoll
27ee605f91
Upgrade to Tomcat 10.1.9
...
Closes gh-35819
2023-06-10 10:11:29 +02:00
Stephane Nicoll
02a601eae3
Fix checkstyle violation
2023-06-10 08:52:54 +02:00
Scott Frederick
07c57577b0
Merge branch '3.1.x'
2023-06-09 12:01:25 -05:00
Scott Frederick
767ec4e22e
Support encrypted PKCS8 private keys in SSL bundles
...
Properties `ssl.bundle.pem.mybundle.keystore.private-key-password`
and `ssl.bundle.pem.mybundle.truststore.private-key-password` have
been added for configuring the password required to decrypt an
encrypted private key.
Only PKCS8 private keys with encryption are supported. PKCS1 and EC
private keys with encryption are much more complex to decrypt, and
are not supported.
Fixes gh-35652
2023-06-09 11:52:36 -05:00
Stephane Nicoll
261cb721e9
Fix checkstyle violation
2023-06-09 17:02:10 +02:00
Andy Wilkinson
39276f8302
Adapt to deprecation of rejectIllegalHeader
...
Closes gh-35442
2023-06-09 15:48:18 +02:00
Andy Wilkinson
b9f7df6cc2
Merge branch '3.0.x'
...
Closes gh-35789
2023-06-08 13:39:26 +01:00
Andy Wilkinson
fba0aa805f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35788
2023-06-08 13:37:27 +01:00
Andy Wilkinson
5e97f869d0
Remove unnecessary usage of Supplier
...
Closes gh-35787
2023-06-08 12:39:31 +01:00
Andy Wilkinson
ce85290d01
Merge branch '3.0.x'
...
Closes gh-35773
2023-06-07 11:27:26 +01:00
Andy Wilkinson
51e980200a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35772
2023-06-07 11:27:01 +01:00
Andy Wilkinson
ca50cd8c8a
Stop using an infinite timeout for connecting to Hazelcast
...
Closes gh-35771
2023-06-07 11:22:50 +01:00
Yanming Zhou
7a5f6d4123
Expose spring.ssl bundle keys
...
See gh-35667
2023-06-06 17:50:47 +02:00
Andy Wilkinson
3eaaf58536
Start building against Spring Data Bom 2023.0.1 snapshots
...
See gh-35750
2023-06-06 07:36:36 +01:00
Andy Wilkinson
e9cd0c1f3a
Restore compatibility with Flyway 9.0.x
...
Closes gh-35721
2023-06-05 20:48:46 +01:00
Andy Wilkinson
d8078f1c12
Start building against Spring Data Bom 2022.0.7 snapshots
...
See gh-35738
2023-06-05 20:02:42 +01:00
rafaelrc7
ed47e09c13
Implement validity check to spring.rabbitmq.host config property
...
As discussed on issue #35628 , at some point the host property accepted
multiple comma-separated hosts. However, this was not intended, and for
better clarification, it was decided to implement a clearer error
message for this situation.
See gh-35684
2023-06-05 09:56:06 +02:00
Scott Frederick
f29a0d8c29
Merge branch '3.0.x'
...
Closes gh-35690
2023-05-31 17:12:19 -05:00
Scott Frederick
6a763f9be4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35689
2023-05-31 17:11:41 -05:00
Scott Frederick
c847db77e6
Correct precedence in description of MongoDB properties
...
Closes gh-35686
2023-05-31 17:09:45 -05:00
Scott Frederick
a02eb48528
Fix building of MongoDB connection string with authentication db
...
This commit restores the previous behavior of MongoDB auto-
configuration, where the value of the
`spring.data.mongodb.authentication-database` is set in the
credentials when provided.
Fixes gh-35567
2023-05-31 16:16:25 -05:00
Scott Frederick
593fa1dc42
Allow Mongo database property to override database in URI
...
This commit restores the previous behavior of MongoDB auto-
configuration, where the value of the `spring.data.mongodb.database`
property takes precedence over the database specified in a
`spring.data.mongodb.uri` property.
Fixes gh-35566
2023-05-31 11:20:53 -05:00
Scott Frederick
703883d302
Merge branch '3.0.x'
...
Closes gh-35610
2023-05-23 14:36:46 -05:00
Scott Frederick
72fd94f2b5
Align bean name with Spring Data Elasticsearch requirements
...
Fixes gh-33651
2023-05-23 14:36:02 -05:00
Stephane Nicoll
7a9bb55fdf
Merge branch '3.0.x'
...
Closes gh-35589
2023-05-22 16:24:56 +02:00
Eddú Meléndez
a3caf8102e
Polish
...
See gh-35577
2023-05-22 15:43:14 +02:00
Andy Wilkinson
713d74d794
Merge branch '3.0.x'
...
See gh-35554
2023-05-18 09:32:06 +01:00
Andy Wilkinson
54e769be3a
Polish
...
See gh-35553
2023-05-18 09:31:49 +01:00
Andy Wilkinson
dd74f8caba
Merge branch '3.0.x'
...
Closes gh-35554
2023-05-18 08:57:08 +01:00
Andy Wilkinson
af9cd8cf0b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35553
2023-05-18 08:56:49 +01:00
Phillip Webb
418dd1ba5b
Return 406 status code if welcome page is not accepted
...
Add `WelcomePageNotAcceptableHandlerMapping` which will return
an HTTP 406 status if a suitable welcome page is found but
cannot be accepted for the request.
An additional mapper is used so that we don't need to change
the order of the `WelcomePageHandlerMapping`. It's possible
that users may have additional root handler mappings
registered to run after the `WelcomePageHandlerMapping`
and we still need to respect those.
Fixes gh-35552
2023-05-18 08:55:45 +01:00
Andy Wilkinson
75ffbc921d
Account for new loggers property in FlywayPropertiesTets
...
See gh-35158
2023-05-18 08:03:25 +01:00
Phillip Webb
e3aac5913e
Polish property order
...
Keep "flyway teams" properties at the end.
2023-05-17 17:32:06 -07:00
Phillip Webb
cf95ae92ea
Allow flyway loggers to be configured and provide SLF4J default
...
Add `spring.flyway.loggers` property which can be used to configure
Flyway loggers and has a default value of "slf4j".
Closes gh-35158
2023-05-17 17:24:29 -07:00
Phillip Webb
d7b4353e99
Polish "Add property defaults for Spring Authorization Server"
...
See gh-35460
2023-05-17 17:06:54 -07:00
Steve Riesenberg
42c3cba18e
Add property defaults for Spring Authorization Server
...
See gh-35460
2023-05-17 17:06:39 -07:00
Phillip Webb
ae90add7c7
Polish
2023-05-16 14:04:48 -07:00
Ben Gilbert
7674c55cd7
Align spring.flyway.execute-in-transaction property with Flyway default
...
See gh-35447
2023-05-16 15:05:48 -05:00
Andy Wilkinson
f5ff8007be
Adapt to deprecation of rejectIllegalHeader
...
Closes gh-35442
2023-05-16 19:46:43 +01:00
Brian Clozel
b26115711f
Remove unnecessary test for GraphQL Connection
...
This commit removes an unnecessary test that checks for the pagination
and Connection support in Spring for GraphQL. After a change in
spring-projects/spring-graphql#707 , we no longer can test this in
isolation, nor does it make sense to test this integration that
deeply.
See gh-35449
2023-05-16 18:49:19 +01:00
Johnny Lim
4239b96943
Polish
...
See gh-35417
2023-05-15 11:33:10 +02:00
Johnny Lim
e4bf2187bc
Revert accidental author changes in FlywayAutoConfiguration
...
See commit 7ffacf43f3
See gh-35418
2023-05-15 11:27:37 +02:00
Moritz Halbritter
aa0fa42ebd
Merge branch '3.0.x'
...
Closes gh-35425
2023-05-15 11:22:13 +02:00
Moritz Halbritter
9e963bce58
Add Hibernate runtime hints
...
This adds hints for the two No JtaPlatform candidates as well as for
the naming strategies.
Closes gh-35423
2023-05-15 11:12:02 +02:00
Phillip Webb
e3ed87d165
Merge branch '3.0.x'
2023-05-12 13:21:52 -07:00
Phillip Webb
92e420a098
Merge branch '2.7.x' into 3.0.x
2023-05-12 13:14:12 -07:00
Phillip Webb
e9c4a5d663
Polish
2023-05-12 13:01:30 -07:00
Moritz Halbritter
b70399e998
Merge branch '3.0.x'
2023-05-12 12:03:32 +02:00
Moritz Halbritter
7b4056df7f
Merge branch '2.7.x' into 3.0.x
2023-05-12 12:00:11 +02:00
Moritz Halbritter
700e89097c
Polish
...
See https://stackoverflow.com/questions/28671903/the-hashsett-removeall-method-is-surprisingly-slow
2023-05-12 11:57:33 +02:00
Steve Riesenberg
10feecbd08
Fix redirect to login page for token requests
...
Fixes an issue where auto-configuration for Spring Authorization Server
was overriding the default exception handling (AuthenticationEntryPoint)
resulting in anonymous requests to the token endpoint being redirected
to the Spring Security login page instead of returning 401 Unauthorized.
Auto-configuration now registers a defaultAuthenticationEntryPointFor
that is added to any other entry points already configured.
See gh-35368
2023-05-10 11:32:06 +02:00
Christoph Dreis
6086e81ccd
Fix configuring replica set via PropertiesMongoConnectionDetails
...
See gh-35370
2023-05-10 11:23:19 +02:00
Moritz Halbritter
9f787050b4
Merge branch '3.0.x'
...
Closes gh-35381
2023-05-10 11:08:33 +02:00
Moritz Halbritter
53d2a9fb34
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35380
2023-05-10 10:58:03 +02:00
Moritz Halbritter
ec4d52e381
Add ReactiveResponseConsumer classpath check to http5 auto-configuration
...
Closes gh-34964
2023-05-10 10:47:08 +02:00
Moritz Halbritter
0ebb32e7f0
Merge branch '3.0.x'
...
Closes gh-35379
2023-05-10 10:28:57 +02:00
Moritz Halbritter
7e50485b23
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35378
2023-05-10 10:28:47 +02:00
Moritz Halbritter
947ac8df73
Map MinIdle and MaxValidationTime to R2DBC pools
...
Closes gh-34724
2023-05-10 10:16:43 +02:00
Stefano Cordio
d802ca017b
Small assertions improvements
...
See gh-34796
2023-05-10 08:38:07 +02:00
Johnny Lim
ff9fd1abeb
Polish
...
See gh-35185
2023-05-10 08:31:36 +02:00
Christoph Dreis
2d1a403605
Fix javadoc in OAuth2AuthorizationServerPropertiesMapper
...
See gh-35366
2023-05-09 16:38:45 +01:00
Andy Wilkinson
2b6b178560
Merge branch '3.0.x'
...
Closes gh-35362
2023-05-09 12:24:04 +01:00
Andy Wilkinson
6c1c8fb405
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35361
2023-05-09 12:23:49 +01:00
Andy Wilkinson
7427e2d527
Polish "Fix test for backing off when a TransactionManager is already defined"
...
See gh-35336
2023-05-09 12:04:38 +01:00
davin111
cf5500fc78
Fix test for backing off when a TransactionManager is already defined
...
See gh-35336
2023-05-09 12:03:06 +01:00
Scott Frederick
a474e54cf3
Merge branch '3.0.x'
...
Closes gh-35244
2023-05-05 16:20:41 -05:00
Scott Frederick
cf180fa1cc
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35243
2023-05-05 16:07:23 -05:00
Scott Frederick
5d91c24f63
Update Couchbase image tag used in tests
...
Closes gh-35228
2023-05-05 14:45:58 -05:00
Marc Leroux
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2023-05-05 11:34:55 +02:00
Scott Frederick
1143396531
Add smoke tests to verify Couchbase SSL connections
...
See gh-34811
2023-05-04 17:09:52 -05:00
Scott Frederick
d4107a8185
Add smoke tests to verify Cassandra SSL connections
...
See gh-25602
2023-05-04 16:11:28 -05:00
Phillip Webb
8e18862582
Merge branch '3.0.x'
2023-05-02 15:41:26 -07:00
Phillip Webb
8d1fb3be4f
Fix index error on test
...
See gh-35241
2023-05-02 15:41:07 -07:00
Phillip Webb
a890323758
Merge branch '3.0.x'
2023-05-02 14:52:42 -07:00
Phillip Webb
0f242ab3f7
Merge branch '2.7.x' into 3.0.x
2023-05-02 14:52:16 -07:00
Phillip Webb
6b646f6a8e
Update copyright year of changed files
2023-05-02 14:52:12 -07:00
Phillip Webb
cd5f0dff21
Merge branch '3.0.x'
...
Closes gh-35242
2023-05-02 14:51:24 -07:00
Phillip Webb
722cbc66c6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35241
2023-05-02 14:51:13 -07:00
Phillip Webb
5ef0ee0ed4
Prevent early initialization of SessionRepository beans
...
Replace `SessionRepositoryFilterConfiguration` filter registration bean
with a `DelegatingFilterProxyRegistrationBean` so that
`SessionRepository` beans are not initialized early.
Fixes gh-35240
2023-05-02 14:47:15 -07:00
Scott Frederick
3bb271e320
Add smoke test to verify Redis SSL connection
...
See gh-34815
2023-05-02 13:52:50 -05:00
Andy Wilkinson
aafe343ce6
Merge branch '3.0.x'
...
Closes gh-35237
2023-05-02 16:19:54 +01:00
Andy Wilkinson
9a39bf284b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35235
2023-05-02 16:19:30 +01:00
Andy Wilkinson
7c2c2ebb1b
Make ApplicationAvailabilityBean receive events with lazy init
...
Fixes gh-35161
2023-05-02 16:19:08 +01:00
Moritz Halbritter
735c43ce9b
Merge branch '2.7.x' into 3.0.x
2023-05-02 14:38:48 +02:00
Moritz Halbritter
312f0c17ed
Set initial ElasticSearch heap size in integration tests
2023-05-02 14:37:13 +02:00
Moritz Halbritter
944d77491b
Set initial heap size for ElasticSearch integration tests
2023-05-02 14:25:35 +02:00
Moritz Halbritter
1ce88f25b4
Merge branch '3.0.x'
2023-05-02 14:08:37 +02:00
Moritz Halbritter
037cb8c5b0
Merge branch '2.7.x' into 3.0.x
2023-05-02 13:57:37 +02:00
Moritz Halbritter
c1cef099d2
Limit maximum heap of ElasticSearch in tests
2023-05-02 13:40:59 +02:00
Moritz Halbritter
d7a9f87b64
Disable Neo4j tests on aarch64 linux and mac
...
See gh-35228
2023-05-02 13:40:59 +02:00
Moritz Halbritter
9f109fe785
Disable Couchbase integration tests on aarch64 linux and mac
...
See gh-35228
2023-05-02 13:40:59 +02:00
Andy Wilkinson
419d8c22b2
Merge branch '3.0.x'
...
Closes gh-35231
2023-05-02 11:58:58 +01:00
Andy Wilkinson
8f291abc2b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35230
2023-05-02 11:58:33 +01:00
Juhan Aasaru
3b70286747
Correct list of annotations equivalent to @SpringBootApplication
...
See gh-35180
2023-05-02 11:57:18 +01:00
Andy Wilkinson
b1d0433d74
Handle Kafka servers as strings and rely on Kafka's parsing
...
Closes gh-34770
2023-05-02 08:38:40 +01:00
Phillip Webb
fc5339f81c
Polish
2023-04-30 23:27:06 -07:00
Phillip Webb
403481ff96
Add 'required' parameter to ConnectionDetailsFactories
...
Update `ConnectionDetailsFactories` so that callers can now declare if
a result is required or not and improve exception hierarchy.
See gh-35168
2023-04-29 21:10:07 -07:00
Andy Wilkinson
09527995d1
Polish
2023-04-28 17:56:12 +01:00
Moritz Halbritter
176cc20c36
Polish FlywayConfiguration
2023-04-28 13:15:39 +02:00
Moritz Halbritter
27ab98b49d
Polish ConnectionDetailsFactories
2023-04-28 13:15:39 +02:00
Andy Wilkinson
d7da77bda8
Remove support for service connections to InfluxDB
...
Closes gh-35189
2023-04-28 09:49:39 +01:00
Scott Frederick
428434c873
Polish SslOptions usage
...
Change getter methods to return arrays, as this is how most client
library usages need the options.
See gh-34814
2023-04-27 16:37:46 -05:00
Scott Frederick
226c3005d4
Add SSL bundle support to Redis auto-configuration
...
Update Redis auto-configuration with Lettuce and Jedis drivers to
allow SSL configuration with an SSL bundle.
Closes gh-34815
2023-04-27 15:24:55 -05:00
Andy Wilkinson
9a0b5e0178
Merge branch '3.0.x'
...
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson
7ee1622995
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson
6b9bc012a5
Check that BPP and BFPP bean methods won't cause eager initialization
...
Closes gh-35164
2023-04-26 11:47:03 +01:00
Phillip Webb
b5c9e7c06a
Polish SslOptions usage
...
Add helper method and tighten usage so that exceptions are thrown when
options cannot be applied.
See gh-34814
2023-04-25 22:39:47 -07:00
Phillip Webb
423c60acfa
Add SSL bundle support to Elasticsearch auto-configuration
...
Update Elasticsearch RestClient auto-configuration so that an SSL
can be configured via an SSL bundle.
Closes gh-35155
2023-04-25 17:20:05 -07:00
Phillip Webb
19221f00f3
Deprecate `spring.cassandra.ssl` configuration property
...
Deprecate the `spring.cassandra.ssl` configuration property in favor
of `spring.cassandra.ssl.enabled`.
See gh-25602
2023-04-24 16:39:55 -07:00
Scott Frederick
ff35cc80d7
Allow Couchbase SSL to be enabled without custom trust material
...
Closes gh-35147
2023-04-24 14:51:58 -05:00
Scott Frederick
1d44b45b5d
Deprecate Couchbase SSL keyStore properties
...
The properties `spring.couchbase.env.ssl.key-store`
and `spring.couchbase.env.ssl.key-store-password`
are deprecated in favor of configuring an SSL bundle with
`spring.couchbase.env.ssl.bundle`. The older properties
have somewhat confusing names, since they are used to
configure a trust store in Couchbase, and they don't
provide all the options that an SSL bundle provides.
Closes gh-35135
2023-04-24 14:45:40 -05:00
Andy Wilkinson
9cd04c55fb
Merge branch '3.0.x'
...
Closes gh-35132
2023-04-24 16:01:51 +01:00
Andy Wilkinson
598e090e8f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35131
2023-04-24 15:07:43 +01:00
Andy Wilkinson
90952a2dd9
Do not turn a null Flyway-specific password into an empty string
...
It prevents using PGPASS for authentication with Postgres.
Fixes gh-35110
2023-04-24 14:44:04 +01:00
Andy Wilkinson
7ffacf43f3
Use main DataSource when there are no migration-specific conn details
...
Fixes gh-35109
2023-04-24 13:18:56 +01:00
Phillip Webb
6ea2547de4
Add SSL bundle support to WebClient auto-configuration
...
Introduce `WebClientSsl` interface and auto-configuration to allow a
WebClient builder to have custom SSL configuration applied.
The previous `ClientHttpConnectorConfiguration` has been been changed
to now create `ClientHttpConnectorFactory` instances which can be used
directly or by `AutoConfiguredWebClientSsl`.
Closes gh-18556
2023-04-21 20:39:18 -07:00
Phillip Webb
c59c8cc674
Change SslOptions to use null for defaults rather than empty sets
...
Update `SslOptions` so that `null` is used for default values rather
than empty sets. Most libraries use `null` to indicate defaults so
aligning our class makes things easier.
See gh-34814
2023-04-21 16:18:44 -07:00
Scott Frederick
fd5fd1491a
Add SSL bundle support to MongoDB auto-configuration
...
Update MongoDB auto-configuration so that an SSL can be configured
via an SSL bundle.
Closes gh-35042
2023-04-21 01:13:09 -07:00
Scott Frederick
1618aa2dac
Add SSL bundle support to Couchbase auto-configuration
...
Update Couchbase auto-configuration so that an SSL can be configured
via an SSL bundle.
Closes gh-34811
2023-04-21 01:13:09 -07:00
Scott Frederick
682457377a
Add SSL bundle support to Cassandra auto-configuration
...
Update Cassandra auto-configuration so that an SSL can be configured
via an SSL bundle.
Closes gh-25602
2023-04-21 01:13:09 -07:00
Scott Frederick
66db13b962
Refactor web server support to use SslBundles
...
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.
See gh-34814
2023-04-21 01:02:47 -07:00
Scott Frederick
8e1f24f98f
Add SSL bundle auto-configuration support
...
Add auto-configuration for SSL bundles including new configuration
properties that can be used to define a bundle.
SSL bundle properties are provided under the `spring.ssl.bundle` key.
Currently `jks` and `pem` variants are support. Both are configured
as a `Map` where the bundle name is the key.
A typical example would be:
spring:
ssl:
bundle:
pem:
mybundle
key:
password: secret
keystore:
certificate: classpath:mycert.pem
private-key: classpath:mykey.pem
A `SslBundleRegistrar` interface is also provided to allow programmatic
contributions to the auto-configured `SslBundleRegistry`.
See gh-34814
2023-04-21 01:01:54 -07:00
Andy Wilkinson
cbc03783d0
Allow startup to contiune when ConnectionDetailsFactory load fails
...
Prior to this commit, a failure to load a ConnectionDetailsFactory
caused startup to fail. This causes problems when some of a
factory's required classes were not available, for examle when using
spring-boot-docker-compose without Actuator.
Fixes gh-35100
2023-04-20 15:00:46 +01:00
Andy Wilkinson
a03fe8befc
Enable customization of JWK Set URI decoder builders
...
Closes gh-20750
2023-04-19 17:23:53 +01:00
Stephane Nicoll
366f7a85c9
Merge branch '3.0.x'
...
Closes gh-35069
2023-04-19 18:01:43 +02:00
Stephane Nicoll
6933796f2a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35068
2023-04-19 18:01:16 +02:00
Stephane Nicoll
1b832d82f8
Polish "Back off if a custom ApplicationAvailability bean is present"
...
See gh-34347
2023-04-19 17:25:10 +02:00
Taeik Lim
5e95ba8448
Back off if a custom ApplicationAvailability bean is present
...
See gh-34347
2023-04-19 17:24:59 +02:00
Andy Wilkinson
f5e654748c
Polish "Add customizer for conversion service used by Spring Batch"
...
See gh-34769
2023-04-19 14:15:08 +01:00
Claudio Nave
cafa6f5d9c
Add customizer for conversion service used by Spring Batch
...
See gh-34769
2023-04-19 13:25:31 +01:00
Stephane Nicoll
a323bd90a8
Polish "Reintroduce support for ActiveMQ"
...
See gh-35048
2023-04-19 13:08:14 +02:00
Martin BENDA
3e9908a797
Reintroduce support for ActiveMQ
...
See gh-35048
2023-04-19 11:00:40 +02:00
Andy Wilkinson
7b3e687f05
Deprecate OAuth2ClientPropertiesRegistrationAdapter
...
This commit deprecates OAuth2ClientPropertiesRegistrationAdapter as
it wasn't really an adapter because it provides a static utility
method rather than adapting one contract to another. A replacement,
OAuth2ClientPropertiesMapper, is introduced that maps the OAuth2
client properties to the required types.
Closes gh-34714
2023-04-18 20:43:34 +01:00
Andy Wilkinson
4eb7558707
Polish "Add properties to support device grant"
...
See gh-34957
2023-04-18 19:34:13 +01:00
Steve Riesenberg
25b582c822
Add properties to support device grant
...
This commit adds the following properties under
spring.security.oauth2.authorizationserver.client.[registration-id]:
* endpoint.device-authorization-uri
* endpoint.device-verification-uri
* token.device-code-time-to-live
See gh-34957
2023-04-18 19:15:12 +01:00
Andy Wilkinson
e2ee1ed50d
Fix password handling in Flyway auto-configuration
...
Previously, FlywayProperties returned an empty string when its
password had not been set. This prevented the desired fallback to
JdbcConnectionDetails.
Fixes gh-35046
2023-04-18 11:52:50 +01:00
Phillip Webb
81a972af8d
Refactor testcontainers service connections
...
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.
A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.
Closes gh-35017
2023-04-17 00:45:39 -07:00
Phillip Webb
2951cc7594
Polish
2023-04-17 00:42:28 -07:00
Phillip Webb
1849b82334
Don't apply configuration-properties from auto-configuration plugin
...
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This allows us to have auto-configuration modules that don't ship
configuration properties.
Closes gh-35028
2023-04-17 00:41:25 -07:00
Phillip Webb
053c968fb4
Polish
2023-04-14 17:44:15 -07:00
Phillip Webb
00dc942e94
Migrate to Spring Security lambda config
...
Closes gh-35011
2023-04-14 17:39:48 -07:00
Andy Wilkinson
397f16ce2d
Upgrade to Flyway 9.16.3
...
Closes gh-34990
2023-04-14 17:59:46 +01:00
Stephane Nicoll
c4c4eb93ae
Start building against Spring Security 6.1.0-RC1 snapshots
...
See gh-34969
2023-04-14 14:52:57 +02:00
Andy Wilkinson
d4980ea993
Always define connection details beans
...
Closes gh-34776
2023-04-13 18:02:35 +01:00
Andy Wilkinson
466b81f13d
Merge branch '3.0.x'
2023-04-13 14:41:40 +01:00
Andy Wilkinson
0e51cd583a
Merge branch '2.7.x' into 3.0.x
2023-04-13 14:27:00 +01:00
Andy Wilkinson
e70226b48e
Adapt to breaking changes in Spring Security internals
...
See gh-34948
2023-04-13 14:11:20 +01:00
Phillip Webb
e9a198a68f
Merge branch '3.0.x'
2023-04-12 22:16:35 -07:00
Stephane Nicoll
9a4a522004
Polish "Start building against Spring Security 6.0.3 snapshots"
...
See gh-34952
2023-04-12 12:29:58 +02:00
Stephane Nicoll
3f022867f4
Polish "Start building against Spring Security 5.7.8 snapshots"
...
See gh-34948
2023-04-12 12:26:43 +02:00
Stephane Nicoll
2dcb849c0f
Merge branch '3.0.x'
...
Closes gh-34939
2023-04-11 16:39:00 +02:00
Stephane Nicoll
320db790e7
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34938
2023-04-11 16:38:46 +02:00
Stephane Nicoll
4b8829364e
Polish "Use removeIf rather than Iterator-based removal"
...
See gh-34762
2023-04-11 16:32:26 +02:00
SeasonPan
0d13e31827
Use removeIf rather than Iterator-based removal
...
See gh-34762
2023-04-11 16:20:43 +02:00
Stephane Nicoll
029e47c647
Merge branch '3.0.x'
...
Closes gh-34937
2023-04-11 16:15:33 +02:00
Stephane Nicoll
55125c7a5c
Update copyright header of changed file
...
See gh-34844
2023-04-11 16:13:23 +02:00
Sanghyuk Jung
d4fe272ce5
Remove outdated reference to JPA in BatchProperties
...
See gh-34844
2023-04-11 16:12:31 +02:00
Stephane Nicoll
ab1e0f51c6
Merge branch '3.0.x'
...
Closes gh-34936
2023-04-11 16:07:10 +02:00
Stephane Nicoll
03d42deaea
Polish "Fix hint to include all Liquibase resources in default location"
...
See gh-34729
2023-04-11 16:02:09 +02:00
Andrii Bohutskyi
408d5246bc
Fix hint to include all Liquibase resources in default location
...
See gh-34729
2023-04-11 15:56:23 +02:00
Johnny Lim
7dbc7e7e39
Remove unused test configuration
...
See gh-34818
2023-04-11 15:28:21 +02:00
Stephane Nicoll
47baad1e44
Upgrade to Neo4j Java Driver 5.7.0
...
Closes gh-34934
2023-04-11 14:48:07 +02:00
Stephane Nicoll
bd0561fc10
Upgrade to Neo4j Java Driver 5.7.0
...
Closes gh-34930
2023-04-11 14:45:41 +02:00
Phillip Webb
463701db18
Merge branch '3.0.x'
2023-04-10 16:22:57 -07:00
Phillip Webb
d442bfbeff
Polish
2023-04-10 16:22:11 -07:00
Stephane Nicoll
d823d7b0b1
Upgrade to Undertow 2.2.24.Final
...
Closes gh-34910
2023-04-07 16:02:57 +02:00
Andy Wilkinson
16b126a481
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34799
2023-03-28 14:44:33 +01:00
Andy Wilkinson
c9e69b13b1
Resolve placeholders in reference config against all other config
...
Fixes gh-34643
2023-03-28 14:43:53 +01:00