Commit Graph

935 Commits

Author SHA1 Message Date
Andy Wilkinson
a84e2db285 Merge branch '3.1.x' 2023-09-08 11:47:42 +01:00
Andy Wilkinson
c5908811ab Merge branch '3.0.x' into 3.1.x 2023-09-08 11:47:03 +01:00
Andy Wilkinson
b29b35905c Merge branch '2.7.x' into 3.0.x 2023-09-08 11:45:46 +01:00
Andy Wilkinson
2656f02001 Fix launch script integration tests on Intel Macs
Closes gh-36799
2023-09-08 11:45:25 +01:00
Andy Wilkinson
ed5d16de84 Upgrade to Jetty 12
Closes gh-36073
2023-09-07 13:59:15 +01:00
Phillip Webb
750c597225 Polish 'Add Pulsar ConnectionDetails support'
See gh-37197
2023-09-06 12:18:09 -07:00
Chris Bono
089fef0392 Add Pulsar ConnectionDetails support
Add `ConnectionDetails` support for Apache Pulsar and provide adapters
for Docker Compose and Testcontainers.

See gh-37197
2023-09-06 12:12:25 -07:00
Phillip Webb
9497f3d91c Polish "Combine Pulsar smoke tests"
See gh-37196
2023-09-05 20:42:14 -07:00
Chris Bono
eacf92b1b2 Combine Pulsar smoke tests
* Simplify produce/consume verify via OutputCapture

* Remove spring-boot-smoke-test-pulsar-reactive as
  no other smoke tests split them out

See gh-37196
2023-09-05 20:41:43 -07:00
Phillip Webb
2ebcdb059a Tweak Pulsar smoke test timeouts
See gh-34763
2023-09-05 18:46:58 -07:00
Phillip Webb
975cb27905 Protect against concurrent list updates in Pulsar samples
See gh-34763
2023-09-05 18:23:39 -07:00
Chris Bono
6e7b845bdf Add support for Apache Pulsar
Add support for Apache Pulsar using the Spring for Apache Pulsar
project.

See gh-34763

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-09-05 17:01:51 -07:00
Moritz Halbritter
e532b3b830 Merge branch '3.1.x'
Closes gh-37141
2023-08-30 14:16:32 +02:00
Moritz Halbritter
4a88604a01 Merge branch '3.0.x' into 3.1.x
Closes gh-37140
2023-08-30 14:16:07 +02:00
Moritz Halbritter
c749fcb478 Merge branch '2.7.x' into 3.0.x
Closes gh-37139
2023-08-30 14:15:27 +02:00
Moritz Halbritter
0f6342a882 Make JarLaunchScript and SysVinit integration tests ARM64 compatible
Closes gh-36799
2023-08-30 14:01:32 +02:00
Andy Wilkinson
bc88a133d3 Merge branch '3.1.x'
Closes gh-36869
2023-08-09 13:44:14 +01:00
Andy Wilkinson
fc91a84219 Merge branch '3.0.x' into 3.1.x
Closes gh-36868
2023-08-09 13:44:00 +01:00
Andy Wilkinson
1b7467adc3 Merge branch '2.7.x' into 3.0.x
Closes gh-36867
2023-08-09 13:43:51 +01:00
Andy Wilkinson
1765f4e9cf Ensure that server tests run when test apps have changed
Closes gh-19858
2023-08-09 13:43:24 +01:00
Moritz Halbritter
7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Stephane Nicoll
191ac10009 Deprecate support for OkHttp
Closes gh-36632
2023-08-01 16:45:13 +02:00
Moritz Halbritter
f85a7258a6 Polish SampleAmqpSimpleApplication 2023-07-27 16:32:53 +02:00
Stephane Nicoll
94d9148de6 Merge branch '3.1.x'
Closes gh-36613
2023-07-27 14:55:56 +02:00
Stephane Nicoll
6f22baa729 Merge branch '3.0.x' into 3.1.x
Closes gh-36612
2023-07-27 14:55:29 +02:00
Stephane Nicoll
150526a6a0 Merge branch '2.7.x' into 3.0.x
Closes gh-36611
2023-07-27 14:52:37 +02:00
Stephane Nicoll
87554fb4dc Add test for RabbitMQ smoke test
Closes gh-36610
2023-07-27 14:51:50 +02:00
Johnny Lim
96c9915f12 Polish
See gh-36565
2023-07-26 10:00:56 +02:00
Scott Frederick
c600be74ff Merge branch '3.1.x'
Closes gh-36542
2023-07-24 16:06:13 -05:00
Scott Frederick
bb4226397a Merge branch '3.0.x' into 3.1.x
Closes gh-36541
2023-07-24 16:05:57 -05:00
Scott Frederick
c5d2415834 Merge branch '2.7.x' into 3.0.x
Closes gh-36540
2023-07-24 16:04:28 -05:00
Scott Frederick
90be62bc7a Update Docker images used for launch script tests
Closes gh-24349
2023-07-24 15:46:30 -05:00
Stephane Nicoll
311fa6272d Polish "Add service connection for Testcontainers ActiveMQ"
This also adds support for Docker Compose.

See gh-35080
2023-07-20 13:03:41 +02:00
Eddú Meléndez
63121dd08a Add service connection for Testcontainers ActiveMQ
See gh-35080
2023-07-20 13:03:41 +02:00
Phillip Webb
ae6b1f91f6 Merge branch '3.1.x' 2023-07-18 10:32:06 +01:00
Phillip Webb
28b5b7a218 Merge branch '3.0.x' into 3.1.x 2023-07-18 10:32:01 +01:00
Phillip Webb
9d91dbc4e5 Use explicit matchers following Spring Security 6.0.5 upgrade
See gh-36293
2023-07-18 10:31:41 +01:00
Phillip Webb
49f82717d1 Merge branch '3.1.x' 2023-07-18 10:17:17 +01:00
Phillip Webb
30cc2a48c7 Merge branch '3.0.x' into 3.1.x 2023-07-18 10:16:56 +01:00
Phillip Webb
0233178855 Use explicit matchers following Spring Security 6.0.5 upgrade
See gh-36293
2023-07-18 09:49:11 +01:00
Andy Wilkinson
c3e2c9d684 Polish "Support Jetty in ClientHttpRequestFactories"
See gh-36116
2023-07-04 17:49:07 +01:00
Johnny Lim
7c77e1bb85 Polish 'Log correlation IDs when Micrometer tracing is being used'
See gh-36158
2023-07-02 20:08:45 +01:00
Andy Wilkinson
6d8ca7286a Merge branch '3.1.x'
Closes gh-36128
2023-06-30 08:26:26 +01:00
Andy Wilkinson
a268c6433e Merge branch '3.0.x' into 3.1.x
Closes gh-36127
2023-06-30 08:26:12 +01:00
Andy Wilkinson
93f8bd2170 Merge branch '2.7.x' into 3.0.x
Closes gh-36126
2023-06-30 08:25:53 +01:00
Andy Wilkinson
996252f929 Stop using deprecated classifier property
Closes gh-36125
2023-06-30 08:22:14 +01:00
Andy Wilkinson
e8cbb9ae1b Stop using deprecated JavaExec property in spring-boot-smoke-test-ant
Closes gh-36086
2023-06-27 11:17:50 +01:00
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
2023-06-26 20:58:59 +01:00
Scott Frederick
47cc65d912 Merge branch '3.1.x'
Closes gh-36056
2023-06-23 16:12:58 -06:00
Scott Frederick
c277517953 Polish "Add SslAutoConfiguration to slice test annotations"
See gh-36038
2023-06-23 16:11:49 -06:00