Commit Graph

943 Commits (11ec9f95f6d7fe663c3970bd32f0b51343137215)

Author SHA1 Message Date
Andy Wilkinson 6d8ca7286a Merge branch '3.1.x'
Closes gh-36128
1 year ago
Andy Wilkinson a268c6433e Merge branch '3.0.x' into 3.1.x
Closes gh-36127
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 e8cbb9ae1b Stop using deprecated JavaExec property in spring-boot-smoke-test-ant
Closes gh-36086
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
Scott Frederick 47cc65d912 Merge branch '3.1.x'
Closes gh-36056
1 year ago
Scott Frederick c277517953 Polish "Add SslAutoConfiguration to slice test annotations"
See gh-36038
1 year ago
Eddú Meléndez 321c526bf7 Add SslAutoConfiguration to slice test annotations
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.

See gh-36038
1 year ago
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
1 year ago
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
1 year ago
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
1 year ago
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
1 year ago
Jonatan Ivanov 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
1 year ago
Phillip Webb 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
1 year ago
Moritz Halbritter 23979e6ccf Enable LoaderIntegrationTests on Java 21 1 year ago
Andy Wilkinson 9b88128e3b Merge branch '3.0.x' into 3.1.x 1 year ago
Andy Wilkinson 4694e20628 Merge branch '2.7.x' into 3.0.x 1 year ago
Andy Wilkinson 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
1 year ago
Moritz Halbritter 8cc428c0b5 Merge branch '3.0.x' 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
Eddú Meléndez 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
1 year ago
Steve Riesenberg 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
2 years ago
Scott Frederick 1143396531 Add smoke tests to verify Couchbase SSL connections
See gh-34811
2 years ago
Scott Frederick d4107a8185 Add smoke tests to verify Cassandra SSL connections
See gh-25602
2 years ago
Moritz Halbritter 27169bde8b Merge branch '3.0.x' 2 years 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 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
2 years ago
Phillip Webb 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
2 years ago
Scott Frederick a4b81e4326 Polish smoke tests
See gh-35042
2 years ago
Scott Frederick 5ac6a3d90b Add smoke test to verify MongoDB SSL connections
See gh-35042
2 years ago
Scott Frederick 3bb271e320 Add smoke test to verify Redis SSL connection
See gh-34815
2 years ago
Phillip Webb eabce52b93 Fix TestSampleSessionRedisApplication
Update the `@ServiceConnection` annotation to include the
service connection name.

See gh-35168
2 years ago
Stephane Nicoll f874c027d8 Polish "Fix dependency management for spring-boot-testcontainers"
See gh-35119
2 years ago
Stephane Nicoll a323bd90a8 Polish "Reintroduce support for ActiveMQ"
See gh-35048
2 years ago
Phillip Webb 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
2 years ago
Phillip Webb 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
2 years ago
Phillip Webb 11dac5b5b7 Create dedicated spring-boot-testcontainers module
Create a dedicated testcontainers module containing the service
connectors code.

Closes gh-34757
2 years ago
Phillip Webb 00dc942e94 Migrate to Spring Security lambda config
Closes gh-35011
2 years ago
Andy Wilkinson d4980ea993 Always define connection details beans
Closes gh-34776
2 years ago
Phillip Webb e9a198a68f Merge branch '3.0.x' 2 years ago
Phillip Webb 8d2f550f8c Merge branch '3.0.x' 2 years ago
Phillip Webb 3ba3558cff Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb 3e9a136143 Polish gradle formatting 2 years ago
Phillip Webb 463701db18 Merge branch '3.0.x' 2 years ago
Phillip Webb d442bfbeff Polish 2 years ago
Phillip Webb bb80232fbc Merge branch '3.0.x' 2 years ago
Phillip Webb 25e0954b90 Revert "Set correct Eclipse WTP facet version"
This reverts commit d394ad3d3d.
2 years ago
Phillip Webb d4c9d265ec Merge branch '3.0.x' 2 years ago
Phillip Webb d394ad3d3d Set correct Eclipse WTP facet version 2 years ago
Stephane Nicoll f264e3c65e Upgrade to Hibernate 6.2.0.Final
Closes gh-34876
2 years ago
Andy Wilkinson 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>
2 years ago
Andy Wilkinson f06536f642 Polish Authorization Server auto-configuration 2 years ago
Madhura Bhave e6f602cec0 Polish "Add Spring Authorization Server support"
See gh-34003
2 years ago
Steve Riesenberg 25d77ee70b Add Spring Authorization Server support
See gh-34003
2 years ago
Andy Wilkinson a878e6c91c Upgrade to Liquibase 4.20.0
Closes gh-34578
2 years ago
Phillip Webb e7c668ac71 Merge branch '3.0.x' 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 b07269a018 Merge branch '3.0.x' 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
Moritz Halbritter 93a4e303be Fix flaky SampleJettyApplicationTests
See gh-33553
2 years ago
Moritz Halbritter 64c2320ce1 Polish "Merge pull request #33553 from michaelweidmann"
See gh-33553
2 years ago
Michael Weidmann 93d46d11e9 Add max http response header size configuration for tomcat and jetty
See gh-33553
2 years ago
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2 years ago
Phillip Webb 5120242996 Merge branch '2.7.x' into 3.0.x 2 years ago
Krzysztof Krason a8958471f6 Switch anonymous inner classes to lambdas
See gh-33987
2 years ago
Andy Wilkinson 433364601d Merge branch '2.7.x' 2 years ago
Andy Wilkinson 3b2e5e5292 Remove references to https://repo.spring.io/release 2 years ago
Phillip Webb a2ac38e203 Update copyright year of changed files 2 years ago
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2 years ago
Phillip Webb f588793445 Update copyright year of changed files 2 years ago
Phillip Webb 6d16aed36e Merge branch '2.7.x' 2 years ago
Phillip Webb 816728186a Clean ant lib folder before build
Update `spring-boot-smoke-test-ant` so that the ant lib folder is always
cleaned. Prior to this commit, it was possible for the folder to contain
stale artifacts.
2 years ago
Phillip Webb c257f2b1d2 Merge branch '2.7.x' 2 years ago
Phillip Webb e8e56dbb11 Remove spring-boot-smoke-test-webflux-ssl
Remove `spring-boot-smoke-test-webflux-ssl` since it's more of
an integration test than a smoke test. We could consider
relocating it to `spring-boot-integration-tests` but since we
have unit tests with a mock PCKCS11 security it's probably
best to see if we can get away without it.

See gh-32179
2 years ago
Moritz Halbritter 08659baeba Polish away public modifier on tests 2 years ago
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2 years ago
Moritz Halbritter a4779b7859 Merge branch '2.7.x'
Closes gh-33433
2 years ago
cdanger 716a839d54 Fix bug in webserver start when loading PKCS#11 KeyStore
See gh-32179
2 years ago
Andy Wilkinson 5a3972fee7 Merge branch '2.7.x'
Closes gh-33297
2 years ago
Andy Wilkinson f638c0070a Merge branch '2.6.x' into 2.7.x
Closes gh-33296
2 years ago
Andy Wilkinson 673d301b88 Make Ant smoke test more robust
Closes gh-33295
2 years ago
Stephane Nicoll 656c4b9390 Polish 2 years ago
Madhura Bhave 8cb615e9b6 Remove workarounds for SecurityContextRepository 2 years ago
Madhura Bhave f4cf722c27 Align default security filter dispatcher types with Spring Security
Fixes gh-33090
2 years ago
Phillip Webb 82254e3b4d Update smoketests to test isolated actuator object mapper use
See gh-32297
See gh-20291
2 years ago
Phillip Webb 32b9945632 Polish 2 years ago
Andy Wilkinson b357239861 Upgrade to Jakarta Activation 2.1.0
Closes gh-33045
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 9856286a2d Refine actuator httpexhanges naming
See gh-32885
2 years ago
Phillip Webb 3e50836b1a Rename httptrace endpoint and related classes to httpexchanges
Rename `/actuator/httptrace` to `/actuator/httpexchanges` to better
describe its purpose and to remove confusion with distribute tracing.

This change also takes the opportunity to improve the code by making
the `HttpExchange` class (previously `HttpTrace`) fully immutable.

Closes gh-32885

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2 years ago
Johnny Lim 5067aab552 Polish
See gh-32840
2 years ago
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2 years ago