fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,740 Commits 22 Branches 339 Tags
Commit Graph

4270 Commits

Author SHA1 Message Date
Andy Wilkinson
4faabcfcdd Merge branch '3.0.x' into 3.1.x 
Closes gh-38018
 2023-10-25 10:44:38 +01:00
Andy Wilkinson
b33ee84146 Merge branch '2.7.x' into 3.0.x 
Closes gh-38017
 2023-10-25 10:44:03 +01:00
Andy Wilkinson
8778884f5d Clarify role of WebMvcRegistrations and WebMvcConfigurer 
Closes gh-31232
 2023-10-25 10:42:25 +01:00
Phillip Webb
9f3afb3636 Merge branch '3.0.x' into 3.1.x 2023-10-19 23:21:20 -07:00
Phillip Webb
7c864804d5 Merge branch '2.7.x' into 3.0.x 2023-10-19 23:21:08 -07:00
Phillip Webb
d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb
1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07:00
Phillip Webb
a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Andy Wilkinson
411586347c Merge branch '3.0.x' into 3.1.x 
Closes gh-37829
 2023-10-11 15:04:21 +01:00
Andy Wilkinson
781ac2ece2 Merge branch '2.7.x' into 3.0.x 
Closes gh-37828
 2023-10-11 15:02:36 +01:00
Andy Wilkinson
5a75fae23b Polish "Polish" 
See gh-37745
 2023-10-11 14:58:04 +01:00
Johnny Lim
303015ea2d Polish 
See gh-37745
 2023-10-11 14:57:38 +01:00
Andy Wilkinson
1087827b9a Merge branch '3.0.x' into 3.1.x 
Closes gh-37805
 2023-10-10 11:27:37 +01:00
Andy Wilkinson
5fcdee6bb5 Merge branch '2.7.x' into 3.0.x 
Closes gh-37804
 2023-10-10 11:26:39 +01:00
Andy Wilkinson
6df5389d76 Use RedisSeralizer.java(ClassLoader) factory method 
Closes gh-37800
 2023-10-10 11:25:22 +01:00
Andy Wilkinson
8cf686d925 Merge branch '3.0.x' into 3.1.x 
Closes gh-37663
 2023-10-03 16:27:19 +01:00
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