Commit Graph

44507 Commits

Author SHA1 Message Date
Moritz Halbritter
3bdfc468c8 Merge branch '3.0.x' into 3.1.x
Closes gh-37688
2023-10-04 10:41:52 +02:00
Moritz Halbritter
8dda0a95d8 Merge branch '2.7.x' into 3.0.x
Closes gh-37687
2023-10-04 10:41:36 +02:00
Moritz Halbritter
d987627b32 Merge pull request #37651 from dependabot[bot]
* pr/37651:
  Update gradle/gradle-build-action to 2.9.0

Closes gh-37651
2023-10-04 10:41:09 +02:00
dependabot[bot]
2c2e224602 Update gradle/gradle-build-action to 2.9.0
See gh-37651
2023-10-04 10:39:13 +02:00
Andy Wilkinson
80beb0e719 Merge branch '3.0.x' into 3.1.x 2023-10-04 09:07:52 +01:00
Andy Wilkinson
0e22499d20 Merge branch '2.7.x' into 3.0.x 2023-10-04 09:07:39 +01:00
Andy Wilkinson
da319841b8 Start building against Spring Data Bom 2021.2.17 snapshots
See gh-37677
2023-10-04 08:29:43 +01:00
Andy Wilkinson
21661c6a1a Start building against Spring AMQP 2.4.17 snapshots
See gh-37676
2023-10-04 08:29:37 +01:00
Andy Wilkinson
026bc31c3e Start building against Reactor Bom 2020.0.37 snapshots
See gh-37675
2023-10-04 08:29:32 +01:00
Andy Wilkinson
21a618a6c4 Start building against Micrometer 1.9.16 snapshots
See gh-37674
2023-10-04 08:29:27 +01:00
Ivo Smid
f2a4336ea1 Increase the socket timeout for remote connections to Docker daemon
The default socket timeout with HttpClient 5 is not long enough
in some cases where Docker images are built that require the
GraalVM native image compiler to run in a buildpack. This commit
increases the timeout to 30 minutes.

Fixes gh-37665

Co-authored-by: Scott Frederick <sfrederick@vmware.com>"
2023-10-03 11:52:48 -05: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
Andy Wilkinson
26ff1e907f Merge pull request #37655 from izeye
* gh-37655:
  Use AssertJ's fail, not JUnit's

Closes gh-37655
2023-10-03 10:17:45 +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
Phillip Webb
904bd52260 Merge branch '3.0.x' into 3.1.x
Closes gh-37657
2023-10-02 22:59:57 -07:00
Phillip Webb
7bb60fc7c7 Merge branch '2.7.x' into 3.0.x
Closes gh-37656
2023-10-02 22:59:45 -07:00
Phillip Webb
ed4ab667a1 Enable LoaderIntegrationTests on aarch64
Closes gh-37654
2023-10-02 22:42:21 -07:00
Andy Wilkinson
1e4deed8ce Merge branch '3.0.x' into 3.1.x
Closes gh-37635
2023-09-29 18:36:09 +01:00
Andy Wilkinson
458418be29 Automatically register reflection hints for scanned WebListeners
Closes gh-36008
2023-09-29 18:09:36 +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
6c16ff104e Merge pull request #37497 from JinseongHwang
* pr/37497:
  Use consistent capitalization in MySQL and MariaDB test names

Closes gh-37497
2023-09-28 16:31:58 -05:00
JinseongHwang
0b703f9007 Use consistent capitalization in MySQL and MariaDB test names
See gh-37497
2023-09-28 16:28:32 -05:00
Scott Frederick
667797f2a8 Merge pull request #37619 from jonasfugedi
* pr/37619:
  Polish "Support IPv6 addresses when configuring RabbitMQ using properties"
  Support IPv6 addresses when configuring RabbitMQ using properties

Closes gh-37619
2023-09-28 16:11:12 -05: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
Moritz Halbritter
a1947d6deb Merge branch '3.0.x' into 3.1.x
Closes gh-37615
2023-09-28 08:53:12 +02:00
Moritz Halbritter
d266806368 Merge branch '2.7.x' into 3.0.x
Closes gh-37614
2023-09-28 08:51:12 +02:00
Moritz Halbritter
1cdb238577 Merge pull request #37606 from jbertram
* pr/37606:
  Clarify ActiveMQ usage in JMS docs

Closes gh-37606
2023-09-28 08:48:14 +02:00
Moritz Halbritter
8a5979ee8c Clarify ActiveMQ usage in JMS docs
The Apache ActiveMQ project has adopted the label "Classic" for the 5.x
broker in order to more easily compare and contrast it with the broker
code-named Artemis.

See gh-37606
2023-09-28 08:46:47 +02: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
0368fc5678 Merge branch '3.0.x' into 3.1.x
Closes gh-37600
2023-09-27 12:38:21 +01:00
Andy Wilkinson
688a69b9b1 Prevent status messages from logging when Logback is being configured
There's a window where the deny-all turbo filter has been removed but
Logback has not yet been configured. If any logging that would have
reached an appender is performed in this window, unwanted status
messages will be logged. This window can be closed by ensuring that
the turbo filter is in place while Logback is being configured.

Closes gh-34505
2023-09-27 12:28:23 +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
4e40ff8341 Merge pull request #37574 from michael-simons
* gh-37574:
  Polish "Use Neo4jManagedTypes to populate the mapping context"
  Use Neo4jManagedTypes to populate the mapping context

Closes gh-37574
2023-09-27 09:47:40 +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
a57b19b2ca Merge branch '3.0.x' into 3.1.x
Closes gh-37592
2023-09-27 09:18:15 +01:00
Andy Wilkinson
c6abf888cc Merge branch '2.7.x' into 3.0.x
Closes gh-37591
2023-09-27 09:18:00 +01:00
Andy Wilkinson
071a5951e9 Merge pull request #37578 from onobc
* gh-37578:
  Use larger runner for PR workflow

Closes gh-37578
2023-09-27 09:17:33 +01:00