Commit Graph

21406 Commits (38fdef6ec4b9d2078f9af4e9dc3aa9bc8d3fef37)

Author SHA1 Message Date
Andy Wilkinson e2f8fcf292 Merge branch '3.0.x' into 3.1.x
Closes gh-36121
1 year ago
Andy Wilkinson 6effd6061c Provide hints when template auto-config is excluded
Fixes gh-35682
1 year ago
Andy Wilkinson b32697b3ce Add support to @ClassPathExclusions for excluding packages
Closes gh-36120
1 year ago
Moritz Halbritter cff26d9843 Merge branch '3.1.x'
Closes gh-36113
1 year ago
Moritz Halbritter 20321b5685 Merge branch '3.0.x' into 3.1.x
Closes gh-36112
1 year ago
Moritz Halbritter 2b398827de Add "baggage" section to tracing docs
Closes gh-34977
1 year ago
Andy Wilkinson 3ef1738a5e Remove containers after use in Docker Compose integration tests
Closes gh-36104
1 year ago
Andy Wilkinson 0b39429f96 Remove containers after use in Docker Compose integration tests
Closes gh-36104
1 year ago
Andy Wilkinson b5a131d966 Merge branch '3.1.x'
Closes gh-36100
1 year ago
Andy Wilkinson ba8b1717fb Merge branch '3.0.x' into 3.1.x
Closes gh-36099
1 year ago
Andy Wilkinson 79cd3a027a Merge branch '2.7.x' into 3.0.x
Closes gh-36098
1 year ago
Andy Wilkinson 9e1f2c4257 Tolerate Flway 9.20
Closes gh-36029
1 year ago
Andy Wilkinson 28af839dff Merge branch '3.0.x' into 3.1.x
Closes gh-36097
1 year ago
Andy Wilkinson b3c321e40c Polish javadoc of RestTemplateBuilder.requestFactory(Function)
Closes gh-36046
1 year ago
Andy Wilkinson a1a336ddd8 Merge branch '3.0.x' into 3.1.x
Closes gh-36095
1 year ago
Andy Wilkinson b2bc114d6f Update javadoc to link to non-deprecated ConstructorBinding
Closes gh-36045
1 year ago
Andy Wilkinson 2011c95c75 Merge branch '3.1.x'
Closes gh-36093
1 year ago
Eddú Meléndez 29ebaab0cb Use Selenium's bom
See gh-36077
1 year ago
Andy Wilkinson 98d459d76c Revert "Merge branch '3.1.x'"
See gh-36092
1 year ago
Andy Wilkinson 6851904651 Merge branch '3.1.x'
Closes gh-36092
1 year ago
Andy Wilkinson 9a57611ef5 Merge branch '3.0.x' into 3.1.x
Closes gh-36091
1 year ago
Andy Wilkinson ffbef7bb80 Test server.max-http-request-header-size with Undertow
Closes gh-36047
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
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
Scott Frederick c32877493c Merge branch '3.1.x'
Closes gh-36055
1 year ago
Scott Frederick b9b314622f Merge branch '3.0.x' into 3.1.x
Closes gh-36054
1 year ago
Scott Frederick 4a3abdd7c3 Merge branch '2.7.x' into 3.0.x
Closes gh-36053
1 year ago
Johnny Lim 59d4bf97a1 Add Javadoc since to ImageReference.inTaglessForm()
See gh-36048
1 year ago
Scott Frederick 67725d4781 Merge branch '3.1.x'
Closes gh-36052
1 year ago
James Stansell ea41a22284 Fix typo in docker compose service connections note
See gh-36016
1 year ago
Scott Frederick 90dd7449bb Merge branch '3.1.x'
Closes gh-36051
1 year ago
Scott Frederick 92b2573a60 Merge branch '3.0.x' into 3.1.x
Closes gh-36050
1 year ago
Scott Frederick eeeb2ad72a Merge branch '2.7.x' into 3.0.x
Closes gh-36049
1 year ago
Johnny Lim 4a2c9d99dc Remove redundant Files.delete() calls in tests
See gh-35986
1 year ago
Scott Frederick 493987fc1a Allow key password to be set for a PemSslStoreBundle
Closes gh-35983
1 year ago
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
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
Moritz Halbritter 8f7fdc507e Polish CorrelationIdFormatter 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
Jonatan Ivanov c1b295fd71 Log correlation IDs when Micrometer tracing is being used
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.

The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.

Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.

The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.

Closes gh-33280
1 year ago
Phillip Webb b6120d504a Replace LoggingSystemProperties constants with an Enum
Extract contants from `LoggingSystemProperty` and
`LogbackLoggingSystemProperties` in enum classes.

Closes gh-36015
1 year ago
Phillip Webb 3a796aedea Merge branch '3.1.x' 1 year ago
Phillip Webb 31f218c4e0 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 9db3c5a2f7 Polish 1 year ago
Phillip Webb 16265e925d Merge branch '3.1.x' 1 year ago
Phillip Webb 8ac5dc7ea3 Merge branch '3.0.x' into 3.1.x
Closes gh-36017
1 year ago
Phillip Webb f7af1bab5b Upgrade to Spring WS 4.0.5
Closes gh-36010
1 year ago
Phillip Webb 64525fb566 Merge branch '3.1.x' 1 year ago
Phillip Webb eb72d7e9f1 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 5c8ed944ca Start building against Spring WS 4.0.5 snapshots
See gh-36010
1 year ago
Andy Wilkinson f6841c3c16 Revert "Start building against Spring WS 3.1.7 snapshots"
This reverts commit 5e963b02a7.

See gh-35732
1 year ago
Phillip Webb 212acf44f7 Merge branch '3.1.x' 1 year ago
Phillip Webb 7a2fc9e636 Fix checkstyle violation
See gh-35914
1 year ago
Phillip Webb 2ce36b15b3 Merge branch '3.1.x' 1 year ago
Phillip Webb 3c7fbf3423 Polish 'Apply SslConfigurer in addition to configured mappers'
See gh-35914
1 year ago
Fernando Cappi e6b5322f3e Apply SslConfigurer in addition to configured mappers
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.

Prior to this commit, SSL configuration would prevent configured
mappers from being applied.

See gh-35914
1 year ago
Andy Wilkinson 7f5351c7b0 Merge branch '3.1.x' 1 year ago
Andy Wilkinson b770ffc160 Fully prepare connection when using SSL bundle
Fixes gh-36007
1 year ago
Andy Wilkinson 295702003d Merge branch '3.1.x' 1 year ago
Andy Wilkinson 7266d4863b Merge branch '3.0.x' into 3.1.x
Closes gh-36009
1 year ago
Andy Wilkinson 39c382713b Initialize WebSocket infrastructure when using WebFlux and Jetty
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.

This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.

Fixes gh-33347
1 year ago
Andy Wilkinson fc403f4f18 Merge branch '3.1.x' 1 year ago
Andy Wilkinson d3522a78a8 Merge branch '3.0.x' into 3.1.x 1 year ago
Andy Wilkinson 641f00f24c Disable test when Java version is too high
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.

See gh-35931
1 year ago
Andy Wilkinson 68aec97ee7 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 5b69580d5d Merge branch '3.0.x' into 3.1.x
Closes gh-36004
1 year ago
Andy Wilkinson f584d6dbd9 Replace `@EnableBatchProcessing` in slice test examples
Using `@EnableBatchProcessing` is no longer necessary to enable
Batch's auto-configuration so it's no longer a good example when
discussing sliced tests and user configuration.

This commit replaces `@EnableBatchProcessing` with an alternative
annotation, `@EnableMongoAuditing` and updates the accompanying
text.

Closes gh-33435
1 year ago
Andy Wilkinson b394553b30 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 660dbb9afd Fix Maven-built native images with Docker Compose dependency
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.

This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.

Fixes gh-35676
1 year ago
Andy Wilkinson 35ee52275e Upgrade to Spring Integration 6.0.6
Closes gh-35740
1 year ago
Andy Wilkinson e2b6384462 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 5384872cbd Merge branch '3.0.x' into 3.1.x
Closes gh-36003
1 year ago
Andy Wilkinson 2fd5319eda Merge branch '2.7.x' into 3.0.x
Closes gh-36002
1 year ago
Andy Wilkinson 0fb4c9a095 Prohibit upgrades to RSocket 1.1.4
Closes gh-35798
1 year ago
Andy Wilkinson 5a70198880 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 5cda56cc68 Upgrade to Spring Integration 6.1.1
Closes gh-35859
1 year ago
Andy Wilkinson 818f096890 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 853caf9a59 Do not exclude DevTools from Maven AOT processing classpath
When excluded from the AOT processing classpath, a reflection hint
for DevTools' RestartScopeInitializer that's registered in
spring.factories is not generated. When the native image is compiled
we have no control over its classpath so DevTools is included. This
causes a failure at runtime as RestartScopeInitializer cannot be
loaded due to the missing reflection hint.

Until we have control over the native image classpath, we need to
include DevTools on the AOT processing classpath and then rely on
DevTools disabling itself in a native image which it already does.

Fixes gh-35853
1 year ago
Stephane Nicoll 16e993f3ca Merge branch '3.1.x' 1 year ago
Stephane Nicoll 75ca6030a8 Upgrade to Spring Session 3.1.1
Closes gh-35755
1 year ago
Stephane Nicoll 424e8e6924 Upgrade to Spring Security 6.1.1
Closes gh-35754
1 year ago
Stephane Nicoll da6cbfd5fe Upgrade to Spring Kafka 3.0.8
Closes gh-36000
1 year ago
Stephane Nicoll 81f1961e27 Upgrade to Spring GraphQL 1.2.1
Closes gh-35752
1 year ago
Stephane Nicoll a2b7fc8661 Upgrade to Spring Authorization Server 1.1.1
Closes gh-35749
1 year ago
Stephane Nicoll 8d351ffb1f Upgrade to Spring AMQP 3.0.5
Closes gh-35748
1 year ago
Stephane Nicoll 0c32ce4214 Upgrade to REST Assured 5.3.1
Closes gh-35999
1 year ago
Stephane Nicoll a7f8b82905 Upgrade to Netty 4.1.94.Final
Closes gh-35998
1 year ago
Stephane Nicoll 264c01c8db Upgrade to Infinispan 14.0.11.Final
Closes gh-35996
1 year ago
Stephane Nicoll 2815e83096 Upgrade to HttpCore5 5.2.2
Closes gh-35995
1 year ago
Stephane Nicoll 21046c0611 Upgrade to Hibernate 6.2.5.Final
Closes gh-35994
1 year ago
Stephane Nicoll 4c06dc49b3 Upgrade to Spring Session 3.0.2
Closes gh-35744
1 year ago
Stephane Nicoll cf955671d8 Upgrade to Spring Security 6.0.4
Closes gh-35743
1 year ago
Stephane Nicoll 6066fb53ed Upgrade to Spring Kafka 3.0.8
Closes gh-35993
1 year ago
Stephane Nicoll 0b582651b3 Upgrade to Spring GraphQL 1.1.5
Closes gh-35775
1 year ago