root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
44,610 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

4261 Commits

Author SHA1 Message Date
Andy Wilkinson c7063af63a Merge branch '3.0.x' into 3.1.x 
Closes gh-37158
 2023-08-31 15:23:21 +01:00
Andy Wilkinson 67e1ee5dcf Fix ordering of Jetty's WebSocketUpgradeFilter 
Closes gh-37115
 2023-08-31 15:22:26 +01:00
Stephane Nicoll 10873b0e7c Merge branch '3.0.x' into 3.1.x 2023-08-22 14:45:02 +02:00
Stephane Nicoll e8d329d99f Polish 2023-08-22 14:44:02 +02:00
Moritz Halbritter a6b63d285c Merge branch '3.0.x' into 3.1.x 
Closes gh-37015
 2023-08-17 12:18:11 +02:00
Moritz Halbritter d3816651ce Merge branch '2.7.x' into 3.0.x 
Closes gh-37014
 2023-08-17 12:02:33 +02:00
Moritz Halbritter dc62e5fbc3 Polish "Set max request header size on Netty when using HTTP/2" 
See gh-36766
 2023-08-17 11:50:18 +02:00
Nerses Aznauryan ee5b23bb02 Set max request header size on Netty when using HTTP/2 
Fix an issue that server.max-http-request-header-size doesn't have an
effect on Netty server with http2 enabled.

See gh-36766
 2023-08-17 11:47:01 +02:00
Phillip Webb 155300525e Polish 2023-08-13 19:15:38 -07:00
Phillip Webb 848a61a3a8 Merge branch '3.0.x' into 3.1.x 2023-08-13 18:50:33 -07:00
Phillip Webb 9805723415 Update copyright year of changed files 2023-08-13 18:50:13 -07:00
Phillip Webb a0089c5c76 Merge branch '2.7.x' into 3.0.x 2023-08-13 18:44:36 -07:00
Phillip Webb 46773dd5df Update copyright year of changed files 2023-08-13 18:19:05 -07:00
Phillip Webb 527b2f2cac Polish 2023-08-13 18:18:48 -07:00
Andy Wilkinson cac157b2a6 Merge branch '3.0.x' into 3.1.x 
Closes gh-36865
 2023-08-09 13:01:33 +01:00
Andy Wilkinson 7c77668372 Merge branch '2.7.x' into 3.0.x 
Closes gh-36864
 2023-08-09 13:01:23 +01:00
Andy Wilkinson c1f2efe00c Document that spring.security.filter properties are Servlet-only 
Closes gh-33551
 2023-08-09 12:56:33 +01:00
Stephane Nicoll 10fecc855c Merge branch '3.0.x' into 3.1.x 
Closes gh-36772
 2023-08-07 14:08:57 +02:00
Stephane Nicoll e7706b4201 Merge branch '2.7.x' into 3.0.x 
Closes gh-36771
 2023-08-07 14:08:48 +02:00
Stephane Nicoll 5e11bac1da Polish "Configure ActiveMQConnectionFactory properly without spring-jms" 
See gh-36767
 2023-08-07 14:05:31 +02:00
Eddú Meléndez bcfaad2cb8 Configure ActiveMQConnectionFactory properly without spring-jms 
Previously, if spring-jms is not available and a non-pool connection
factory is requested (the default), no `CachingConnectionFactory` is
created. This commit makes sure to separate the two conditions, so
that a connection factory can be obtained even if spring-jms is not
on the classpath.

See gh-36767
 2023-08-07 14:03:27 +02:00
Andy Wilkinson 664581eb90 Merge branch '3.0.x' into 3.1.x 
Closes gh-36700
 2023-08-03 12:44:26 +01:00
Andy Wilkinson c6dc505932 Auto-configure JsonpMapper even with user-defined transport 
Closes gh-36698
 2023-08-03 12:44:13 +01:00
Andy Wilkinson 12a2c615a9 Merge branch '3.0.x' into 3.1.x 
Closes gh-36696
 2023-08-03 10:10:22 +01:00
Andy Wilkinson 803c155e69 Order default customizers so that they can be overridden 
Closes gh-36674
 2023-08-03 10:09:27 +01:00
Andy Wilkinson 0d646d7c26 Polish "Support ServiceConnection beans in slice tests" 
See gh-36037
 2023-08-01 18:12:53 +01:00
Michael Simons ef3b99ee51 Fix test declaration in Neo4jAutoConfigurationTests 
The test was annotated `@Bean`, must be `@Test`.

See gh-36649
 2023-07-31 17:12:57 +02:00
Stephane Nicoll a607056b98 Merge branch '3.0.x' into 3.1.x 
Closes gh-36532
 2023-07-24 16:31:56 +02:00
Stephane Nicoll 259fac57a9 Merge branch '2.7.x' into 3.0.x 
Closes gh-36531
 2023-07-24 16:29:56 +02:00
Stephane Nicoll 854c162966 Polish "Fail fast if job name does not exist" 
See gh-36060
 2023-07-24 16:21:44 +02:00
Akshay Dubey c38cd74542 Fail fast if job name does not exist 
See gh-36060
 2023-07-24 16:15:04 +02:00
Stephane Nicoll 89066b4d1e Merge branch '3.0.x' into 3.1.x 
Closes gh-36529
 2023-07-24 16:09:32 +02:00
Stephane Nicoll 73cc54ad34 Prevent PostConstruct to be used in production code 
Closes gh-36528
 2023-07-24 16:08:50 +02:00
Andy Wilkinson c38bca04c4 Merge branch '3.0.x' into 3.1.x 
Closes gh-36492
 2023-07-21 15:28:02 +01:00
Andy Wilkinson 6a2a3e2b26 Merge branch '2.7.x' into 3.0.x 
Closes gh-36491
 2023-07-21 15:06:34 +01:00
Andy Wilkinson 5a0f1bbe9b Polish "Correct description of overrides for spring.redis.url" 
See gh-36477
 2023-07-21 14:47:54 +01:00
Johnny Lim 1effd3723f Correct description of overrides for spring.redis.url 
See gh-36477
 2023-07-21 14:47:25 +01:00
Andy Wilkinson fe123e5b10 Fix handling of additional-hosts with Mongo 
Closes gh-36441
 2023-07-18 21:15:20 +01:00
Johnny Lim 9b38db6672 Polish PemSslBundleProperties 
See gh-36281
 2023-07-17 13:22:27 +02:00
Stephane Nicoll d2912c6442 Update copyright year of changed files 
See gh-36306
 2023-07-17 09:40:57 +02:00
Christoph Dreis 8321887d6a Fix typos 
See gh-36306
 2023-07-17 09:40:16 +02:00
Andy Wilkinson 3f4474031f Merge branch '3.0.x' into 3.1.x 
Closes gh-36409
 2023-07-14 10:42:05 +01:00
Pengfei-Lu 8697d9ddd5 Correct conditions on auto-configured JacksonJsonpMapper 
See gh-36109

Signed-off-by: Pengfei-Lu <459360594@qq.com>
 2023-07-13 18:10:21 +01:00
Andy Wilkinson 0d06747b41 Fix problem with @ and : chars in Mongo username and password 
Fixes gh-36261
 2023-07-10 13:35:08 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x 
Closes gh-36237
 2023-07-05 09:47:43 +01:00
Phillip Webb 1f68db06ba Merge branch '3.0.x' into 3.1.x 
Closes gh-36163
 2023-07-02 19:47:17 +01:00
Phillip Webb f1b0d76d9b Merge branch '2.7.x' into 3.0.x 
Closes gh-36162
 2023-07-02 19:46:45 +01:00
Phillip Webb b6990940b1 Polish 'Choose SAML party based on entity ID rather than always using first' 
See gh-35902
 2023-07-02 19:02:08 +01:00
Lasse Lindqvist 864af59adc Choose SAML party based on entity ID rather than always using first 
Update `Saml2RelyingPartyRegistrationConfiguration` so that
`RelyingPartyRegistrations` uses `collectionFromMetadataLocation`
rather than `fromMetadataLocation` and searches candidates for a
matching entity ID.

Prior to this commit, it was possible for the wrong provider to be
used if multiple candidates existed in the returned metadata.

See gh-35902
 2023-07-02 18:54:34 +01:00
Johnny Lim 58a9961a31 Name methods consistently in KafkaConnectionDetails 
See gh-35733
 2023-06-30 11:26:25 +01:00
Scott Frederick 0a51c466f4 Merge branch '3.0.x' into 3.1.x 
Closes gh-36123
 2023-06-29 16:54:45 -06:00
Andy Wilkinson e2f8fcf292 Merge branch '3.0.x' into 3.1.x 
Closes gh-36121
 2023-06-29 18:10:33 +01:00
Andy Wilkinson 6effd6061c Provide hints when template auto-config is excluded 
Fixes gh-35682
 2023-06-29 18:09:30 +01:00
Andy Wilkinson ba8b1717fb Merge branch '3.0.x' into 3.1.x 
Closes gh-36099
 2023-06-27 20:30:47 +01:00
Andy Wilkinson 79cd3a027a Merge branch '2.7.x' into 3.0.x 
Closes gh-36098
 2023-06-27 20:30:24 +01:00
Andy Wilkinson 9e1f2c4257 Tolerate Flway 9.20 
Closes gh-36029
 2023-06-27 20:22:24 +01:00
Andy Wilkinson 9a57611ef5 Merge branch '3.0.x' into 3.1.x 
Closes gh-36091
 2023-06-27 14:02:57 +01:00
Andy Wilkinson ffbef7bb80 Test server.max-http-request-header-size with Undertow 
Closes gh-36047
 2023-06-27 13:50:04 +01:00
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x 
Closes gh-36044
 2023-06-23 15:58:36 +01:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x 
Closes gh-36043
 2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking" 
See gh-35915
 2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking 
See gh-35915
 2023-06-23 12:16:26 +01:00
Phillip Webb 7a2fc9e636 Fix checkstyle violation 
See gh-35914
 2023-06-21 12:27:56 -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 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
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 baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -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 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
Scott Frederick 7e6452edee Fix Redis URL property userinfo parsing 
Fixes gh-35850
 2023-06-13 16:42:19 -05: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 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 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