Commit Graph

339 Commits (0371f3f8810474ecc84f517f3fb63c8ed6d27eb3)

Author SHA1 Message Date
Andy Wilkinson a84e2db285 Merge branch '3.1.x' 1 year ago
Andy Wilkinson b29b35905c Merge branch '2.7.x' into 3.0.x 1 year ago
Andy Wilkinson 2656f02001 Fix launch script integration tests on Intel Macs
Closes gh-36799
1 year ago
Andy Wilkinson ed5d16de84 Upgrade to Jetty 12
Closes gh-36073
1 year ago
Moritz Halbritter e532b3b830 Merge branch '3.1.x'
Closes gh-37141
1 year ago
Moritz Halbritter c749fcb478 Merge branch '2.7.x' into 3.0.x
Closes gh-37139
1 year ago
Moritz Halbritter 0f6342a882 Make JarLaunchScript and SysVinit integration tests ARM64 compatible
Closes gh-36799
1 year ago
Andy Wilkinson bc88a133d3 Merge branch '3.1.x'
Closes gh-36869
1 year ago
Andy Wilkinson 1b7467adc3 Merge branch '2.7.x' into 3.0.x
Closes gh-36867
1 year ago
Andy Wilkinson 1765f4e9cf Ensure that server tests run when test apps have changed
Closes gh-19858
1 year ago
Scott Frederick c600be74ff Merge branch '3.1.x'
Closes gh-36542
1 year ago
Scott Frederick c5d2415834 Merge branch '2.7.x' into 3.0.x
Closes gh-36540
1 year ago
Scott Frederick 90be62bc7a Update Docker images used for launch script tests
Closes gh-24349
1 year ago
Andy Wilkinson 6d8ca7286a Merge branch '3.1.x'
Closes gh-36128
1 year ago
Andy Wilkinson 93f8bd2170 Merge branch '2.7.x' into 3.0.x
Closes gh-36126
1 year ago
Andy Wilkinson 996252f929 Stop using deprecated classifier property
Closes gh-36125
1 year ago
Andy Wilkinson dbb24286ff Separate stopping and destruction so web server can be restarted
Previously, when a Servlet-based WebServer was stopped it would also
stop the ServletContext. This led to problems as Tomcat and Undertow
would then not allow a restart. Jetty would allow a restart but
duplicate servlet registrations would then be attempted.

This commit modifies the WebServer lifecycle to separate stopping
and destruction for both servlet and reactive web servers. This
allows a WebServer's stop() implementation to leave some components
running so that they can be restarted. To completely shut down a
WebServer destroy() must now be called.

Both Tomcat and Jetty WebServers have been updated to stop their
network connections when stop() is called but leave other components
running. This works with both servlet and reactive web servers.

Note that an Undertow-based Servlet web server does not support
stop and restart. Once stopped, a Servlet Deployment cannot be
restarted and it does not appear to be possible to separate the
lifecycle of its network connections and a Servlet deployment.

Reactor Netty and Undertow-based reactive web servers can now also
be stopped and then restarted. Calling stop() stops the whole server
but this does not cause a problem as there's no (application-exposed)
ServletContext involved. There may be room to optimize this in the
future if the need arises.

Closes gh-34955
1 year ago
Moritz Halbritter 23979e6ccf Enable LoaderIntegrationTests on Java 21 1 year ago
Moritz Halbritter 372af21313 Merge branch '2.7.x' into 3.0.x 1 year ago
Moritz Halbritter 140e806357 Enable LoaderIntegrationTests on Java 20
See gh-35758
1 year ago
Moritz Halbritter c2dd20f4ea Merge branch '2.7.x' into 3.0.x 2 years ago
Moritz Halbritter f5eb76074b Disable loader integration tests on aarch64 linux and mac
See gh-35229
2 years ago
Moritz Halbritter f3d0bc7a99 Disable launch script integration tests on aarch64 linux and mac
See gh-35229
2 years ago
Phillip Webb d1f89db9a2 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb d39c94f437 Refine ConfigurationProcessorIntegrationTests resource detection logic 2 years ago
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2 years ago
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2 years ago
Andy Wilkinson b67c427259 Upgrade to Servlet 6.0 and related EE 10 specs
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
2 years ago
Phillip Webb d7941c6315 Polish 2 years ago
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2 years ago
Scott Frederick c22e76632c Add Build-Jdk-Spec to jar and war manifest when building with Gradle
This commit adds a `Build-Jdk-Spec` attribute to the manifest in a
jar or war file built with the Spring Boot Gradle plugin. This
aligns the Gradle plugin's behavior with the default Maven plugin
behavior.

This removes the need to set a `BP_JVM_VERSION` environment variable
when invoking Cloud Native Buildpacks, as the Paketo buildpacks will
honor `Build-Jdk-Spec` in a jar or war manifest to determine the
default JVM version.

Fixes gh-32829
2 years ago
Phillip Webb e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2 years ago
Brian Clozel a0735eb3fb Migrate remaining usage of httpclient API
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.

Closes gh-32461
2 years ago
Brian Clozel 5fb2a50ad0 Adapt build dependencies to httpclient5
As htttpclient 4.x is not supported anymore by `RestTemplate`, this
commit changes such dependencies to httpclient5 instead. In some cases,
the httpclient 4.x was transitively brought by a non-Spring dependency.

See gh-32461
2 years ago
Stephane Nicoll 72fc1f0018 Merge branch '2.7.x'
Closes gh-32512
2 years ago
Stephane Nicoll 9a004a6508 Merge branch '2.6.x' into 2.7.x
Closes gh-32511
2 years ago
Johnny Lim 975affc497 Enable LoaderIntegrationTests with Java 19
See gh-32501
2 years ago
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2 years ago
Stephane Nicoll 4f6c3ab2b0 Upgrade to JUnit Jupiter 5.9.0
Closes gh-32351
2 years ago
Andy Wilkinson a896fd0a36 Merge branch '2.7.x' 2 years ago
Andy Wilkinson dffce2553c Merge branch '2.6.x' into 2.7.x 2 years ago
Andy Wilkinson 9fe9f31af1 Polish 2 years ago
Andy Wilkinson 144abee80a Merge branch '2.7.x' 2 years ago
Andy Wilkinson b512083b3a Merge branch '2.6.x' into 2.7.x 2 years ago
Andy Wilkinson a262520f08 Disable LoaderIntegrationTests on Java 19 till it GAs
See gh-32280
2 years ago
Stephane Nicoll aa6e52f029 Merge branch '2.7.x' 2 years ago
Stephane Nicoll 71fa410929 Merge branch '2.6.x' into 2.7.x 2 years ago
Stephane Nicoll c3416ac97a Disable LoaderIntegrationTests with Java 19
See gh-32295
2 years ago
Scott Frederick da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2 years ago