Andy Wilkinson
6353603d63
Avoid exposing Jetty's WebSocketUpgradeFilter as a bean
...
When the filter is exposed as a bean (directly or through a
registration bean), it's picked up by the auto-configuration of
MockMvc. This causes a problem as MockMvc does not call init on a
filter before it's used and WebSocketUpgradeFilter fails with a
NullPointerException if its doFilter method is called when its init
method has not been called.
This commit reworks the WebSocket auto-configuration to use a
ServletContextInitalizer to register WebSocketUpgradeFilter rather
than a FilterRegistrationBean. This ensure that the filter is still
registered at the required position in the chain (last filter before
the servlet) while also preventing it from being registered with the
auto-configured MockMvc in tests.
Closes gh-37660
2023-10-03 16:13:24 +01:00
Andy Wilkinson
a4100e12ff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37661
2023-10-03 11:05:51 +01:00
Andy Wilkinson
931584f8af
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37659
2023-10-03 10:28:51 +01:00
Johnny Lim
c9932bb73a
Use AssertJ's fail, not JUnit's
...
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.
See gh-37655
2023-10-03 10:11:12 +01:00
Andy Wilkinson
385e6278b7
Merge branch '3.0.x' into 3.1.x
2023-09-29 15:14:17 +01:00
Andy Wilkinson
26b9602596
Merge branch '2.7.x' into 3.0.x
2023-09-29 15:14:09 +01:00
Andy Wilkinson
0205b875a0
Polish
2023-09-29 15:13:58 +01:00
Andy Wilkinson
c4bccb2429
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37632
2023-09-29 14:59:06 +01:00
Andy Wilkinson
04054b6670
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37631
2023-09-29 14:58:52 +01:00
Andy Wilkinson
bfd1a29e53
Exclude AbstractTransactionAspect from lazy init
...
Fixes gh-37506
2023-09-29 14:16:27 +01:00
Scott Frederick
fad43adf14
Polish "Support IPv6 addresses when configuring RabbitMQ using properties"
...
See gh-37619
2023-09-28 16:07:25 -05:00
csk8167
c1972f6db6
Support IPv6 addresses when configuring RabbitMQ using properties
...
See gh-37619
2023-09-28 16:06:39 -05:00
Andy Wilkinson
6fb252b00c
Polish
2023-09-27 19:26:18 +01:00
Andy Wilkinson
4a3901149b
Fix additional metadata location for spring.jmx.registration-policy
...
Closes gh-37596
2023-09-27 18:15:05 +01:00
Andy Wilkinson
1bcd127ad0
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37609
2023-09-27 18:10:04 +01:00
Andy Wilkinson
c486892a9b
Fix additional metadata location for spring.webflux.multipart.streaming
...
Closes gh-37608
2023-09-27 18:09:14 +01:00
Andy Wilkinson
5015327886
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37594
2023-09-27 09:47:49 +01:00
Andy Wilkinson
6b107530f5
Polish "Use Neo4jManagedTypes to populate the mapping context"
...
See gh-37574
2023-09-27 09:33:56 +01:00
Michael Simons
e0a5de01ca
Use Neo4jManagedTypes to populate the mapping context
...
See gh-37574
2023-09-27 09:33:37 +01:00
Andy Wilkinson
c838c707d8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37553
2023-09-22 17:44:44 +01:00
Andy Wilkinson
e2982a3a07
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37552
2023-09-22 17:44:30 +01:00
Andy Wilkinson
feae7be0a1
Polish "Fix handling of JMS listener concurrency properties"
...
See gh-37180
2023-09-22 17:43:57 +01:00
Vedran Pavic
366607f517
Fix handling of JMS listener concurrency properties
...
Update JMS listener concurrency configuration to set the same minimum
and maximum number of consumers when users specify only the minimum
using `spring.jms.listener.concurrency` property.
Prior to this commit, when using `spring.jms.listener.concurrency` to
set the minimum number of consumers without also specifying
`spring.jms.listener.max-concurrency` would result in effective
concurrency where the actual minimum number of consumers is always 1,
while the maximum number of consumers is the value of
`spring.jms.listener.concurrency`.
See gh-37180
2023-09-22 17:43:56 +01:00
Phillip Webb
78eb8f90d1
Merge branch '3.0.x' into 3.1.x
2023-09-20 17:12:27 -07:00
Phillip Webb
9b5062e5bb
Merge branch '2.7.x' into 3.0.x
2023-09-20 17:06:55 -07:00
Phillip Webb
b83e7b42bb
Update copyright year of changed files
2023-09-20 16:05:44 -07:00
Moritz Halbritter
b2dc52fc74
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37482
2023-09-20 11:30:26 +02:00
Moritz Halbritter
5ec358099c
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37481
2023-09-20 11:29:38 +02:00
Moritz Halbritter
0ed455b058
Apply SAML2 sign-request even if metadata url is set
...
Closes gh-33747
2023-09-20 10:33:55 +02:00
Moritz Halbritter
8f52990c45
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37457
2023-09-19 13:16:57 +02:00
Moritz Halbritter
99473362d8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37456
2023-09-19 13:16:40 +02:00
Moritz Halbritter
95690f7327
Fall back to all media types if encountering invalid Accept header
...
A warn log message is printed, and if log level is set to debug, the
exception stacktrace is logged, too.
Closes gh-37455
2023-09-19 09:52:02 +02:00
Moritz Halbritter
7d505dc5b3
Polish JavaDoc
2023-09-18 15:27:07 +02:00
Moritz Halbritter
e2d84fa462
Make SslStoreBundle implementations immutable
...
Closes gh-37222
2023-09-11 15:39:25 +02:00
Andy Wilkinson
7754dd290a
Merge branch '3.0.x' into 3.1.x
2023-09-11 10:32:24 +01:00
Andy Wilkinson
994bafdfd9
Merge branch '2.7.x' into 3.0.x
2023-09-11 10:32:13 +01:00
Marten Deinum
5141e5c4ac
Fix description of brokerUrl property in ArtemisProperties
...
Update description to refer to url instead of port.
See gh-37260
2023-09-11 10:31:19 +01:00
Stephane Nicoll
0206c30238
Upgrade to Couchbase Client 3.4.10
...
Closes gh-37297
2023-09-11 10:53:53 +02:00
Stephane Nicoll
a52d7e255b
Upgrade to Couchbase Client 3.4.10
...
Closes gh-37289
2023-09-11 10:51:59 +02:00
Moritz Halbritter
1962f4ecb7
Merge branch '3.0.x' into 3.1.x
2023-09-05 15:24:25 +02:00
Moritz Halbritter
a69ff3bd59
Merge branch '2.7.x' into 3.0.x
2023-09-05 15:21:51 +02:00
Moritz Halbritter
76e51bc92f
Only enable needed Couchbase services in integration tests
2023-09-05 15:10:12 +02:00
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