Commit Graph

44474 Commits

Author SHA1 Message Date
Andy Wilkinson
d59ea2f038 Start building against Micrometer Tracing 1.1.6 snapshots
See gh-37694
2023-10-04 10:00:18 +01:00
Andy Wilkinson
452d441775 Start building against Micrometer 1.11.5 snapshots
See gh-37693
2023-10-04 09:55:35 +01:00
Andy Wilkinson
44f2afaad0 Merge branch '3.0.x' into 3.1.x 2023-10-04 09:53:07 +01:00
Andy Wilkinson
c06424f00a Start building against Spring Session 3.0.4 snapshots
See gh-37686
2023-10-04 09:52:50 +01:00
Andy Wilkinson
208f69b661 Start building against Spring Security 6.0.8 snapshots
See gh-37685
2023-10-04 09:52:50 +01:00
Andy Wilkinson
95e70c11d4 Start building against Spring Retry 2.0.4 snapshots
See gh-37684
2023-10-04 09:52:50 +01:00
Andy Wilkinson
150cb5bdb6 Start building against Spring LDAP 3.0.6 snapshots
See gh-37683
2023-10-04 09:52:50 +01:00
Andy Wilkinson
29ab800cba Start building against Spring Data Bom 2022.0.11 snapshots
See gh-37682
2023-10-04 09:52:49 +01:00
Andy Wilkinson
c72024de9f Start building against Spring AMQP 3.0.10 snapshots
See gh-37681
2023-10-04 09:52:49 +01:00
Andy Wilkinson
f1af6ff469 Start building against Reactor Bom 2022.0.12 snapshots
See gh-37680
2023-10-04 09:52:49 +01:00
Andy Wilkinson
7907358875 Start building against Micrometer Tracing 1.0.11 snapshots
See gh-37679
2023-10-04 09:52:49 +01:00
Andy Wilkinson
ec57eb3879 Start building against Micrometer 1.10.12 snapshots
See gh-37678
2023-10-04 09:52:48 +01:00
Moritz Halbritter
a416f93eec Merge branch '3.0.x' into 3.1.x
Closes gh-37691
2023-10-04 10:49:24 +02:00
Moritz Halbritter
b742bced31 Merge branch '2.7.x' into 3.0.x
Closes gh-37690
2023-10-04 10:49:10 +02:00
Moritz Halbritter
7a8536ef4e Merge pull request #37643 from bottlerocketjonny
* pr/37643:
  Polish "Remove link to LiveReload website due to timeout"
  Remove link to LiveReload website due to timeout

Closes gh-37643
2023-10-04 10:48:59 +02:00
Moritz Halbritter
63fccf43dc Polish "Remove link to LiveReload website due to timeout"
See gh-37643
2023-10-04 10:46:40 +02:00
Jonny Coddington
88bbab374d Remove link to LiveReload website due to timeout
See gh-37643
2023-10-04 10:44:14 +02:00
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