Commit Graph

19357 Commits

Author SHA1 Message Date
Phillip Webb ea10a64a0c Merge branch '2.6.x' into 2.7.x 2022-11-09 11:39:53 -08:00
Phillip Webb f423a26dd5 Polish 2022-11-09 11:39:48 -08:00
Andy Wilkinson 54aaaeec6f Upgrade to Spring Batch 6.0.0-RC2
Closes gh-332935
2022-11-09 19:32:44 +00:00
Andy Wilkinson e25792ee58 Upgrade to Spring Security 6.0.0-RC2
Closes gh-33063
2022-11-09 19:32:44 +00:00
Andy Wilkinson ac867c3c40 Polish 2022-11-09 19:32:44 +00:00
Phillip Webb 1adc7c7dd4 Merge branch '2.7.x' 2022-11-09 11:32:24 -08:00
Phillip Webb 0ef03d725f Merge branch '2.6.x' into 2.7.x 2022-11-09 11:31:55 -08:00
Phillip Webb a431ae04e6 Polish 2022-11-09 11:30:11 -08:00
Andy Wilkinson 7eb0fe4c89 Contribute reflection hints for JsonComponent inner classes
Closes gh-33089
2022-11-09 19:24:15 +00:00
Scott Frederick b882de7c68 Throw ContextLoadException on test context load failure
When a test context fails to load, a `ContextLoadException` should
be thrown so that Framework can catch it and call any registered
`ApplicationContextFailureProcessor`s.

Closes gh-31793
2022-11-09 13:10:11 -06:00
Andy Wilkinson 70f7258341 Simplify JacksonAutoConfiguration as we now require Jackson 2.14
See gh-33086
2022-11-09 17:31:04 +00:00
Andy Wilkinson fcbc7dacf1 Add reflection hints for JsonTesters
Closes gh-32858
2022-11-09 15:15:29 +00:00
Stephane Nicoll 41e2423a0c Upgrade to Spring Framework 6.0.0-RC4
Closes gh-33023
2022-11-09 14:12:51 +01:00
Andy Wilkinson 60917bd114 Remove tests for Jackson 2.11
Closes gh-33086
2022-11-09 11:33:55 +00:00
Andy Wilkinson 112bed886c Merge branch '2.7.x'
Closes gh-33085
2022-11-09 10:37:40 +00:00
Andy Wilkinson b1494d4a39 Merge branch '2.6.x' into 2.7.x
Closes gh-33084
2022-11-09 10:37:06 +00:00
Andy Wilkinson 6423535f67 Delete temp directory after MavenBuild has exected
Closes gh-33083
2022-11-09 10:35:56 +00:00
Phillip Webb 32b9945632 Polish 2022-11-08 23:15:30 -08:00
Phillip Webb 0d5c13cb28 Polish 'Add reflection hints for PropertyNamingStrategies'
See gh-33080
2022-11-08 23:09:27 -08:00
Ralf Ueberfuhr e9bca3e6de Add reflection hints for PropertyNamingStrategies
See gh-33080
2022-11-08 23:03:54 -08:00
Andy Wilkinson 50bb317215 Upgrade to Reactor Bom 2022.0.0
Closes gh-32939
2022-11-08 20:32:25 +00:00
Andy Wilkinson 546853bba5 Upgrade to Spring Integration 6.0.0-RC2
Closes gh-33009
2022-11-08 20:31:45 +00:00
Andy Wilkinson c1cf939199 Merge branch '2.7.x'
Closes gh-33076
2022-11-08 17:38:57 +00:00
Andy Wilkinson 1c3a4906fa Merge pull request #32861 from izeye
* gh-32861:
  Polish "Provide dependency management for missing Selenium modules"
  Provide dependency management for missing Selenium modules

Closes gh-32861
2022-11-08 17:35:48 +00:00
Andy Wilkinson 03d1631d4c Polish "Provide dependency management for missing Selenium modules"
See gh-32861
2022-11-08 17:35:36 +00:00
Andy Wilkinson 843493d915 Merge branch '2.7.x'
Closes gh-33075
2022-11-08 17:30:16 +00:00
Andy Wilkinson 00d22c9fc5 Merge branch '2.6.x' into 2.7.x
Closes gh-33074
2022-11-08 17:28:50 +00:00
Andy Wilkinson f42e90a2b4 Add missing dependency management for Selenum
Closes gh-32721
2022-11-08 17:27:48 +00:00
Andy Wilkinson eed86c0d0a Test Boot's Gradle plugin against Gradle 7.6-rc-2
Closes gh-33073
2022-11-08 16:46:22 +00:00
Johnny Lim 4161f5bdf1 Provide dependency management for missing Selenium modules
See gh-32861
2022-11-08 15:11:21 +00:00
Johnny Lim ea4f22684d Polish Log4j2 changes
See gh-32742
2022-11-08 13:27:01 +00:00
Johnny Lim 6b385a4f79 Fix configLocationsWithConfigurationFileSystemProperty
See gh-32740
2022-11-08 13:17:22 +00:00
Andy Wilkinson 1481676b54 Merge branch '2.7.x'
Closes gh-33069
2022-11-08 13:15:02 +00:00
Andy Wilkinson bb141ffc09 Merge branch '2.6.x' into 2.7.x
Closes gh-33068
2022-11-08 13:14:30 +00:00
EricGao888 569e752159 Fix a minor bug in an example in oauth2 doc
See gh-32931
2022-11-08 13:14:06 +00:00
Andy Wilkinson c314d62030 Merge branch '2.7.x'
Closes gh-33067
2022-11-08 13:11:01 +00:00
Andy Wilkinson 0e70c33725 Merge branch '2.6.x' into 2.7.x
Closes gh-33066
2022-11-08 13:10:40 +00:00
dreis2211 34902f5a02 Fix possible type pollution in ConditionEvaluationReport
See gh-32916
2022-11-08 13:01:27 +00:00
Andy Wilkinson a19f1a733e Correct crash handling in condition report logging listener
Closes gh-33027
2022-11-08 12:54:46 +00:00
Andy Wilkinson 6d1fca10a3 Polish "Remove Sleuth references in favor of Micrometer Tracing"
See gh-32994
2022-11-08 12:36:04 +00:00
Toshiaki Maki bf4c367d7e Remove Sleuth references in favor of Micrometer Tracing
See gh-32994
2022-11-08 12:33:51 +00:00
Andy Wilkinson 5a299dd501 Correct coordinates of Artemis' server artifact
Closes gh-33065
2022-11-08 12:31:08 +00:00
Andy Wilkinson df2445a6be Update docs now that GraalVM 22.3 is fully available
Closes gh-32813
2022-11-08 12:28:14 +00:00
Andy Wilkinson 6a2f2a0afd Upgrade to Micrometer 1.10.0
Closes gh-32936
2022-11-08 12:19:43 +00:00
Andy Wilkinson aff8a3b182 Upgrade to Micrometer Tracing 1.0.0
Closes gh-32937
2022-11-08 12:18:58 +00:00
Andy Wilkinson b1fcc38338 Upgrade to Jakara XML WS 4.0.0
Closes gh-33054
2022-11-08 11:01:18 +00:00
Andy Wilkinson 918182bfdf Upgrade to Jakarta XML SOAP and SAAJ Impl 3.0.0
Closes gh-33053
Closes gh-33057
2022-11-08 11:01:17 +00:00
Andy Wilkinson e274dbcfc4 Upgrade to Jakarta JMS 3.1.0
Closes gh-33047
2022-11-08 11:01:17 +00:00
Andy Wilkinson 01940144af Upgrade to Jakarta Annotation 2.1.1
Closes gh-33046
2022-11-08 11:01:17 +00:00
Andy Wilkinson b357239861 Upgrade to Jakarta Activation 2.1.0
Closes gh-33045
2022-11-08 11:01:17 +00:00
Andy Wilkinson 524d0599b1 Upgrade to Jakarta Json Bind 3.0.0 and Yasson 3.0.0
Closes gh-33049
Closes gh-33058
2022-11-08 11:01:16 +00:00
Andy Wilkinson c27948c725 Upgrade to Jakarta Json 2.1.1
Closes gh-33048
2022-11-08 11:01:16 +00:00
Andy Wilkinson 335986ee4e Upgrade to Jakarta Persistence 3.1.0
Closes gh-33051
2022-11-08 11:01:16 +00:00
Andy Wilkinson 47c453f473 Upgrade to Hibernate Validator 8.0.0.Final
Closes gh-33056
2022-11-08 11:01:15 +00:00
Andy Wilkinson 9cdea13c56 Upgrade to Jakarta XML Bind 4.0.0 and Glassfish JAXB 4.0.1
Closes gh-33055
Closes gh-33052
2022-11-08 11:01:15 +00:00
Andy Wilkinson 3a2703e8f6 Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI
Closes gh-33059
Closes gh-33050
2022-11-08 11:01:15 +00:00
Andy Wilkinson 6940e348a7 Try to fix NativeImagePluginActionIntegrationTests on Windows 2022-11-08 11:00:52 +00:00
Andy Wilkinson beb1e398c9 Polish "Add reflection hints for Tomcat 10.1"
See gh-33064
2022-11-08 09:56:26 +00:00
Sébastien Deleuze 7972224313 Add reflection hints for Tomcat 10.1
In Tomcat 10.0, reflection hints on Http11AprProtocol were
registering hints on AbstractProtocol as a side effect.

Tomcat 10.1 removed this protocol and related hints, breaking
Http11NioProtocol usage in Spring Boot.

This commit contributes reflection hints for protocol properties
accessed reflectively from org.apache.catalina.connector.Connector.

See gh-33064
2022-11-08 09:56:06 +00:00
Phillip Webb 0bdf7e8af7 Allow spring properties to be used in logback <if> blocks
Reorder `SpringBootJoranConfigurator.addModelHandlerAssociations` so
that handlers are added before calling the super method. Prior to this
commit, handlers were added behind filters which prevented them from
being used in `<if>` blocks.

Fixes gh-33028
2022-11-07 14:45:43 -08:00
Phillip Webb 95557ddbc6 Start building against Spring Integration 6.0.0-RC2 snapshots
See gh-33009
2022-11-07 14:31:01 -08:00
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
2022-11-07 17:33:38 +00:00
Andy Wilkinson 1525ed9170 Start building against Spring Session 3.0.0-RC2 snapshots
Closes gh-33034
2022-11-07 17:31:26 +00:00
Andy Wilkinson 1b6e8ee3cc Remove dependency management for unused EL dependencies
Closes gh-33035
2022-11-07 17:04:29 +00:00
Andy Wilkinson 690b6fa086 Start building against Spring Framework 6.0.0-RC4 snapshots
See gh-33023
2022-11-07 14:43:25 +00:00
Andy Wilkinson fce6016399 Merge branch '2.7.x'
See gh-33016
2022-11-07 13:36:48 +00:00
Andy Wilkinson 7c0f397129 Merge branch '2.6.x' into 2.7.x
See gh-33015
2022-11-07 13:36:11 +00:00
Andy Wilkinson ac6ad7c0f1 Fix ModifiedClassPathExtension with parameterized tests
Closes gh-33014
2022-11-07 13:34:54 +00:00
Andy Wilkinson 651f4f7236 Polish "Polish ImportCandidates"
See gh-33013
2022-11-06 11:30:29 +00:00
biergit d7090b500b Polish ImportCandidates
See gh-33013
2022-11-06 11:30:29 +00:00
Phillip Webb 179aa987ee Unify actuator descriptor class names
Update actuator endpoints to consistently use `...Descriptor` for
JSON support classes.

Closes gh-33022
2022-11-05 20:15:35 -07:00
Phillip Webb 0fa7dba87a Fix formatting
See gh-33013
2022-11-05 19:32:19 -07:00
Phillip Webb 2c193e7736 Remove legacy cookie processor documentation
Remove legacy processor documentation since support will be removed
in Tomcat 10.1.

Closes gh-33021
2022-11-05 18:50:33 -07:00
biergit 8d98ae3435 Polish
See gh-33013
2022-11-05 18:47:37 -07:00
Andy Wilkinson bf468ab808 Polish tests to make use of @ParamterizedTest
Update tests to use @ParamterizedTest to reduce duplication.
2022-11-05 18:46:13 -07:00
Phillip Webb 3bd945766f Merge branch '2.7.x' 2022-11-05 17:03:10 -07:00
Phillip Webb b4283d45c5 Merge branch '2.6.x' into 2.7.x 2022-11-05 17:03:02 -07:00
Phillip Webb d2cceb6b77 Polish 2022-11-05 17:02:57 -07:00
Phillip Webb 262c30ddc1 Improve error message when DirtiesUrlFactoriesExtension fails
See gh-33019
2022-11-05 16:44:53 -07:00
Phillip Webb 34b4ae8e05 Merge branch '2.7.x'
Closes gh-33019
2022-11-05 16:36:55 -07:00
Phillip Webb 2ab1f49442 Merge branch '2.6.x' into 2.7.x
Closes gh-33018
2022-11-05 16:35:26 -07:00
Phillip Webb caf46043c6 Add @DirtiesUrlFactories annotation
Add `@DirtiesUrlFactories` annotation that can be used to reset URL
factories.

Closes gh-33017
2022-11-05 16:30:27 -07:00
Phillip Webb fb3c095e35 Merge branch '2.7.x'
Closes gh-33016
2022-11-05 16:06:13 -07:00
Phillip Webb 948893f36d Merge branch '2.6.x' into 2.7.x
Closes gh-33015
2022-11-05 16:04:40 -07:00
Phillip Webb d4cc8fc3a6 Support modified classpath on methods and parameterized tests
Update `ModifiedClassPathExtension` and related classes so that
annotations can be used directly on test methods, or on classes
passed into parameterized tests.

Closes gh-33014
2022-11-05 16:04:19 -07:00
Andy Wilkinson 42f4fd7e41 Revert to Spring Integration 6.0.0-RC1
Latest snapshots contain breaking changes that we do not yet know how
to address.
2022-11-05 13:39:45 +00:00
Andy Wilkinson 7e6bc3fdca Adapt to breaking API change in Spring Integration
See gh-33009
2022-11-04 19:40:52 +00:00
Andy Wilkinson 39f6a5d8a8 Start building against Spring Integration 6.0.0-RC2 snapshots
See gh-33009
2022-11-04 17:49:39 +00:00
Andy Wilkinson db8af6e638 Upgrade to Spring Data Bom 2022.0.0-RC2
Closes gh-32938
2022-11-04 17:46:50 +00:00
Andy Wilkinson 9472cb2db7 Polish 2022-11-04 17:44:50 +00:00
Andy Wilkinson 443d80ce6e Polish
See gh-32924
2022-11-04 17:23:01 +00:00
Andy Wilkinson edecebb641 Upgrade to Neo4j Java Driver 5.2.0
Closes gh-33008
2022-11-04 17:23:01 +00:00
Andy Wilkinson 3173f3e1ac Upgrade to Liquibase 4.17.2
Closes gh-33007
2022-11-04 16:22:06 +00:00
Andy Wilkinson 56252b72c8 Upgrade to jOOQ 3.17.5
Closes gh-33006
2022-11-04 16:22:02 +00:00
Andy Wilkinson 0f0d7e5336 Upgrade to Elasticsearch Client 8.5.0
Closes gh-33005
2022-11-04 16:21:59 +00:00
Andy Wilkinson fe8644cc59 Fail more elegantly when GraalVM version is too old
Closes gh-32924
2022-11-04 13:05:22 +00:00
Andy Wilkinson 8f5ec06a55 Upgrade to Spring HATEOAS 2.0.0-RC2
Closes gh-33001
2022-11-04 12:12:32 +00:00
Andy Wilkinson 2d5a3eac51 Include AOT-generated classes in native test binary
Closes gh-32940
2022-11-04 11:53:33 +00:00
Andy Wilkinson 2b29a10d5b Merge branch '2.7.x'
Closes gh-33000
2022-11-04 10:46:41 +00:00
Andy Wilkinson 06c83e5345 Merge branch '2.6.x' into 2.7.x
Closes gh-32999
2022-11-04 10:42:55 +00:00
Andy Wilkinson d00e004622 Add missing XMLUnit dependency management
Closes gh-32998
2022-11-04 10:42:26 +00:00
Scott Frederick 67af4c0a65 Polish documentation 2022-11-03 15:45:09 -05:00
Andy Wilkinson bc23080cc6 Upgrade to Spring Kafka 3.0.0-RC2
Closes gh-32934
2022-11-03 19:03:47 +00:00
Andy Wilkinson 3fce1e9715 Fix reflection hint registration for @JsonMixins
The hints need to be registered for the mixin not the target of the
mixin.

Closes gh-32929
2022-11-03 17:57:27 +00:00
Scott Frederick bb684cc0ad Add support for CNB platform API 0.10
Fixes gh-32949
2022-11-03 11:29:02 -05:00
Andy Wilkinson 538f1505f0 Rename Spring Session Bom to Spring Session
Closes gh-32952
2022-11-03 15:19:40 +00:00
Andy Wilkinson 17e9b50b7e Upgrade to Spring Framework 6.0.0-RC3
Closes gh-32856
2022-11-03 15:17:58 +00:00
Andy Wilkinson 604aa4d512 Align auto-configured Lettuce metrics with Lettuce's defaults
Closes gh-32986
2022-11-03 10:49:24 +00:00
Andy Wilkinson 8e08931411 Merge branch '2.7.x'
Closes gh-32990
2022-11-03 10:44:46 +00:00
Andy Wilkinson 394ae76b04 Merge branch '2.6.x' into 2.7.x
Closes gh-32989
2022-11-03 10:44:21 +00:00
Andy Wilkinson fcd3413ba0 Allow histograms to be disabled for Lettuce metrics
Closes gh-32985
2022-11-03 10:34:41 +00:00
Andy Wilkinson 9ccc1e8d62 Merge branch '2.7.x'
Closes gh-32988
2022-11-03 10:27:42 +00:00
Andy Wilkinson a3870f8da7 Merge branch '2.6.x' into 2.7.x
Closes gh-32987
2022-11-03 10:23:30 +00:00
Andy Wilkinson beb62be843 Test Boot's Gradle plugin against Gradle 7.6-rc-1
Closes gh-32933
2022-11-03 10:22:14 +00:00
Andy Wilkinson beea06f515 Polish "Handle custom observation name for HTTP reqs in max URI tag filters"
See gh-32973
2022-11-02 20:10:16 +00:00
Johnny Lim 89fe895cd6 Handle custom observation name for HTTP reqs in max URI tag filters
See gh-32973
2022-11-02 20:09:12 +00:00
Brian Clozel 0acaa0e460 Adapt to observation changes in Framework
See spring-projects/spring-framework#29388
2022-11-02 18:39:10 +01:00
Moritz Halbritter 05c5b1225c Replace Tag to KeyValues adapter code
Closes gh-32876
2022-11-02 16:25:37 +01:00
Johnny Lim 7f44572b70 Remove Infinispan's Spring Boot Starter in README
See gh-32974
2022-11-02 15:20:16 +00:00
Andy Wilkinson 89af931c29 Update coordinates of jaybird dependency
See gh-32954
2022-11-02 14:59:31 +00:00
Moritz Halbritter 85fd475821 Add noop tracer bean if tracing is disabled
The new functionality doesn't expose any public API
and works the same as WebTestClientContextCustomizer
does.

Closes gh-32907
2022-11-02 15:45:39 +01:00
Moritz Halbritter 7aff82009f Revert "Register no-op tracer bean if tracing is disabled"
This reverts commit 2d75a8a9eb.
2022-11-02 15:45:39 +01:00
Andy Wilkinson c8679184c1 Remove dependency management for Hazelcast Hibernate 5
Closes gh-32953
2022-11-02 11:54:09 +00:00
Andy Wilkinson 6fe341745b Upgrade to Jaybird 4.0.6.java11
Closes gh-32954
2022-11-02 11:38:52 +00:00
Moritz Halbritter 2d75a8a9eb Register no-op tracer bean if tracing is disabled
Closes gh-32907
2022-11-02 08:48:25 +01:00
Andy Wilkinson b001aeb9ff Upgrade to Selenium HtmlUnit 4.5.2
Closes gh-32966
2022-11-01 20:25:11 +00:00
Andy Wilkinson 261d7f0d97 Upgrade to Selenium 4.5.3
Closes gh-32965
2022-11-01 20:25:10 +00:00
Andy Wilkinson b56026fd75 Upgrade to Maven Shade Plugin 3.4.1
Closes gh-32964
2022-11-01 20:25:10 +00:00
Andy Wilkinson bf2e8b7f7b Upgrade to Liquibase 4.17.1
Closes gh-32963
2022-11-01 20:25:10 +00:00
Andy Wilkinson c5a4bef0ee Upgrade to Jedis 4.3.1
Closes gh-32962
2022-11-01 20:25:10 +00:00
Andy Wilkinson f663763f9d Upgrade to Jackson Bom 2.14.0-rc3
Closes gh-32961
2022-11-01 20:25:09 +00:00
Andy Wilkinson f1db3c779f Upgrade to Infinispan 14.0.2.Final
Closes gh-32960
2022-11-01 20:25:09 +00:00
Andy Wilkinson 323105fe2a Upgrade to HSQLDB 2.7.1
Closes gh-32959
2022-11-01 20:25:08 +00:00
Andy Wilkinson 335a09204e Upgrade to Hibernate 6.1.5.Final
Closes gh-32958
2022-11-01 20:25:08 +00:00
Andy Wilkinson 9e5f20c3b8 Upgrade to Flyway 9.5.1
Closes gh-32957
2022-11-01 20:25:08 +00:00
Andy Wilkinson 46fd43a72c Upgrade to DB2 JDBC 11.5.8.0
Closes gh-32956
2022-11-01 20:25:07 +00:00
Andy Wilkinson bc63ffd1ca Upgrade to Couchbase Client 3.4.0
Closes gh-32955
2022-11-01 20:25:07 +00:00
Scott Frederick a0d765cab8 Restore invocation of DefaultTestExecutionListenersPostProcessors
This commit partially reverts c81ebf63d9,
so that `DefaultTestExecutionListenersPostProcessor`s are invoked
even though deprecated.

See gh-31793
2022-11-01 13:16:36 -05:00
Andy Wilkinson 519250cacf Polish Gradle tasks for AOT processing
Closes gh-32946
2022-11-01 16:42:26 +00:00
Andy Wilkinson bd75965ff8 Start building against Spring Kafka 3.0.0-RC2 snapshots
See gh-32934
2022-11-01 12:09:39 +00:00
Andy Wilkinson 61c9a1540f Start building against Spring Batch 5.0.0-RC2 snapshots
See gh-32935
2022-11-01 12:09:39 +00:00
Andy Wilkinson ea0ebe54e3 Start building against Spring Data Bom 2022.0.0 snapshots
See gh-32938
2022-11-01 11:48:32 +00:00
Andy Wilkinson 72202ab19a Start building against Reactor Bom 2022.0.0 snapshots
See gh-32939
2022-11-01 11:48:32 +00:00
Andy Wilkinson 11cff48271 Start building against Micrometer Tracing 1.0.0 snapshots
See gh-32937
2022-11-01 11:48:32 +00:00
Andy Wilkinson 08154fab46 Start building against Micrometer 1.10.0 snapshots
See gh-32936
2022-11-01 10:55:46 +00:00
Andy Wilkinson b192c29edb Use AOT's outputs to configure source set's inputs
Closes gh-32919
2022-11-01 10:33:17 +00:00
Andy Wilkinson 0103e24bbb Stop configuring AOT-generated classes as output of AOT source set
Closes gh-32940
2022-11-01 10:32:37 +00:00
Andy Wilkinson 2bb9b2640e Separate classpath of AOT tasks from source sets they populate
Closes gh-32930
2022-11-01 10:06:33 +00:00
Phillip Webb 2b5a29d514 No longer log hostname during application start
Remove hostname logging since `InetAddress.getLocalHost().getHostName()`
causes a network lookup and can take a long time.

Closes gh-32908
2022-10-31 13:46:47 -07:00
Scott Frederick c81ebf63d9 Use ApplicationContextFailureProcessor to log report on failure
Closes gh-31793
2022-10-31 15:15:49 -05:00
Moritz Halbritter 6a138e1753 Polish 2022-10-31 17:03:16 +01:00
Moritz Halbritter 4fef5291bf Fix build
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to use a contains instead of exact match.
2022-10-31 16:59:15 +01:00
Moritz Halbritter 5e034eab59 Revert "Fix build"
This reverts commit ec0d598ba4.
2022-10-31 16:54:06 +01:00
Moritz Halbritter dd2bec267c Revert "Fix build"
This reverts commit 50599c5046.
2022-10-31 16:54:05 +01:00
Moritz Halbritter 50599c5046 Fix build
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to expect hints for those directories as well.
2022-10-31 16:03:49 +01:00
Moritz Halbritter ec0d598ba4 Fix build
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to expect hints for those directories as well.
2022-10-31 13:34:14 +01:00
Moritz Halbritter 5bf088d88b Add runtime hints for Liquibase migration file
Closes gh-32926
2022-10-31 11:29:53 +01:00
Moritz Halbritter 5d1ff17a0a Add Micrometer Observability documentation
Closes gh-32833
Closes gh-32912
2022-10-31 09:47:16 +01:00
Phillip Webb 9856286a2d Refine actuator httpexhanges naming
See gh-32885
2022-10-28 12:50:59 -07:00
Andy Wilkinson 29f7a596fe Polish 2022-10-28 08:57:00 +01:00
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>
2022-10-27 16:34:42 -07:00
Johnny Lim 8d17d2d443 Handle null span in LazyTracingSpanContextSupplier consistently
See gh-32817
2022-10-27 18:02:47 +01:00
Andy Wilkinson 67e4ac4f1e Remove stale reference to MetricsWebFilter from the docs
Closes gh-32909
2022-10-27 16:56:34 +01:00
Moritz Halbritter 40e2d0b8cd Remove mention of the Infinispan Spring Boot starter
The starter is not yet Spring Boot 3 compatible.

Closes gh-32896
2022-10-27 16:48:34 +02:00
Johnny Lim 5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Johnny Lim 7dd083ad69 Polish "Remove spring.xml.ignore flag usages"
See gh-32846
2022-10-27 16:27:29 +02:00
Andy Wilkinson 1cb149596d Add json starter so that Elasticsearch uses Jackson mapper by default
Closes gh-32906
2022-10-27 14:30:57 +01:00
Andy Wilkinson b9e176ce1a Inject Jackson modules rather than retrieving them manually
Fixes gh-32863
2022-10-27 13:35:37 +01:00
Moritz Halbritter 65c68ba64e Reinstate old flyway bean method
Closes gh-32849
2022-10-27 10:15:58 +02:00
Moritz Halbritter cd5d2ad3e8 Revert "Extract Flyway configuration mapping in separate class"
This reverts commit cf4117856b.
2022-10-27 10:08:27 +02:00
Moritz Halbritter cf4117856b Extract Flyway configuration mapping in separate class
Closes gh-32849
2022-10-27 09:53:29 +02:00
Marcin Grzejszczak b753170807 Add missing BaggageTextMapPropagator for OTel W3C
Without this change we're missing the BaggageTextMapPropagator for
OTel. This means that we're not propagating remote-fields
(only baggage via the 'baggage' field).

With this change we're adding the missing propagator as
THE LAST entry in the composite TextMapPropagator. It has to be
last cause with the latest Snapshots of Micrometer Tracing it
will append the remote field baggage to existing baggage in the
context extracted via the W3CBaggagePropagator.

See gh-32898
2022-10-27 09:33:33 +02:00
Moritz Halbritter 1f0cf1ac2b Make EmbeddedDatabaseConnection GraalVM compatible
Without those changes, if @AutoConfigureTestDatabase is used, the
native image build process fails with:

  EmbeddedDatabaseConnection was unintentionally initialized at build
  time.

Closes gh-32865
2022-10-27 09:21:19 +02:00
Scott Frederick eeac08e50e Remove references to WebSecurityConfigurerAdapter from javadoc
Closes gh-32879
2022-10-26 16:55:10 -05:00
Moritz Halbritter 0985e3d237 Add resource hint for banner.txt
Closes gh-32882
2022-10-26 15:59:50 +02:00
Phillip Webb a59b6cb1f3 Polish 2022-10-25 21:56:53 -07:00
Phillip Webb 0f405c06bf Merge branch '2.7.x' 2022-10-25 16:40:56 -07:00
Phillip Webb f44531a7a2 Merge branch '2.6.x' into 2.7.x 2022-10-25 16:02:04 -07:00
Phillip Webb 92b513dc8d Polish 2022-10-25 16:01:58 -07:00
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Phillip Webb c8676a81de Merge branch '2.6.x' into 2.7.x 2022-10-25 15:48:04 -07:00
Phillip Webb d7ac20cd6c Update copyright year of changed files 2022-10-25 15:47:30 -07:00
Phillip Webb 9505673d6f Ensure application event listeners are always refreshed
Update `EventPublishingRunListener` to ensure that application event
listeners are always refreshed before multicasting initial events.

Prior to this commit, refreshing occurred after multicasting which
meant that listeners added by a different `SpringApplicationRunListener`
would not be picked up. This caused properties from tests that have
`UseMainMethod` set to `ALWAYS` or `WHEN_AVAILABLE` to be missing.

Fixes gh-32860
2022-10-25 15:41:57 -07:00
Phillip Webb 159910b0d9 Polish 2022-10-25 14:49:04 -07:00
Andy Wilkinson e6c37d698f Reinstate support for read timeouts with RestTemplateBuilder
Refactor the way `ClientHttpRequestFactory` instances are created in
order to support setting read timeouts.

Prior to this commit, the reflection based approach would call
`setReadTimeout`. As of Spring Framework 6.0, the
`HttpComponentsClientHttpRequestFactory` class no longer supports this
approach. The timeout must be set on the `HttpClientConnectionManager`
used in the `HttpClient` which can be passed in to the constructor.

In order to support this approach, the `ClientHttpRequestFactory` can
now be created using a `Function` rather than a `Supplier`. The
function accepts a `ClientHttpRequestFactorySettings` which provides
the timeout settings to apply.

The `ClientHttpRequestFactories` utility class provides methods to
create `ClientHttpRequestFactory` instances that respect the settings.
Whenever possible, these are created without using reflection.

Fixes gh-32857

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2022-10-25 14:41:19 -07:00
Scott Frederick c22e76632c Add Build-Jdk-Spec to jar and war manifest when building with Gradle
This commit adds a `Build-Jdk-Spec` attribute to the manifest in a
jar or war file built with the Spring Boot Gradle plugin. This
aligns the Gradle plugin's behavior with the default Maven plugin
behavior.

This removes the need to set a `BP_JVM_VERSION` environment variable
when invoking Cloud Native Buildpacks, as the Paketo buildpacks will
honor `Build-Jdk-Spec` in a jar or war manifest to determine the
default JVM version.

Fixes gh-32829
2022-10-25 15:48:05 -05:00
Moritz Halbritter 383d6c897f Remove reflection for SimpleRequestExpectationManager creation
Closes gh-32867
2022-10-25 16:15:51 +02:00
Moritz Halbritter 9ee3fd0b0b Disable HttpGraphQlTesterContextCustomizer after AOT processing
After AOT processing, a HttpGraphQlTester bean will be defined directly
so the context customizer that initiates its registration is not
needed.

Closes gh-32872
2022-10-25 14:02:55 +02:00
Andy Wilkinson 99edda735e Polish 2022-10-25 12:57:58 +01:00
Moritz Halbritter b014039a34 Disable WebTestClientContextCustomizer after AOT processing
After AOT processing, a WebTestClient bean will be defined directly
so the context customizer that initiates its registration is not
needed.

Closes gh-32859
2022-10-25 13:51:43 +02:00
Moritz Halbritter f2c004f604 Remove reflection in OutputCaptureExtension
Closes gh-32870
2022-10-25 11:42:52 +02:00
Moritz Halbritter 512a4c7544 Revert "Register runtime hints for OutputCapture"
This reverts commit 35abc3a6dc.
2022-10-25 11:40:44 +02:00
Moritz Halbritter 35abc3a6dc Register runtime hints for OutputCapture
Closes gh-32870
2022-10-25 11:29:12 +02:00
Andy Wilkinson f11945b961 Start building against Spring Framework 6.0.0-RC3 snapshots
See gh-32856
2022-10-24 12:19:16 +01:00
Andy Wilkinson b7fb345709 Revert workaround for multiple ImportRuntimeHints
Closes gh-32830
2022-10-24 10:20:50 +01:00
Andy Wilkinson b78e7b5ac7 Disable TestRestTemplateContextCustomizer after AOT processing
After AOT processing, a TestRestTemplate bean will be defined
directly so the context customizer that initiates its registration is
not needed. We'd already disabled the registrar but this is
insufficient in Graal 22.3 which fails fast when the customizer tries
to reference the registrar.

Fixes gh-32848
2022-10-24 10:18:08 +01:00
Moritz Halbritter 605dd3d4bd Polish docs 2022-10-24 11:01:30 +02:00
Andy Wilkinson 9e6259cd37 Remove development-only dependencies from native image classpath
Fixes gh-32843
2022-10-24 09:22:13 +01:00
Andy Wilkinson b0b2818f0b Improve type discovery in Logback AOT contribution
Logback can infer the Java class to which an XML tag should be mapped
by looking for a setter method on the class to which the parent tag
was mapped. This commits ensures that reflection hints are added for
such classes.

Fixes gh-32839
2022-10-21 16:38:52 +01:00
Andy Wilkinson eebe23a081 Make all AOT-generated resources available to native-compile
Fixes gh-32841
2022-10-21 16:38:52 +01:00
Moritz Halbritter ff6d9aa881 Polish "Add micrometer tracing documentation" 2022-10-21 14:51:19 +02:00
Andy Wilkinson bed313746b Correct property names to align with changes in 3.0
See gh-32837
2022-10-21 12:23:07 +01:00
Johnny Lim fc61690675 Add missing @Test to sanitizeLists()
See gh-32792
2022-10-21 12:05:44 +01:00
Andy Wilkinson a606b26920 Merge branch '2.7.x'
Closes gh-32837
2022-10-21 11:04:52 +01:00
Andy Wilkinson 032487117b Merge branch '2.6.x' into 2.7.x
Closes gh-32836
2022-10-21 11:04:09 +01:00
Andy Wilkinson fe51e03019 Support IPv6 addresses in spring.redis.sentinel.nodes
Fixes gh-32762
2022-10-21 10:53:54 +01:00
Moritz Halbritter e999513838 Add micrometer tracing documentation
Closes gh-30658
2022-10-21 10:04:40 +02:00
Sébastien Deleuze 4e131bd627 Provide a workaround to allow multiple @ImportRuntimeHints
Provide a workaround for spring-projects/spring-framework#29361 so
that multiple `@ImportRuntimeHints` can be used in a type hierarchy.

The commit should cover Actuator web endpoint use cases with the
exception of Cloud Foundry endpoints which are not possible due to
package access issues.

See gh-29361
2022-10-20 17:12:58 -07:00
Phillip Webb ea094ddba6 Fix package tangles caused by ConfigurationProperties hints
Relocate `ConfigurationPropertiesReflectionHintsProcessor` and refactor
it to be a general purpose `BindableRuntimeHintsRegistrar`.

Prior to this commit, `ConfigurationPropertiesReflectionHintsProcessor`
was used to declare binding hints for classes that were bound, but
might be `@ConfigurationProperties`. By moving and renaming the class,
it's now better aligned to the way it's used.

Support for `@NestedConfigurationProperties` has been implemented by
adding a `@Nestable` meta-annotation. This allow us to create the
appropriate hints, without the `Binder` needing to be directly aware of
the `@NestedConfigurationProperties` annotation.

Closes gh-32815
2022-10-20 17:05:54 -07:00
Phillip Webb eb1d72e7b7 Merge branch '2.7.x' 2022-10-20 17:05:49 -07:00
Phillip Webb d8c4aec946 Merge branch '2.6.x' into 2.7.x 2022-10-20 17:04:37 -07:00
Phillip Webb 1a14f39f83 Polish 2022-10-20 17:04:29 -07:00
Phillip Webb 7db93aeb90 Merge branch '2.7.x'
Closes gh-32827
2022-10-20 15:20:15 -07:00
Phillip Webb 1c7bff7cc1 Merge branch '2.6.x' into 2.7.x
Closes gh-32826
2022-10-20 15:01:00 -07:00
Phillip Webb 463a614d27 Fix package tangle between SpringApplication and Environment types
Update `SpringApplication` so that it no longer directly decides the
type of `Environment` that should be created.

Closes gh-32825
2022-10-20 14:51:13 -07:00
Scott Frederick 072ce5c151 Fix versions in documentation links
Fixes gh-32772
2022-10-20 14:59:14 -05:00
Scott Frederick b78b22b6f6 Allow Gradle task property to be set with String or enum value
See gh-32769
2022-10-20 13:59:54 -05:00
Phillip Webb c53c8c84b8 Fix annotation processor to deal with relocated @ConstructorBinding
Update `ConfigurationMetadataAnnotationProcessor` to use the correct
location for the `@ConstructorBinding` annotation and to deal with
finding it as a meta-annotation.

Closes gh-32660
2022-10-20 10:19:57 -07:00
Scott Frederick bdedae21c0 Polish native image documentation
See gh-32582
2022-10-20 11:45:10 -05:00
Stephane Nicoll 010891a3c6 Merge branch '2.7.x'
Closes gh-32821
2022-10-20 16:43:25 +02:00
Stephane Nicoll 7bd9754ce1 Merge branch '2.6.x' into 2.7.x
Closes gh-32820
2022-10-20 16:43:14 +02:00
James Seung Hyun Son 5e0a67ac66 Fix typos in logging.adoc
See gh-32812
2022-10-20 16:41:24 +02:00
Stephane Nicoll 74a8eb7160 Merge branch '2.7.x'
Closes gh-32819
2022-10-20 16:40:30 +02:00
Stephane Nicoll 13691f27bd Merge branch '2.6.x' into 2.7.x
Closes gh-32818
2022-10-20 16:37:57 +02:00
Stephane Nicoll 4d7cb7144e Upgrade copyright year of changed files
See gh-32644
2022-10-20 16:35:55 +02:00
Ada-Claire c5a1944267 Harmonize ConfigurationProperties code samples
Rename the SomeProperties class so that it is consistent with other
examples given within the Type-safe Configuration Properties. This
ensures that readers can intuitively draw the conclusion that the
MyProperties class is annotated with ConfigurationProperties.

See gh-32644
2022-10-20 16:35:18 +02:00
Andy Wilkinson 482eb49391 Support <import> in logback.xml during AOT processing
See gh-32756
2022-10-20 14:56:25 +01:00
Brian Clozel 685fa900f8 Auto-configure Observation instrumentation for WebFlux
Prior to this commit, Spring Boot would offer a specific Metrics
instrumentation for WebFlux applications through a `WebFilter` and
custom Tag providers.

As of Spring Framework 6.0, the Observation instrumentation is done
directly in WebFlux, also with a `WebFilter`. While this allows both
metrics and traces, some features cannot be supported in the same way
with this new infrastructure.
The former `WebFilter` has been removed and the Tagging infrastructure
deprecated in favor of custom Observation conventions. This commit
provides an adapter layer so that developers can refactor their custom
tagging solution to the convention way, during the deprecation phase,
without losing any feature.

Closes gh-32539
2022-10-20 15:29:31 +02:00
Stephane Nicoll cda63b541f Upgrade to Spring Framework 6.0.0-RC2
Closes gh-32696
2022-10-20 15:24:51 +02:00
Andy Wilkinson 26e747d2db Fix package tangle in spring-boot-gradle-plugin
Closes gh-32814
2022-10-20 13:12:12 +01:00
Stephane Nicoll 04d6840ff3 Polish "Upgrade to Spring Security 6.0.0-RC1"
See gh-32604
2022-10-20 10:50:17 +02:00
Stephane Nicoll d8ec24b542 Upgrade to Spring Batch 5.0.0-RC1
Closes gh-32618
2022-10-20 10:50:17 +02:00
Stephane Nicoll d39144232f Upgrade to Spring Session 3.0.0-RC1
Closes gh-32606
2022-10-20 10:50:17 +02:00
Moritz Halbritter 1635f61368 Update GraalVM requirement to 22.3
See gh-32813
2022-10-20 10:36:42 +02:00
Phillip Webb 73a34b6c0a Fix checkstyle issues
See gh-32582
2022-10-20 00:09:07 -07:00
Sébastien Deleuze 3002779195 Remove LogbackConfigurationAotContribution from native image
Remove `LogbackConfigurationAotContribution` from the reachable
code path from a native image POV.

See gh-32793
2022-10-19 23:49:34 -07:00
Phillip Webb fb736e8427 Add native image reference documentation
Update reference documentation with a new "native image" section.

This commit includes some work derived from the "Spring Native"
project documentation written by Andy Clement, Sébastien Deleuze,
Filip Hanik, Dave Syer, Esteban Ginez, Jay Bryant, Brian Clozel,
Stéphane Nicoll, and Josh Long.

Closes gh-32582

Co-authored-by: Moritz Halbritter <mkammerer@vmware.com>
2022-10-19 23:46:21 -07:00
Phillip Webb 0219b222c2 Merge branch '2.7.x' 2022-10-19 22:03:18 -07:00
Phillip Webb d3750c4991 Merge branch '2.6.x' into 2.7.x 2022-10-19 22:01:13 -07:00
Phillip Webb c416c17fe8 Polish documentation title case 2022-10-19 21:53:21 -07:00
Scott Frederick 8acf9afccb Use String instead of enum for Gradle task Property
See gh-32769
2022-10-19 17:23:23 -05:00
Brian Clozel 9948fc3e39 Use GraphQL Observation instrumentation
This commit migrates the existing metrics support (added in #29140) to
the new `Observation` instrumentation contributed in
spring-projects/spring-graphql#501.

We cannot have a smoother migration path here as the instrumentation
does not use the same context information for metadata extraction.

Closes gh-32794
2022-10-19 22:06:40 +02:00
Stephane Nicoll 1822ce1ef3 Upgrade to Mockito 4.8.1
Closes gh-32799
2022-10-19 21:03:31 +02:00
Stephane Nicoll 5cc9527fde Upgrade to Infinispan 14.0.1.Final
Closes gh-32798
2022-10-19 21:03:28 +02:00
Stephane Nicoll 8a9b679c4c Upgrade to Groovy 4.0.6
Closes gh-32797
2022-10-19 21:03:24 +02:00
Stephane Nicoll 973121db5d Upgrade to Flyway 9.5.0
Closes gh-32796
2022-10-19 21:03:21 +02:00
Madhura Bhave ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2022-10-19 11:46:27 -07:00
Phillip Webb 2e74878ba4 Downgrade to OpenSAML 4.0.1
See gh-32604
2022-10-19 11:46:27 -07:00
Madhura Bhave cedd553b83 Remove error page security filter
Spring Security now re-applies the authorization rules
to the error page by default. Additionally, it configures
RequestAttributeSecurityContextRepository as the default for
stateless applications allowing those applications to have access
to the original authentication during an error dispatch.

Closes gh-31703
2022-10-19 11:46:27 -07:00
Andy Wilkinson 8621be6bba Make consistent use of Property for Gradle task configuration
Closes gh-32769
2022-10-19 19:08:45 +01:00