5556739c8c
Add SSL bundle support to Rabbit auto-configuration
2023-10-11 15:39:51 -05:00
927ece3bfc
Merge branch '3.1.x'
2023-10-10 12:31:44 -07:00
01128465ff
Merge branch '3.0.x' into 3.1.x
2023-10-10 12:31:28 -07:00
885189a1b4
Merge branch '2.7.x' into 3.0.x
2023-10-10 12:30:11 -07:00
f04d354c29
Attempt to fix download cache on CI
...
See gh-37450
2023-10-10 11:46:20 -07:00
48059417b5
Upgrade to Kafka 3.6.0
...
Closes gh-37777
2023-10-09 13:46:52 +01:00
6c24ea01f1
Add BouncyCastle nested jar verification test including on Oracle JDK
...
Update `spring-boot-loader-tests` with a test that checks verified
BouncyCastle jars can be loaded. Currently the Oracle JDK only supports
verification if the jar is unpacked.
See gh-28837
2023-10-05 22:13:31 -07:00
79d2208908
Merge branch '3.1.x'
2023-10-05 22:10:34 -07:00
1b1c1f1b64
Merge branch '3.0.x' into 3.1.x
2023-10-05 22:10:22 -07:00
3c31a6fc3b
Merge branch '2.7.x' into 3.0.x
2023-10-05 22:10:14 -07:00
c37290bc6c
Fix Oracle JDK download URL
...
See gh-37450
2023-10-05 22:09:45 -07:00
b0b3adb1b7
Merge branch '3.1.x'
...
Closes gh-37741
2023-10-05 21:30:43 -07:00
2a35667295
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37740
2023-10-05 21:30:10 -07:00
30af19acc2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37739
2023-10-05 20:54:09 -07:00
a33ce9d405
Cache JDK downloads for tests that use ImageFromDockerfile
...
Update `spring-boot-launch-script-tests` and `spring-boot-loader-tests`
so that JDK archives are now downloaded by Gradle and cached across
builds.
Closes gh-37450
2023-10-05 20:49:02 -07:00
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
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
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
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
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
780f75d5a2
Polish
2023-10-02 23:01:21 -07:00
e3036dcb99
Merge branch '3.1.x'
...
Closes gh-37658
2023-10-02 23:00:15 -07:00
904bd52260
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37657
2023-10-02 22:59:57 -07:00
7bb60fc7c7
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37656
2023-10-02 22:59:45 -07:00
ed4ab667a1
Enable LoaderIntegrationTests on aarch64
...
Closes gh-37654
2023-10-02 22:42:21 -07:00
a7373c182a
Merge branch '3.1.x'
...
Closes gh-37523
2023-09-22 08:42:18 +02:00
b5ec0c2f5d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37522
2023-09-22 08:42:08 +02:00
58941d85f2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37521
2023-09-22 08:41:58 +02:00
f96690348f
Use Bellsoft JDK 21 in LoaderIntegrationTests
...
Closes gh-35900
2023-09-22 08:35:22 +02:00
dc9a48030c
Merge branch '3.0.x' into 3.1.x
2023-09-13 13:37:41 +01:00
3eb89343d0
Merge branch '2.7.x' into 3.0.x
2023-09-13 13:37:31 +01:00
c4368bc934
Run LoaderIntegrationTests on Java 21
...
See gh-37359
2023-09-13 13:36:04 +01:00
c2b78830ff
Polish
...
See gh-37340
2023-09-13 10:26:54 +02:00
a84e2db285
Merge branch '3.1.x'
2023-09-08 11:47:42 +01:00
c5908811ab
Merge branch '3.0.x' into 3.1.x
2023-09-08 11:47:03 +01:00
b29b35905c
Merge branch '2.7.x' into 3.0.x
2023-09-08 11:45:46 +01:00
2656f02001
Fix launch script integration tests on Intel Macs
...
Closes gh-36799
2023-09-08 11:45:25 +01:00
ed5d16de84
Upgrade to Jetty 12
...
Closes gh-36073
2023-09-07 13:59:15 +01:00
750c597225
Polish 'Add Pulsar ConnectionDetails support'
...
See gh-37197
2023-09-06 12:18:09 -07:00
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
9497f3d91c
Polish "Combine Pulsar smoke tests"
...
See gh-37196
2023-09-05 20:42:14 -07:00
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
2ebcdb059a
Tweak Pulsar smoke test timeouts
...
See gh-34763
2023-09-05 18:46:58 -07:00
975cb27905
Protect against concurrent list updates in Pulsar samples
...
See gh-34763
2023-09-05 18:23:39 -07:00
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
e532b3b830
Merge branch '3.1.x'
...
Closes gh-37141
2023-08-30 14:16:32 +02:00
4a88604a01
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37140
2023-08-30 14:16:07 +02:00
c749fcb478
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37139
2023-08-30 14:15:27 +02:00
0f6342a882
Make JarLaunchScript and SysVinit integration tests ARM64 compatible
...
Closes gh-36799
2023-08-30 14:01:32 +02:00
bc88a133d3
Merge branch '3.1.x'
...
Closes gh-36869
2023-08-09 13:44:14 +01:00
fc91a84219
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36868
2023-08-09 13:44:00 +01:00
1b7467adc3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36867
2023-08-09 13:43:51 +01:00
1765f4e9cf
Ensure that server tests run when test apps have changed
...
Closes gh-19858
2023-08-09 13:43:24 +01:00
7bb337aeb1
Polish tests
2023-08-08 13:12:47 +02:00
191ac10009
Deprecate support for OkHttp
...
Closes gh-36632
2023-08-01 16:45:13 +02:00
f85a7258a6
Polish SampleAmqpSimpleApplication
2023-07-27 16:32:53 +02:00
94d9148de6
Merge branch '3.1.x'
...
Closes gh-36613
2023-07-27 14:55:56 +02:00
6f22baa729
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36612
2023-07-27 14:55:29 +02:00
150526a6a0
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36611
2023-07-27 14:52:37 +02:00
87554fb4dc
Add test for RabbitMQ smoke test
...
Closes gh-36610
2023-07-27 14:51:50 +02:00
96c9915f12
Polish
...
See gh-36565
2023-07-26 10:00:56 +02:00
c600be74ff
Merge branch '3.1.x'
...
Closes gh-36542
2023-07-24 16:06:13 -05:00
bb4226397a
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36541
2023-07-24 16:05:57 -05:00
c5d2415834
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36540
2023-07-24 16:04:28 -05:00
90be62bc7a
Update Docker images used for launch script tests
...
Closes gh-24349
2023-07-24 15:46:30 -05:00
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
63121dd08a
Add service connection for Testcontainers ActiveMQ
...
See gh-35080
2023-07-20 13:03:41 +02:00
ae6b1f91f6
Merge branch '3.1.x'
2023-07-18 10:32:06 +01:00
28b5b7a218
Merge branch '3.0.x' into 3.1.x
2023-07-18 10:32:01 +01:00
9d91dbc4e5
Use explicit matchers following Spring Security 6.0.5 upgrade
...
See gh-36293
2023-07-18 10:31:41 +01:00
49f82717d1
Merge branch '3.1.x'
2023-07-18 10:17:17 +01:00
30cc2a48c7
Merge branch '3.0.x' into 3.1.x
2023-07-18 10:16:56 +01:00
0233178855
Use explicit matchers following Spring Security 6.0.5 upgrade
...
See gh-36293
2023-07-18 09:49:11 +01:00
c3e2c9d684
Polish "Support Jetty in ClientHttpRequestFactories"
...
See gh-36116
2023-07-04 17:49:07 +01:00
7c77e1bb85
Polish 'Log correlation IDs when Micrometer tracing is being used'
...
See gh-36158
2023-07-02 20:08:45 +01:00
6d8ca7286a
Merge branch '3.1.x'
...
Closes gh-36128
2023-06-30 08:26:26 +01:00
a268c6433e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36127
2023-06-30 08:26:12 +01:00
93f8bd2170
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36126
2023-06-30 08:25:53 +01:00
996252f929
Stop using deprecated classifier property
...
Closes gh-36125
2023-06-30 08:22:14 +01:00
e8cbb9ae1b
Stop using deprecated JavaExec property in spring-boot-smoke-test-ant
...
Closes gh-36086
2023-06-27 11:17:50 +01:00
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
47cc65d912
Merge branch '3.1.x'
...
Closes gh-36056
2023-06-23 16:12:58 -06:00
c277517953
Polish "Add SslAutoConfiguration to slice test annotations"
...
See gh-36038
2023-06-23 16:11:49 -06:00
321c526bf7
Add SslAutoConfiguration to slice test annotations
...
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.
See gh-36038
2023-06-23 15:51:42 -06:00
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
228b8eb8e4
Polish log correlation docs
...
Docs related to gh-33280 (log correlation) and
gh-35593 (application name in each log line) need some polishing:
- Fix project names
- Show how to avoid having the application name duplicated in logs
- Call out that a trailing space is needed in the correlation pattern
Closes gh-36035
See gh-33280
See gh-35593
2023-06-22 14:51:02 -07:00
493777d3c9
Include the application name on each log line when it is available
...
Update Logback and Log4J2 so that they include the application name on
each log line. If `spring.application.name` had not been set, or if
`logging.include-application-name` is `false` then the name is not
logged.
Closes gh-35593
2023-06-22 00:40:51 -07:00
23979e6ccf
Enable LoaderIntegrationTests on Java 21
2023-06-15 10:13:19 +02:00
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01:00
4694e20628
Merge branch '2.7.x' into 3.0.x
2023-06-14 18:19:43 +01:00
7d07c0d09c
Polish configuration related to predictive test selection
...
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.
It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.
See gh-35869
2023-06-14 18:15:04 +01:00
8cc428c0b5
Merge branch '3.0.x'
2023-06-07 10:17:49 +02:00
372af21313
Merge branch '2.7.x' into 3.0.x
2023-06-07 10:17:14 +02:00
140e806357
Enable LoaderIntegrationTests on Java 20
...
See gh-35758
2023-06-07 10:16:54 +02:00
127f852cf9
Polish spring-boot-smoke-test-data-mongo
...
Remove `@ImportAutoConfiguration(SslAutoConfiguration.class)`, since
`SslAutoConfiguration.class` is already provided as an
auto-configuration with `@SpringBootTest`
See gh-35655
2023-05-30 17:11:53 -05:00
10feecbd08
Fix redirect to login page for token requests
...
Fixes an issue where auto-configuration for Spring Authorization Server
was overriding the default exception handling (AuthenticationEntryPoint)
resulting in anonymous requests to the token endpoint being redirected
to the Spring Security login page instead of returning 401 Unauthorized.
Auto-configuration now registers a defaultAuthenticationEntryPointFor
that is added to any other entry points already configured.
See gh-35368
2023-05-10 11:32:06 +02:00
1143396531
Add smoke tests to verify Couchbase SSL connections
...
See gh-34811
2023-05-04 17:09:52 -05:00
d4107a8185
Add smoke tests to verify Cassandra SSL connections
...
See gh-25602
2023-05-04 16:11:28 -05:00
27169bde8b
Merge branch '3.0.x'
2023-05-03 13:07:12 +02:00
c2dd20f4ea
Merge branch '2.7.x' into 3.0.x
2023-05-03 13:07:00 +02:00
f5eb76074b
Disable loader integration tests on aarch64 linux and mac
...
See gh-35229
2023-05-03 11:32:39 +02:00
f3d0bc7a99
Disable launch script integration tests on aarch64 linux and mac
...
See gh-35229
2023-05-03 11:32:33 +02:00
8427e813af
Support import of idomatic testcontainer declaration classes
...
Add an `@ImportTestcontainers` annotation which can be used to import
idomatic testcontainer declaration classes.
Closes gh-35245
2023-05-03 00:28:36 -07:00
26566d4a30
Allow testcontainer beans to also contribute properties
...
Allow `Container` bean definitions to inject a `DynamicPropertyRegistry`
so that they can contribute environment properties.
Closes gh-35201
2023-05-03 00:27:13 -07:00
a4b81e4326
Polish smoke tests
...
See gh-35042
2023-05-02 16:34:56 -05:00
5ac6a3d90b
Add smoke test to verify MongoDB SSL connections
...
See gh-35042
2023-05-02 15:11:09 -05:00
3bb271e320
Add smoke test to verify Redis SSL connection
...
See gh-34815
2023-05-02 13:52:50 -05:00
eabce52b93
Fix TestSampleSessionRedisApplication
...
Update the `@ServiceConnection` annotation to include the
service connection name.
See gh-35168
2023-05-01 22:13:49 -07:00
f874c027d8
Polish "Fix dependency management for spring-boot-testcontainers"
...
See gh-35119
2023-04-25 10:08:20 +02:00
a323bd90a8
Polish "Reintroduce support for ActiveMQ"
...
See gh-35048
2023-04-19 13:08:14 +02:00
5ac48f5f15
Add testcontainers service connection auto-configuration
...
Add auto-configuration for `Container` beans that are also
annotated with `@ServiceConnection`. This commit allow
testcontainers to be used at development time and a new section
has been added to the documentation to describe the feature.
Closes gh-35022
2023-04-17 00:49:43 -07:00
81a972af8d
Refactor testcontainers service connections
...
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.
A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.
Closes gh-35017
2023-04-17 00:45:39 -07:00
11dac5b5b7
Create dedicated spring-boot-testcontainers module
...
Create a dedicated testcontainers module containing the service
connectors code.
Closes gh-34757
2023-04-17 00:42:31 -07:00
00dc942e94
Migrate to Spring Security lambda config
...
Closes gh-35011
2023-04-14 17:39:48 -07:00
d4980ea993
Always define connection details beans
...
Closes gh-34776
2023-04-13 18:02:35 +01:00
e9a198a68f
Merge branch '3.0.x'
2023-04-12 22:16:35 -07:00
8d2f550f8c
Merge branch '3.0.x'
2023-04-10 21:14:42 -07:00
3ba3558cff
Merge branch '2.7.x' into 3.0.x
2023-04-10 21:14:34 -07:00
3e9a136143
Polish gradle formatting
2023-04-10 21:14:09 -07:00
463701db18
Merge branch '3.0.x'
2023-04-10 16:22:57 -07:00
d442bfbeff
Polish
2023-04-10 16:22:11 -07:00
bb80232fbc
Merge branch '3.0.x'
2023-04-07 19:19:04 -04:00
25e0954b90
Revert "Set correct Eclipse WTP facet version"
...
This reverts commit d394ad3d3d
2023-04-07 19:18:57 -04:00
d4c9d265ec
Merge branch '3.0.x'
2023-04-07 19:04:19 -04:00
d394ad3d3d
Set correct Eclipse WTP facet version
2023-04-07 19:03:50 -04:00
f264e3c65e
Upgrade to Hibernate 6.2.0.Final
...
Closes gh-34876
2023-04-06 16:25:23 +02:00
95f45eab1f
Create service connections from Testcontainers-managed containers
...
Building upon the auto-configuration support for service connections,
this commit adds support for deriving connection details from a
Testcontainers-managed container. Several service-specific
annotations have been introduced. These annotations can be used on a
container field to indicate that it is a source of the details for
a service connection.
See gh-34658
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
f06536f642
Polish Authorization Server auto-configuration
2023-03-22 19:26:38 +00:00
e6f602cec0
Polish "Add Spring Authorization Server support"
...
See gh-34003
2023-03-21 17:00:35 -07:00
25d77ee70b
Add Spring Authorization Server support
...
See gh-34003
2023-03-21 17:00:35 -07:00
a878e6c91c
Upgrade to Liquibase 4.20.0
...
Closes gh-34578
2023-03-10 19:32:14 +00:00
e7c668ac71
Merge branch '3.0.x'
2023-03-02 22:42:37 -08:00
d1f89db9a2
Merge branch '2.7.x' into 3.0.x
2023-03-02 22:10:01 -08:00
d39c94f437
Refine ConfigurationProcessorIntegrationTests resource detection logic
2023-03-02 21:52:53 -08:00
b07269a018
Merge branch '3.0.x'
2023-02-21 23:20:07 -08:00
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
93a4e303be
Fix flaky SampleJettyApplicationTests
...
See gh-33553
2023-01-31 12:22:01 +01:00
64c2320ce1
Polish "Merge pull request #33553 from michaelweidmann"
...
See gh-33553
2023-01-31 11:43:33 +01:00
93d46d11e9
Add max http response header size configuration for tomcat and jetty
...
See gh-33553
2023-01-31 11:43:33 +01:00
6e46423983
Use diamond operators
...
See gh-33987
2023-01-26 20:35:08 -08:00
5120242996
Merge branch '2.7.x' into 3.0.x
2023-01-26 19:41:42 -08:00
a8958471f6
Switch anonymous inner classes to lambdas
...
See gh-33987
2023-01-26 19:34:22 -08:00
433364601d
Merge branch '2.7.x'
2023-01-11 17:04:33 +00:00
3b2e5e5292
Remove references to https://repo.spring.io/release
2023-01-11 17:03:45 +00:00
a2ac38e203
Update copyright year of changed files
2023-01-09 15:46:07 -08:00
Scott Frederick
Phillip Webb
Andy Wilkinson
Moritz Halbritter
Johnny Lim
Chris Bono
Stephane Nicoll
Eddú Meléndez
ThomazPassarelli
Jonatan Ivanov
Steve Riesenberg
Madhura Bhave
Michael Weidmann
Krzysztof Krason