4131 Commits

Author SHA1 Message Date
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
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 7ffacf43f317d9645117e01f678429ed92182a9b

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