Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
ec57eb3879 Start building against Micrometer 1.10.12 snapshots
See gh-37678
2023-10-04 09:52:48 +01:00
Moritz Halbritter
51d549964a Merge branch '3.1.x'
Closes gh-37692
2023-10-04 10:49:32 +02: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
18b28df809 Merge branch '3.1.x'
Closes gh-37689
2023-10-04 10:42:04 +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
2a7d87d87e Merge branch '3.1.x' 2023-10-04 09:08:08 +01: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
Moritz Halbritter
5b129ceb09 Switch reactor context propagation from auto to limited
- Polish
- Fix @since tags
- Add a test case
- Update context-propagation version

Closes gh-34201
2023-10-04 09:37:45 +02: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
Moritz Halbritter
30f29dead8 Revert "Temporarily remove auto-config for Reactor context propagation"
This reverts commit 88de3cc089.

See gh-34201
2023-10-04 09:12:27 +02:00
Phillip Webb
c6096e21a1 Set CI image locale to en_US.UTF-8
Closes gh-37673
2023-10-03 21:39:15 -07:00
Phillip Webb
1f5472387d Fix formatting 2023-10-03 20:41:48 -07:00
Phillip Webb
42f50fa292 Attempt to fix CI failures
Attempt to fix CI failures caused by timezone differences and different
JDK versions.

See gh-37668
2023-10-03 20:29:33 -07:00
Phillip Webb
560527945b Add background preinitializers for Tomcat and JDK ZoneId
Closes gh-37670
2023-10-03 17:28:44 -07:00
Phillip Webb
fd9b2b114e Improve Tomcat performance when using nested jars
Add `NestedJarResourceSet` which can be used for nested jar URLs
and unlike the standard Tomcat implementation does not assume that
the JAR is backed by a single file.

Closes gh-37452
2023-10-03 17:27:57 -07:00
Phillip Webb
7ad4a9817d Rewrite nested jar support code and remove Java 8 support
Rewrite nested jar code to better align with the implementations
provided in Java 17. This update makes two fundamental changes to
the previous implementation:

- Resource cleanup is now handled using the `java.lang.ref.Cleaner`

- Jar URLs now use the form `jar:nested:/my.jar/!nested.jar!/entry`

Unlike the previous `jar🫙/my,jar!/nested.jar!/entry` URL format,
the new format is compatible with Java's default Jar URL handler.
Specifically, it now only uses a single `jar:` prefix and it no longer
includes multiple `!/` separators.

In addition to the changes above, many of the ancillary classes have
also been refactored and updated to create cleaner APIs.

Closes gh-37668
2023-10-03 17:27:57 -07:00
Phillip Webb
75ddb9fa47 Fix test failure caused by PropertiesLoader class reference
See gh-37667
2023-10-03 17:27:39 -07:00
Phillip Webb
df7dde1467 Add classic loader module and the ability to easily switch implementations
Closes gh-37669
2023-10-03 15:44:32 -07:00
Phillip Webb
55b5610dd9 Add Maven and Gradle option for the loader implementation to use
Add properties to the Maven and Gradle plugins so that users can
switch between the two loader modules.

See gh-37669
2023-10-03 15:40:42 -07:00
Phillip Webb
a89057b7c7 Reintroduce spring-boot-loader modules
Restore the `spring-boot-loader` with the previous loader code so
that we can develop it further.

See gh-37669
2023-10-03 15:40:25 -07:00
Phillip Webb
aeb6537f57 Rename spring-boot-loader to spring-boot-loader-classic
Rename the `spring-boot-loader` module to `spring-boot-loader-classic`
so that we can introduce an alternative loader implementation.

See gh-37669
2023-10-03 15:40:04 -07:00
Phillip Webb
c22548982a Relocate launcher classes
Create alternative launcher classes under the package
`org.springframework.boot.loader.launch` and use them in favor
of the previous location.

This update is designed to improve compatibility with future
changes in the loader.

Closes gh-37667
2023-10-03 14:53:04 -07:00
Scott Frederick
f947bad3f7 Merge branch '3.1.x'
Closes gh-37666
2023-10-03 13:18:32 -05: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
12108e58e9 Merge branch '3.1.x'
Closes gh-37664
2023-10-03 16:47:11 +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
7d40a45b50 Merge branch '3.1.x'
Closes gh-37662
2023-10-03 11:21:29 +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
3d6859e80f Use the term "uber jar" in reference documentation and javadoc
Update reference documentation and javadoc to use the term "uber jar"
rather than "fat jar".

Closes gh-37653
2023-10-02 23:01:34 -07:00
Phillip Webb
780f75d5a2 Polish 2023-10-02 23:01:21 -07:00
Phillip Webb
e3036dcb99 Merge branch '3.1.x'
Closes gh-37658
2023-10-02 23:00:15 -07: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
Phillip Webb
932355adbf Polish adoc formatting 2023-10-02 21:18:26 -07:00