Commit Graph
58247 Commits
Author SHA1 Message Date
Phillip Webb 2e79fc01cb Allow URL to be specified when working with HtmlUnit beans
Update `@AutoConfigureMockMvc` to move HtmlUnit configuration under
a dedicated attribute and provide support for configuring the URL
that is used.

Closes gh-47857
2025-10-29 20:47:42 -07:00
Stéphane Nicoll 30a6b50e82 Align naming change for Jackson components
This commit polishes the renaming of JsonComponent to JacksonComponent
and the use of JacksonModule instead of Module in Jackson 2.

This also adds integration tests that use a JacksonComponent with
WebMvcTest and WebFluxTest.

Closes gh-47864
2025-10-29 16:58:16 +01:00
Moritz Halbritter 9c8716e2c8 Add spring-boot-micrometer-tracing to spring-boot-starter-zipkin
This also adds io.micrometer:micrometer-tracing-bridge-brave to the
Zipkin starter, otherwise we'd get no traces exported.

This also adds spring-boot-micrometer-tracing-test to the Zipkin test
starter.

Closes gh-47866
2025-10-29 16:49:58 +01:00
Moritz Halbritter e071006f8e Remove spring-boot-micrometer-tracing from Actuator starter
Closes gh-47785
2025-10-29 15:31:14 +01:00
Andy Wilkinson 4e86ff060f Adapt to deprecations in latest Framework snaphots
See gh-47850
2025-10-29 11:34:30 +00:00
Andy Wilkinson 578b199b6d Merge branch '3.5.x'
Closes gh-47860
2025-10-29 10:25:10 +00:00
Andy Wilkinson b2d2fb82c0 Align test class name with name of class under test 2025-10-29 10:15:58 +00:00
Andy Wilkinson c51c478501 Merge branch '3.4.x' into 3.5.x
Closes gh-47859
2025-10-29 10:06:20 +00:00
Andy Wilkinson d2a349868e Limit Kotlin API docs to Kotlin code
Previously, the Kotlin API docs included Java APIs. This commit
corrects this by suppressing all Dokkatoo source sets other than
main (main in src/main/kotlin, javaMain is src/main/java).

Dokkatoo is sensitive to the order in which plugins are applied. This
commit adapts to the sensitivity by changing the order in which
the Dokatoo and Kotlin JVM plugins are applied. This prevents the
Dokatoo plugin for overwriting the configuration that's applied by
our Kotlin conventions.

Closes gh-47763
2025-10-29 10:02:34 +00:00
Stéphane Nicoll f3958ae9e7 Add Spring Kafka test utilities to Kafka test starter
Closes gh-47793
2025-10-29 08:28:58 +01:00
Stéphane Nicoll 9bf712349f Adapt to changes in Spring Data JDBC 4.0.0 snapshots 2025-10-28 17:44:51 +01:00
Stéphane Nicoll 6c0967cb70 Simplify configuration metadata changelog configuration
Rather than listing common modules and tweak things for various
milestones, this commit flatten the list of modules as of Spring Boot
4.0.0-RC1.

Closes gh-47852
2025-10-28 16:38:51 +01:00
Stéphane Nicoll e267e79097 Start building against Spring HATEOAS 3.0.0-RC2 snapshots
See gh-47851
2025-10-28 15:37:30 +01:00
Stéphane Nicoll 0319c676ff Start building against Spring Framework 7.0.0-RC3 snapshots
See gh-47850
2025-10-28 15:37:26 +01:00
Stéphane Nicoll a92b177698 Polish "Upgrade to Elasticsearch Client 9.2.0"
This commit configures the new Jackson 3 support for Elasticsearch if
available. As for other auto-configurations, Jackson 2 is still
supported in a deprecated fashion.

Closes gh-47847
2025-10-28 15:27:06 +01:00
Stéphane Nicoll 18335a6bba Polish 2025-10-28 15:12:39 +01:00
Stéphane Nicoll 20fdeae1a9 Add WebTestClient infrastructure to GraphQL test starter
Closes gh-47849
2025-10-28 15:07:34 +01:00
Stéphane Nicoll 8a6fea9d59 Upgrade to Elasticsearch Client 9.2.0
Closes gh-47847
2025-10-28 11:54:00 +01:00
Stéphane Nicoll cd1424d04b Simplify dependencies arrangement in smoke tests
This commit harmonizes dependencies used in smoke tests, in particular
by using the starters consistently. This serves not only as a validation
but also a showcase of how to use them.

Closes gh-47836
2025-10-28 11:16:23 +01:00
Stéphane Nicoll 8d1b13da64 Polish "Add Reactor test utilities to reactive test starters"
See gh-47795
2025-10-28 09:57:29 +01:00
Stéphane Nicoll 544f60a17e Merge branch '3.5.x'
Closes gh-47846
2025-10-28 08:23:24 +01:00
Stéphane Nicoll 33dfe35e0e Merge branch '3.4.x' into 3.5.x
Closes gh-47845
2025-10-28 08:23:17 +01:00
Stéphane Nicoll 083e20373f Merge pull request #47839 from dependabot[bot]
* pr/47839:
  Bump actions/upload-artifact from 4 to 5

Closes gh-47839
2025-10-28 08:23:08 +01:00
dependabot[bot] 1e6e2ebee0 Bump actions/upload-artifact from 4 to 5
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

See gh-47839

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-28 08:22:49 +01:00
Stéphane Nicoll 400c47a719 Start building against Spring Security 7.0.0-RC2 snapshots
See gh-47844
2025-10-28 08:08:51 +01:00
Stéphane Nicoll b0826998ff Start building against Spring Data Bom 2025.1.0-RC2 snapshots
See gh-47843
2025-10-28 08:08:47 +01:00
Stéphane Nicoll d72664a45c Start building against Spring Batch 6.0.0-RC2 snapshots
See gh-47842
2025-10-28 08:08:43 +01:00
Stéphane Nicoll 2a681fdd70 Switch to same-minor-version upgrade policy for post-RC phase
Closes gh-47841
2025-10-28 08:07:56 +01:00
Stéphane Nicoll 7bde0e65f1 Fix typos
Closes gh-47818
2025-10-27 14:55:39 +01:00
Stéphane Nicoll c35a766b13 Fix typos
Closes gh-47816
2025-10-27 14:55:02 +01:00
Stéphane Nicoll d85ccc540f Merge pull request #47801 from ngocnhan-tran1996
* pr/47801:
  Fix typos

Closes gh-47801
2025-10-27 14:46:43 +01:00
Andy Wilkinson bf8e0c45a8 Allow customizations of default customizers to be overridden
Previously, the default client and server HTTP message converter
customizers were ordered with lowest precedence. This made it
impossible to guarantee that another customizer would be able to go
after the default customizers, preventing their customizations from
being reliably overridden.

This commit updates the definitions of the default customizers to
order them at 0. This allows additional customizers to be ordered
either before or after them. Usage of the customizers is now always
ordered (previously Spring MVC's was not).

See gh-47798
2025-10-27 12:41:31 +00:00
Tran Ngoc Nhan 0546e3035d Fix typos
See gh-47801

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-10-27 11:40:32 +01:00
Andy Wilkinson 5fbdfad11e Remove test dependency from spring-boot-security
Closes gh-47813
2025-10-27 10:39:29 +00:00
Stéphane Nicoll 2a9968f39b Add Reactor test utilities to reactive test starters
Closes gh-47795
2025-10-27 11:06:44 +01:00
Stéphane Nicoll 2ec1e822b6 Make Batch JDBC Test starter depends on Batch Test starter
This makes sure that test utilities are shared, typically
spring-batch-test.

Closes gh-47794
2025-10-27 11:06:44 +01:00
Stéphane Nicoll 7e5046aa26 Add Spring Batch test utilities to Batch test starter
Closes gh-47792
2025-10-27 11:06:44 +01:00
Stéphane Nicoll 487bd731d8 Add Spring Rabbit test utilities to AMQP test starter
Closes gh-47791
2025-10-27 11:06:44 +01:00
Andy Wilkinson 198cba7177 Fix spring-boot-jackson2's test auto-configuration
This commit is a follow-on from 14c5ac0. It fixes a similar problem
with @AutoConfigureJsonTesters that is also apparent when using
@JsonTest.

Fixes gh-47811

The org.springframework.boot.test-auto-configuration plugin has been
added so that test auto-configuration imports files are checked at
build time, hopefully catching this sort of problem earlier in the
future.

Closes gh-47812
2025-10-27 10:04:25 +00:00
Moritz Halbritter 14c5ac0202 Fix Jackson2AutoConfiguration import for @AutoConfigureJson
Closes gh-47811
2025-10-27 10:25:12 +01:00
Stéphane Nicoll 8985af2fcc Relocate Neo4jReactiveHealthIndicatorIntegrationTests 2025-10-24 17:51:06 +02:00
Stéphane Nicoll d1ae453824 Restore support of deprecated containers
This commit restore the service connection support for Testcontainers
implementations that were deprecated as part of TC 2.0. Previously,
only the new location was taken into account.

Closes gh-47796
2025-10-24 17:51:06 +02:00
Andy Wilkinson f72da4c77a Fix Actuator with Jackson 2 but no spring-web
Previously, if Actuator was being used in a non-web app such that
spring-web was not on the classpath, the app would fail to start
if Jackson 2 was present. This occured as the auto-configuration
for the EndpointJackson2ObjectMapper tried to use spring-web's
Jackson2ObjectMapperBuilder that was not present.

This commit updates the auto-configuration to back off when
Jackson2ObjectMapperBuilder is absent, aligning it with the
behavior of JacksonEndpointAutoConfiguration in 3.5.

Fixes gh-47788
2025-10-24 14:39:47 +01:00
Stéphane Nicoll 08a1d6648e Merge pull request #47784 from Walti91
* pr/47784:
  Fix JacksonTesterTestAutoConfiguration javadoc

Closes gh-47784
2025-10-24 15:39:17 +02:00
Florian Waltenberger 63ec0fc18a Fix JacksonTesterTestAutoConfiguration javadoc
See gh-47784

Signed-off-by: Florian Waltenberger <waltenberger.florian@gmail.com>
2025-10-24 15:36:51 +02:00
Stéphane Nicoll 87acda775d Merge branch '3.5.x'
Closes gh-47783
2025-10-24 09:22:53 +02:00
Stéphane Nicoll 28d699f396 Detect Java 25+ style methods with AOT processing
Closes gh-47780
2025-10-24 09:19:19 +02:00
Moritz Halbritter a1ced48897 Merge branch '3.5.x' 2025-10-24 08:54:50 +02:00
Moritz Halbritter df8ba4c831 Merge branch '3.4.x' into 3.5.x 2025-10-24 08:54:09 +02:00
Moritz Halbritter 6b426b2481 Set timeout to 1.5h on spring-io/central-publish-action 2025-10-24 08:53:51 +02:00