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