root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
38,972 Commits 24 Branches 353 Tags 292 MiB
Commit Graph

18108 Commits

Author SHA1 Message Date
Stephane Nicoll 6e9ea85835 Adapt BasePackages bean definition for AOT processing 
This commit adapts how the BasePackages bean is registered so that
AOT processing works with it out-of-the-box. Previously we were using
an instance supplier with the accumulated base packages. This commit
changes that to set a constructor argument values.

Closes gh-31223
 2022-05-31 15:19:35 +02:00
Andy Wilkinson 4385926df1 Ensure that the main application class can be deduced 
Closes gh-31222
 2022-05-31 12:06:56 +01:00
Andy Wilkinson 5f54289e97 Allow WebApplicationType to be deduced in a native image 
Closes gh-31217
 2022-05-31 11:39:42 +01:00
Stephane Nicoll 44a8e91b9e Prevent main method to continue once the AOT context has been optimized 
This commit makes sure that processing of the main method upon
completion of SpringApplication#run. Previously, any instructions in
the user's main method were invoked, which is not suitable to build-time
processing.

Closes gh-31219
 2022-05-31 12:34:37 +02:00
Andy Wilkinson d044eaf69d Merge branch '2.7.x' 
Closes gh-31221
 2022-05-31 11:21:52 +01:00
Andy Wilkinson 7f291f8da0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31220
 2022-05-31 11:14:08 +01:00
Andy Wilkinson 348662b15e Remove unused deduceFromApplicationContext and supporting code 
Closes gh-31218
 2022-05-31 10:57:22 +01:00
Andy Wilkinson 1ba1eff63a Merge branch '2.7.x' 2022-05-30 19:22:45 +01:00
Andy Wilkinson 430040415b Merge branch '2.6.x' into 2.7.x 2022-05-30 19:22:37 +01:00
Andy Wilkinson 0b6c147a87 Polish 2022-05-30 19:22:30 +01:00
Andy Wilkinson 12465ea6b7 Merge branch '2.7.x' 
Closes gh-31214
 2022-05-30 18:24:12 +01:00
Andy Wilkinson d1420b6abb Merge branch '2.6.x' into 2.7.x 
Closes gh-31213
 2022-05-30 18:24:00 +01:00
Andy Wilkinson da8dafe138 Make afterResolve hook used by bootJar and bootWar more robust 
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.

This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.

Closes gh-30586
 2022-05-30 18:19:47 +01:00
Andy Wilkinson 85ad4fd4b4 Merge branch '2.7.x' 
Closes gh-31212
 2022-05-30 17:17:26 +01:00
Andy Wilkinson 70bcade232 Merge branch '2.6.x' into 2.7.x 
Closes gh-31211
 2022-05-30 17:16:53 +01:00
Andy Wilkinson 419ac26e0d Use conventions for source and encoding of aggregatedJavadoc 
Closes gh-31210
 2022-05-30 17:15:45 +01:00
Stephane Nicoll b2e63db57f Merge branch '2.7.x' 
Closes gh-31209
 2022-05-30 15:14:23 +02:00
Stephane Nicoll dd437c4cf4 Merge branch '2.6.x' into 2.7.x 
Closes gh-31208
 2022-05-30 15:14:08 +02:00
Stephane Nicoll ad1214c972 Upgrade copyright year of changed files 
See gh-31197
 2022-05-30 15:13:12 +02:00
heqiang 3a0ab01066 Polish "Remove boxing" 
See gh-31197
 2022-05-30 15:02:58 +02:00
Stephane Nicoll a27427b977 Merge branch '2.7.x' 
Closes gh-31207
 2022-05-30 14:57:57 +02:00
Stephane Nicoll 95dad34482 Merge branch '2.6.x' into 2.7.x 
Closes gh-31206
 2022-05-30 14:57:45 +02:00
Matei Cernăianu eb8b9e17c5 Fix "spring.factories" typos in database initialization documentation 
See gh-31203
 2022-05-30 14:55:15 +02:00
Andy Wilkinson d354c03e63 Merge branch '2.7.x' 
Closes gh-31191
 2022-05-27 15:58:57 +01:00
Andy Wilkinson 682ac53f32 Ensure that config processor runs with only AutoConfiguration 
Fixes gh-31186
 2022-05-27 15:58:00 +01:00
Andy Wilkinson f433d250e1 Merge branch '2.7.x' 
Closes gh-31189
 2022-05-27 11:14:40 +01:00
Andy Wilkinson d2397bd34e Merge branch '2.6.x' into 2.7.x 
Closes gh-31188
 2022-05-27 11:14:29 +01:00
Andy Wilkinson 83e8c039b3 Add application/wasm to MIME mappings 
Closes gh-30885
 2022-05-27 11:14:04 +01:00
Andy Wilkinson a659e89dd4 Merge branch '2.7.x' 
Closes gh-31187
 2022-05-27 10:50:48 +01:00
Youri Bonnaffe d38bc13fd5 Remove mimepull dependency 
Mimepull dependency was introduced in 1c18fd8 for gh-14924 to force the
version as the one coming from saaj-impl was not on Maven Central.
This is no longer the case.

Version 1.10.0 of Mimepull has been built with Java 11, breaking
compatibility with Java 8 for Spring Boot.

See gh-31145
 2022-05-27 10:33:27 +01:00
Andy Wilkinson 90752e559a Polish "Auto-configure JvmCompilationMetrics" 
See gh-31151
 2022-05-27 10:18:31 +01:00
izeye f720b65dfc Auto-configure JvmCompilationMetrics 
See gh-31151
 2022-05-27 10:18:13 +01:00
Wim Deblauwe 1aad7bea8e Add link to Error Handling Spring Boot Starter 
See gh-31156
 2022-05-27 10:11:19 +01:00
Andy Wilkinson df99ad17bd Merge branch '2.7.x' 
Closes gh-31184
 2022-05-27 10:09:28 +01:00
Andy Wilkinson 194e9f0f79 Merge branch '2.6.x' into 2.7.x 
Closes gh-31183
 2022-05-27 10:02:08 +01:00
Andy Wilkinson 56c3a5f0ab Polish "Assert that sources does not contain null elements" 
See gh-30878
 2022-05-27 10:01:06 +01:00
Guirong Hu ebf276c005 Assert that sources does not contain null elements 
See gh-30878
 2022-05-27 10:00:32 +01:00
Andy Wilkinson bf56665718 Polish "Add PUT shutdown operation for Prometheus Push Gateway" 
See gh-31104
 2022-05-26 20:04:09 +01:00
Mattia Cansirro Cortorillo 0f99c43198 Add PUT shutdown operation for Prometheus Push Gateway 
See gh-31104
 2022-05-26 19:58:53 +01:00
Andy Wilkinson 36a60d8e2e Merge branch '2.7.x' 
Closes gh-31181
 2022-05-26 19:49:53 +01:00
Andy Wilkinson 137318a845 Merge branch '2.6.x' into 2.7.x 
Closes gh-31180
 2022-05-26 19:49:35 +01:00
Damiano Albani 3f91ed037f Fix Custom Layers Configuration section title in Maven plugin docs 
See gh-31172
 2022-05-26 19:46:11 +01:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 14af1bb2dc Polish 2022-05-26 16:54:31 +01:00
Andy Wilkinson 26b89bfc80 Remove redundant throws declarations from public APIs 
Closes gh-31179
 2022-05-26 16:00:47 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x' 
Closes gh-31178
 2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson b3a4982f31 Merge branch '2.6.x' into 2.7.x 
Closes gh-31174
 2022-05-26 14:01:23 +01:00
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0 
Closes gh-30903
 2022-05-26 13:59:03 +01:00
Andy Wilkinson 003f747e77 Merge branch '2.7.x' 
Closes gh-31170
 2022-05-26 13:52:41 +01:00
Andy Wilkinson e617035dba Merge branch '2.6.x' into 2.7.x 
Closes gh-31167
 2022-05-26 13:45:52 +01:00
Andy Wilkinson 3e7bd582a3 Upgrade to Spring Java Format 0.0.33 
Closes gh-31166
 2022-05-26 13:22:23 +01:00
Eddú Meléndez 154c84ffe2 Add package-info for o.s.b.a.a.metrics.graphql 
See gh-31140
 2022-05-25 13:30:29 +01:00
Andy Wilkinson e13f187c37 Upgrade to REST Assured 5.1.0 
Closes gh-31158
 2022-05-24 13:41:12 +01:00
Andy Wilkinson f9db6ad237 Merge branch '2.7.x' 
Closes gh-31152
 2022-05-23 12:51:13 +01:00
Andy Wilkinson 24dc525127 Fix conditions on auto-configured WebMvcMetricsFilter 
Closes gh-31150
 2022-05-23 12:50:49 +01:00
Phillip Webb 68bd9d6b6d Merge branch '2.7.x' 2022-05-19 18:09:29 -07:00
Phillip Webb 06679a4c46 Merge branch '2.6.x' into 2.7.x 
Closes gh-31128
 2022-05-19 18:07:17 -07:00
Phillip Webb 9fa33e5645 Merge branch '2.5.x' into 2.6.x 
Closes gh-31127
 2022-05-19 18:04:54 -07:00
Phillip Webb 05a6447a8d Polish "Resolve errors in layers.xsd" 
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.

See gh-31126
 2022-05-19 18:01:55 -07:00
Liuzh 0d78323b60 Resolve errors in layers.xsd 
Update `layer-*.xsd` files with following fixes:

- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>

See gh-31126
 2022-05-19 18:00:25 -07:00
Henning Poettker 102d9ff10a Use Spring Batch Bom 
See gh-31122
 2022-05-19 13:15:00 +01:00
Stephane Nicoll 1b1e6e6f73 Merge branch '2.7.x' 2022-05-19 09:21:09 +02:00
Stephane Nicoll 63fc60d354 Upgrade to SendGrid 4.9.2 
Closes gh-31116
 2022-05-19 09:19:56 +02:00
Stephane Nicoll 8fc1f07901 Upgrade to Spring Batch 5.0.0-M3 
Closes gh-30459
 2022-05-19 09:05:05 +02:00
Stephane Nicoll d013237d87 Upgrade to Spring Integration 6.0.0-M3 
Closes gh-31063
 2022-05-19 09:04:42 +02:00
Stephane Nicoll 136a577cdc Upgrade to Spring Session 2022.0.0-M2 
Closes gh-30639
 2022-05-19 09:03:22 +02:00
Stephane Nicoll 4a310ff7b9 Upgrade to Spring Session Bom 2021.2.0 
Closes gh-31021
 2022-05-19 09:02:49 +02:00
Andy Wilkinson 5959c6eec8 Prohibit Jakarta JMS upgrade that exceeds Jakarta EE 9 baseline 
See gh-31045
 2022-05-18 21:09:27 +01:00
Andy Wilkinson fd2459ccac Upgrade to Thymeleaf 3.1.0.M2 
Closes gh-31110
 2022-05-18 21:07:42 +01:00
Andy Wilkinson abfb675d20 Upgrade to Spring Security 6.0.0-M5 
Closes gh-31101
 2022-05-18 19:22:16 +01:00
Andy Wilkinson a712b1e6b0 Upgrade to Spring Security 5.6.5 
Closes gh-31102
 2022-05-18 19:19:47 +01:00
Andy Wilkinson e82def03ca Upgrade to Spring Security 5.5.8 
Closes gh-31096
 2022-05-18 19:18:24 +01:00
Andy Wilkinson d46c09cda3 Upgrade to Spring Security 5.7.1 
Closes gh-31100
 2022-05-18 17:38:59 +01:00
Andy Wilkinson cc93a0a30e Upgrade to Spring Batch 4.3.6 
Closes gh-31020
 2022-05-18 17:38:09 +01:00
Andy Wilkinson 69edce0629 Upgrade to Spring Batch 4.3.6 
Closes gh-31011
 2022-05-18 17:37:11 +01:00
Andy Wilkinson 7f60c67074 Upgrade to Spring Batch 4.3.6 
Closes gh-31003
 2022-05-18 17:35:55 +01:00
Brian Clozel e34187d05f Upgrade to Spring for GraphQL 1.0.0 
Closes gh-30858
 2022-05-18 18:31:18 +02:00
Stephane Nicoll 216d156968 Refine native profile to use a classifier for the repackaged jar 
This commit refines 80470f0b26 so that the 'repackage' goal of the
Spring Boot maven plugin uses a classifier. Previously, a regular
package with the profile fails as the Native Build Tools is trying to
use the repackaged archive as a regular jar file.

This is temporary as we'd like to explore other solutions, including
suggesting an additional option in the NBT plugin itself that uses the
regular classpath, rather than the produced jar.

See gh-30830
 2022-05-18 15:45:40 +02:00
Andy Wilkinson 723a7b2bff Upgrade to Spring Kafka 3.0.0-M4 
Closes gh-30645
 2022-05-18 14:07:58 +01:00
Andy Wilkinson 842cea2fc1 Merge branch '2.7.x' 2022-05-18 13:18:20 +01:00
Guirong Hu 1d7f7c2d28 Restore Spring Security dependency check for SpringSecurityDialect 
See gh-31033
 2022-05-18 13:16:24 +01:00
Andy Wilkinson 646d582393 Merge branch '2.6.x' into 2.7.x 
Closes gh-31099
 2022-05-18 13:14:46 +01:00
Andy Wilkinson e407bae8c8 Merge branch '2.5.x' into 2.6.x 
Closes gh-31098
 2022-05-18 13:14:15 +01:00
Andy Wilkinson 5e78bef9f8 Test security dialect auto-config without Spring Security 
Closes gh-31097
 2022-05-18 13:06:09 +01:00
Andy Wilkinson 96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11 
Closes gh-31054
 2022-05-18 11:33:55 +01:00
Andy Wilkinson c4beca3e01 Fix Maven-based AOT generation on Windows 
Closes gh-30525
 2022-05-18 10:54:35 +01:00
Stephane Nicoll 2f46928f84 Upgrade to Spring Integration 5.5.12 
Closes gh-31062
 2022-05-18 08:58:50 +02:00
Stephane Nicoll 01288b61af Upgrade to Spring Integration 5.5.12 
Closes gh-31061
 2022-05-18 08:54:57 +02:00
Stephane Nicoll 4eb778df43 Upgrade to Spring Integration 5.5.12 
Closes gh-31060
 2022-05-18 08:54:24 +02:00
Phillip Webb f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Phillip Webb 23eceb0d8a Merge branch '2.6.x' into 2.7.x 2022-05-17 22:21:41 -07:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Phillip Webb ea881aadc6 Merge branch '2.7.x' 2022-05-17 22:19:08 -07:00
Phillip Webb 13670e556b Merge branch '2.6.x' into 2.7.x 
Closes gh-31095
 2022-05-17 22:18:53 -07:00
Phillip Webb 0beccde6ee Merge branch '2.5.x' into 2.6.x 
Closes gh-31094
 2022-05-17 22:18:38 -07:00
Phillip Webb 7da42d7139 Allow tests to pass when a NAME environment variable exists 
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.

Closes gh-31076
 2022-05-17 22:16:24 -07:00
Phillip Webb e83ed4fe5e Merge branch '2.7.x' 2022-05-17 22:16:02 -07:00
Phillip Webb fbde59d635 Merge branch '2.6.x' into 2.7.x 
Closes gh-31093
 2022-05-17 22:14:40 -07:00
Phillip Webb 6bce0c5044 Merge branch '2.5.x' into 2.6.x 
Closes gh-31092
 2022-05-17 22:14:21 -07:00
Phillip Webb 44c979beb0 Reorder default property sources after @PropertySource processing 
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.

Fixes gh-31068
 2022-05-17 22:13:49 -07:00
Phillip Webb 06f8041e4d Merge branch '2.7.x' 2022-05-17 21:50:42 -07:00
Phillip Webb d5d5997be7 Merge branch '2.6.x' into 2.7.x 2022-05-17 21:49:20 -07:00
Phillip Webb 99f5c781a5 Merge branch '2.5.x' into 2.6.x 2022-05-17 21:48:50 -07:00
Phillip Webb 350d27fe50 Polish code to use method references when possible 2022-05-17 21:16:42 -07:00
Scott Frederick 8a1c8b5c2c Fix deprecation warning 
See gh-30978
 2022-05-17 19:25:24 -05:00
Scott Frederick 8e38e28e94 Merge branch '2.7.x' 2022-05-17 18:47:13 -05:00
Scott Frederick 03deb1d067 Merge branch '2.6.x' into 2.7.x 
Closes gh-31089
 2022-05-17 18:46:59 -05:00
Scott Frederick f395cfa255 Merge branch '2.5.x' into 2.6.x 
Closes gh-31088
 2022-05-17 18:46:38 -05:00
Scott Frederick 50e27333d2 Tolerate failures when recording WebClient metrics 
Fixes gh-30978
 2022-05-17 18:45:37 -05:00
Madhura Bhave f3cacbe6ec Fix formatting 2022-05-17 14:42:11 -07:00
Madhura Bhave c730ab7d0c Merge branch '2.7.x' into main 2022-05-17 14:29:36 -07:00
Scott Frederick 7d459a13c2 Add properties for SAML relying party single logout 
Closes gh-30128

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
 2022-05-17 14:07:48 -07:00
Andy Wilkinson b35006f0f4 Merge branch '2.7.x' 2022-05-17 18:37:27 +01:00
Andy Wilkinson 179e37279d Merge branch '2.6.x' into 2.7.x 
Closes gh-31086
 2022-05-17 18:37:05 +01:00
Andy Wilkinson e3b2088e85 Merge branch '2.5.x' into 2.6.x 
Closes gh-31085
 2022-05-17 18:36:54 +01:00
Andy Wilkinson cc2d68968d Upgrade to Maven Resolver 1.6.3 
This commit also expands our internal dependency management for
Maven Resolver to cover all of the modules upon which we depend.

Closes gh-31083
 2022-05-17 17:51:37 +01:00
Andy Wilkinson 1238e1f20b Upgrade to Kafka 3.2.0 
Closes gh-31084
 2022-05-17 17:48:08 +01:00
Stephane Nicoll 234eba327d Upgrade to Hibernate 5.6.9.Final 
Closes gh-31081
 2022-05-17 16:38:05 +02:00
Stephane Nicoll b196a78787 Upgrade to Flyway 8.5.11 
Closes gh-31080
 2022-05-17 16:38:02 +02:00
Andy Wilkinson bcc27c5d22 Deleting existing output before running AOT processing 
Closes gh-30981
 2022-05-17 15:33:45 +01:00
Andy Wilkinson 56949250ef Polish 2022-05-17 15:19:59 +01:00
Andy Wilkinson 3e19bd6165 Merge branch '2.7.x' 2022-05-17 15:07:59 +01:00
Andy Wilkinson 57598490bf Merge branch '2.6.x' into 2.7.x 
Closes gh-31079
 2022-05-17 15:04:53 +01:00
Andy Wilkinson f6b095bdfd Merge branch '2.5.x' into 2.6.x 
Closes gh-31078
 2022-05-17 15:03:57 +01:00
Andy Wilkinson f19d91561b Manage version of all Artemis modules upon which the build depends 
Closes gh-31077
 2022-05-17 15:01:23 +01:00
izeye 74a8fffe9f Polish LogbackRuntimeHintsRegistrarTests 
See gh-31074
 2022-05-17 13:28:26 +02:00
Stephane Nicoll bf0af6ebed Upgrade to Spring Security 6.0.0-M4 
Closes gh-30633
 2022-05-17 09:46:51 +02:00
Stephane Nicoll ea1a6ac4ec Upgrade to Spring Security 5.7.0 
Closes gh-31019
 2022-05-17 09:43:20 +02:00
Stephane Nicoll 98ac7ee048 Upgrade to Spring Kafka 2.8.6 
Closes gh-31018
 2022-05-17 09:42:57 +02:00
Stephane Nicoll d2d4eefe1b Upgrade to Spring Security 5.6.4 
Closes gh-31012
 2022-05-17 09:42:13 +02:00
Stephane Nicoll a9df2a1ef7 Upgrade to Spring Kafka 2.8.6 
Closes gh-31010
 2022-05-17 09:41:36 +02:00
Stephane Nicoll f7f4831199 Upgrade to Spring Security 5.5.7 
Closes gh-31005
 2022-05-17 09:41:01 +02:00
Stephane Nicoll e9791e904d Upgrade to Spring Kafka 2.7.14 
Closes gh-31004
 2022-05-17 09:40:44 +02:00
Andy Wilkinson ef03bb8aa2 Upgrade to Spring REST Docs 3.0.0-M3 
Closes gh-30424
 2022-05-16 19:21:48 +01:00
Andy Wilkinson 43effa5c8f Upgrade to Spring AMQP 3.0.0-M3 
Closes gh-31066
 2022-05-16 17:43:10 +01:00
Andy Wilkinson 98511420ac Upgrade to Spring AMQP 2.4.5 
Closes gh-31022
 2022-05-16 17:41:24 +01:00
Andy Wilkinson 9381daddb3 Upgrade to Spring AMQP 2.4.5 
Closes gh-31009
 2022-05-16 17:40:31 +01:00
Stephane Nicoll 7829cb7e5f Start building against Spring Integration 6.0.0-M3 snapshots 
See gh-31063
 2022-05-16 16:44:22 +02:00
Stephane Nicoll b748d2cfef Start building against Spring Integration 5.5.12 snapshots 
See gh-31062
 2022-05-16 16:43:03 +02:00
Stephane Nicoll 6cc8714dec Start building against Spring Integration 5.5.12 snapshots 
See gh-31061
 2022-05-16 16:41:19 +02:00
Stephane Nicoll d479d2eeb9 Start building against Spring Integration 5.5.12 snapshots 
See gh-31060
 2022-05-16 16:39:57 +02:00
Stephane Nicoll cbf415b850 Merge branch '2.7.x' 2022-05-16 16:37:31 +02:00
Stephane Nicoll 285378e4f9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31059
 2022-05-16 16:37:21 +02:00
Stephane Nicoll 18129a5938 Merge branch '2.5.x' into 2.6.x 
Closes gh-31058
 2022-05-16 16:37:07 +02:00
Stephane Nicoll 22d187a38c Polish "Add missing configuration properties for Statsd" 
See gh-30898
 2022-05-16 16:33:22 +02:00
izeye d90ef6afb3 Add missing configuration properties for Statsd 
See gh-30898
 2022-05-16 16:28:50 +02:00
izeye 3c7465cb35 Polish OtlpPropertiesConfigAdapterTests 
See gh-31057
 2022-05-16 16:09:34 +02:00
Andy Wilkinson 5ffe4598f5 Revert "Upgrade to Solr 9.0.0" 
It requires Jetty 9.4.x but we're using Jetty 11.

This reverts commit b2bd3dee5e.

See gh-31054
 2022-05-16 13:00:51 +01:00
Andy Wilkinson 08768b5821 Join compile classpath using system-dependent separator 
See gh-30525
 2022-05-16 12:37:30 +01:00
Andy Wilkinson 6c01b341fa Prohibit upgrades to exceed Jakarta EE 9 baseline 
Closes gh-31045
 2022-05-16 12:32:54 +01:00
Andy Wilkinson 2419b14a45 Upgrade to Flyway 8.5.11 
Closes gh-31056
 2022-05-16 12:32:03 +01:00
Andy Wilkinson b2bd3dee5e Upgrade to Solr 9.0.0 
Closes gh-31054
 2022-05-16 12:20:34 +01:00
Andy Wilkinson 1b8ecf1957 Upgrade to Reactor Bom 2022.0.0-M2 
Closes gh-31053
 2022-05-16 12:03:23 +01:00
Andy Wilkinson c1f2ff7e12 Upgrade to MSSQL JDBC 10.2.1.jre17 
Closes gh-31052
 2022-05-16 12:03:20 +01:00
Andy Wilkinson a3599d4c2b Upgrade to Kafka 3.1.1 
Closes gh-31051
 2022-05-16 12:03:16 +01:00
Andy Wilkinson 624e670528 Upgrade to Jackson Bom 2.13.3 
Closes gh-31050
 2022-05-16 12:03:14 +01:00
Andy Wilkinson 11f3a325c1 Upgrade to Hibernate 5.6.9.Final 
Closes gh-31049
 2022-05-16 12:03:12 +01:00
Andy Wilkinson 41dc012d4a Upgrade to MSSQL JDBC 10.2.1.jre8 
Closes gh-31048
 2022-05-16 11:46:05 +01:00
Andy Wilkinson 171e139bb2 Upgrade to Kafka 3.1.1 
Closes gh-31047
 2022-05-16 11:46:03 +01:00
Andy Wilkinson 85faaa8e4f Upgrade to Jackson Bom 2.13.3 
Closes gh-31046
 2022-05-16 11:46:01 +01:00
Andy Wilkinson 7a14673a00 Upgrade to Spring LDAP 2.3.8.RELEASE 
Closes gh-31044
 2022-05-16 11:39:12 +01:00
Andy Wilkinson 456d56d1bb Upgrade to Spring Framework 5.3.20 
Closes gh-31043
 2022-05-16 11:39:08 +01:00
Andy Wilkinson 8fa4103420 Upgrade to Jackson Bom 2.13.3 
Closes gh-31042
 2022-05-16 11:39:06 +01:00
Andy Wilkinson d7236934c1 Upgrade to Hibernate 5.6.9.Final 
Closes gh-31041
 2022-05-16 11:39:04 +01:00
Andy Wilkinson 23aae09936 Upgrade to Spring LDAP 2.3.8.RELEASE 
Closes gh-31039
 2022-05-16 11:32:48 +01:00
Andy Wilkinson 6c4fedb4a4 Revert "Logback 1.3 and SLF4J 2.0" 
This reverts commit f39a080a0e that was
pushed prematurely.
 2022-05-13 16:23:48 +01:00
Andy Wilkinson 3892b56a32 Adapt to breaking changes in Couchbase Driver 3.3 
See gh-31031
 2022-05-13 15:34:11 +01:00
Andy Wilkinson f39a080a0e Logback 1.3 and SLF4J 2.0 2022-05-13 14:48:20 +01:00
Andy Wilkinson 4cb9d95b49 Use ProcessHandler to get the process ID 
Closes gh-28178
 2022-05-13 14:35:41 +01:00
Andy Wilkinson a7a4e97b3c Upgrade to Spring Data 2021.2.0 
Closes gh-31015
 2022-05-13 14:14:02 +01:00
Andy Wilkinson 7b48a63a86 Upgrade to Couchbase Client 3.3.0 
Closes gh-31031
 2022-05-13 14:12:56 +01:00
Andy Wilkinson a46a0882f4 Upgrade to Spring LDAP 2.4.0 
Closes gh-31017
 2022-05-13 14:08:43 +01:00
Andy Wilkinson b20bafb8a1 Upgrade to Spring LDAP 3.0.0-M2 
Closes gh-31029
 2022-05-13 14:03:01 +01:00
Andy Wilkinson 3f296196d0 Upgrade to Spring HATEOAS 2.0.0-M3 
Closes gh-30632
 2022-05-13 14:03:01 +01:00
Andy Wilkinson 985f3be198 Upgrade to Spring Data 2022.0-M4 
Closes gh-30634
 2022-05-13 14:03:01 +01:00
Andy Wilkinson 4864b9802e Upgrade to Spring Framework 6.0.0-M4 
Closes gh-30624
 2022-05-13 14:03:01 +01:00
Andy Wilkinson 80971b960d Upgrade to Micrometer Tracing 1.0.0-M5 
Closes gh-31028
 2022-05-13 14:03:00 +01:00
Andy Wilkinson c1db8733ab Merge branch '2.7.x' 2022-05-13 14:02:36 +01:00
SOBUE Sho 8e2a39bdd5 Import OkHttp's bom rather than declaring modules individually 
See gh-31027
 2022-05-13 13:41:31 +01:00
Andy Wilkinson cf4597d22a Start building against Spring AMQP 2.4.5 snapshots 
See gh-31022
 2022-05-12 18:05:31 +01:00
Andy Wilkinson bb40582b30 Start building against Spring Session Bom 2021.2.0 snapshots 
See gh-31021
 2022-05-12 18:05:31 +01:00
Andy Wilkinson dbaca5faac Start building against Spring Batch 4.3.6 snapshots 
See gh-31020
 2022-05-12 18:05:31 +01:00
Andy Wilkinson 2b85bb5ca1 Start building against Spring Security 5.7.0 snapshots 
See gh-31019
 2022-05-12 18:05:31 +01:00
Andy Wilkinson a24e8b95f8 Start building against Spring Kafka 2.8.6 snapshots 
See gh-31018
 2022-05-12 18:05:30 +01:00
Andy Wilkinson f7b55ecec3 Start building against Spring LDAP 2.4.0 snapshots 
See gh-31017
 2022-05-12 18:05:30 +01:00
Andy Wilkinson 22d5ce2380 Upgrade to Spring HATEOAS 1.5.0 
Closes gh-31016
 2022-05-12 18:05:30 +01:00
Andy Wilkinson a5b7bb518e Start building against Spring Data Bom 2021.2.0 snapshots 
See gh-31015
 2022-05-12 18:05:29 +01:00
Andy Wilkinson 9ec1978bb1 Upgrade to Spring Framework 5.3.20 
Closes gh-31014
 2022-05-12 17:47:15 +01:00
Andy Wilkinson 4d5b008b9a Upgrade to Micrometer 1.9.0 
Closes gh-31013
 2022-05-12 17:46:29 +01:00
Andy Wilkinson 6fa103bdb2 Start building against Spring Security 5.6.4 snapshots 
See gh-31012
 2022-05-12 16:59:07 +01:00
Andy Wilkinson 40f82e9aa5 Start building against Spring Batch 4.3.6 snapshots 
See gh-31011
 2022-05-12 16:59:07 +01:00
Andy Wilkinson 2a9d9698ac Start building against Spring Kafka 2.8.6 snapshots 
See gh-31010
 2022-05-12 16:59:06 +01:00
Andy Wilkinson 9137d777ab Start building against Spring AMQP 2.4.5 snapshots 
See gh-31009
 2022-05-12 16:59:00 +01:00
Andy Wilkinson 76bc188e9f Upgrade to Spring HATEOAS 1.4.3 
Closes gh-31008
 2022-05-12 16:49:57 +01:00
Andy Wilkinson 2413e80105 Upgrade to Micrometer 1.8.6 
Closes gh-31007
 2022-05-12 16:49:09 +01:00
Andy Wilkinson 5ce39254de Start building against Spring Security 5.5.7 snapshots 
See gh-31005
 2022-05-12 15:46:11 +01:00
Andy Wilkinson 0233cf01d3 Start building against Spring Kafka 2.7.14 snapshots 
See gh-31004
 2022-05-12 15:45:02 +01:00
Andy Wilkinson 30bdd76bbe Start building against Spring Batch 4.3.6 snapshots 
See gh-31003
 2022-05-12 15:44:27 +01:00
Andy Wilkinson 6286fd7917 Upgrade to Spring Framework 5.3.20 
Closes gh-31002
 2022-05-12 15:43:46 +01:00
Andy Wilkinson e38cd9f928 Upgrade to Micrometer 1.7.12 
Closes gh-31001
 2022-05-12 15:43:04 +01:00
Andy Wilkinson ed705cc78e Polish 2022-05-12 12:59:12 +01:00
Andy Wilkinson a496cb9298 Merge branch '2.7.x' 2022-05-12 12:52:46 +01:00
Andy Wilkinson 2669f8c343 Merge branch '2.6.x' into 2.7.x 
Closes gh-30997
 2022-05-12 12:47:52 +01:00
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x 
Closes gh-30996
 2022-05-12 12:47:38 +01:00
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics" 
See gh-30879
 2022-05-12 12:36:50 +01:00
Denis Washington 09db7e4001 Extend documentation on Datadog metrics 
- Document that an application key must be set to publish metadata
  for the exported metrics.

- Point out that using a non-US Datadog site (e.g., EU) requires
  changing the `uri` property.

See gh-30879
 2022-05-12 12:36:18 +01:00
Andy Wilkinson c12171f2e9 Merge branch '2.7.x' 2022-05-12 12:28:20 +01:00
Andy Wilkinson 09b9a1f729 Merge branch '2.6.x' into 2.7.x 
Closes gh-30995
 2022-05-12 12:28:07 +01:00
Andy Wilkinson 9f46cf88c8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30994
 2022-05-12 12:27:52 +01:00
颜虎 309e54bd21 Fix link to Upgrading From 1.x in multi-page documentation 
See gh-30890
 2022-05-12 12:15:30 +01:00
Andy Wilkinson 48c948973d Polish 2022-05-12 12:12:22 +01:00
Andy Wilkinson d0e55643b1 Polish 
Closes gh-30993
 2022-05-12 12:11:51 +01:00
Andy Wilkinson 1fd9c4d82c Polish 
Closes gh-30992
 2022-05-12 12:10:52 +01:00
izeye 624c41c80e Polish 
See gh-30862
 2022-05-12 12:07:12 +01:00
Andy Wilkinson c2a3652709 Merge branch '2.7.x' 2022-05-12 11:53:46 +01:00
Andy Wilkinson 7e88daf288 Update messages for APIs deprecated in 2.7 
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.

See gh-30903
 2022-05-12 11:12:09 +01:00
Andy Wilkinson 26405528c6 Polish "Add resourceAttributes property to OtlpProperties" 
See gh-30984
 2022-05-12 10:12:53 +01:00
Eddú Meléndez e3fce8439a Add resourceAttributes property to OtlpProperties 
See gh-30984
 2022-05-12 09:37:56 +01:00
Andy Wilkinson 06756802fb Upgrade to Micrometer 1.10.0-M2 
Closes gh-30800
 2022-05-12 09:36:59 +01:00
Andy Wilkinson f6225fe98b Register reflection hints for Logback 
Closes gh-30975
 2022-05-11 12:34:47 +01:00
Andy Wilkinson 0ce6e437a9 Align AotGenerateTests with spring.factories changes in Framework 2022-05-11 11:08:26 +01:00
Andy Wilkinson 9a239c10b5 Align tests with changes to SpringApplicationHooks 2022-05-11 11:08:26 +01:00
Andy Wilkinson 2744649892 Update started log message as app may not be running on a JVM 
Closes gh-30974
 2022-05-11 11:08:25 +01:00
Phillip Webb c7590277a9 Polish 2022-05-10 19:03:57 -07:00
Phillip Webb 693941c2c2 Polish SpringFactories ArgumentResolver code 
Update `ArgumentResolver` setup to use one statement per line
and throw an exception if `Log` parameter types are present.
 2022-05-10 17:43:52 -07:00
Andy Wilkinson 69a88b1938 fixup! Upgrade to Couchbase Client 3.3.0 2022-05-10 19:04:11 +01:00
Andy Wilkinson 9d943417fd Upgrade to UnboundID LDAPSDK 6.0.5 
Closes gh-30970
 2022-05-10 18:27:03 +01:00
Andy Wilkinson fd4f0d2246 Upgrade to Selenium 4.1.4 
Closes gh-30968
 2022-05-10 18:26:58 +01:00
Andy Wilkinson 9c96e8cc88 Upgrade to REST Assured 5.0.1 
Closes gh-30967
 2022-05-10 18:26:55 +01:00
Andy Wilkinson 4d8d73dcc7 Upgrade to Reactor Bom 2020.0.19 
Closes gh-30966
 2022-05-10 18:26:52 +01:00
Andy Wilkinson bbe8f3bab5 Upgrade to Postgresql 42.3.5 
Closes gh-30965
 2022-05-10 18:26:49 +01:00
Andy Wilkinson 354797ad63 Upgrade to OpenTelemetry 1.14.0 
Closes gh-30964
 2022-05-10 18:26:47 +01:00
Andy Wilkinson 5d1c4448be Upgrade to MSSQL JDBC 10.2.0.jre17 
Closes gh-30963
 2022-05-10 18:26:44 +01:00
Andy Wilkinson d7ed58bced Upgrade to Netty 4.1.77.Final 
Closes gh-30962
 2022-05-10 18:21:42 +01:00
Andy Wilkinson de6d05526f Upgrade to MySQL 8.0.29 
Closes gh-30961
 2022-05-10 18:21:40 +01:00
Andy Wilkinson da29e1a96a Upgrade to Mockito 4.5.1 
Closes gh-30960
 2022-05-10 18:21:37 +01:00
Andy Wilkinson df2dc837c7 Upgrade to Maven AntRun Plugin 3.1.0 
Closes gh-30959
 2022-05-10 18:21:34 +01:00
Andy Wilkinson abf122d29a Upgrade to Liquibase 4.10.0 
Closes gh-30958
 2022-05-10 18:21:32 +01:00
Andy Wilkinson c4014433c4 Upgrade to jOOQ 3.16.6 
Closes gh-30957
 2022-05-10 18:21:29 +01:00
Andy Wilkinson bf197bce71 Upgrade to Jetty 11.0.9 
Closes gh-30956
 2022-05-10 18:21:27 +01:00
Andy Wilkinson 3f7dcb83fc Upgrade to JBoss Logging 3.5.0.Final 
Closes gh-30955
 2022-05-10 18:21:24 +01:00
Andy Wilkinson 33c1675db9 Upgrade to Jaybird 4.0.6.java8 
Closes gh-30954
 2022-05-10 18:21:22 +01:00
Andy Wilkinson 3f107d0835 Upgrade to Jakarta Transaction 2.0.1 
Closes gh-30953
 2022-05-10 18:21:19 +01:00
Andy Wilkinson ed5808707a Upgrade to HtmlUnit 2.61.0 
Closes gh-30952
 2022-05-10 18:21:17 +01:00
Andy Wilkinson d57c3af904 Upgrade to Groovy 4.0.2 
Closes gh-30951
 2022-05-10 18:21:14 +01:00
Andy Wilkinson 63232b9bc2 Upgrade to Flyway 8.5.10 
Closes gh-30950
 2022-05-10 18:21:12 +01:00
Andy Wilkinson 61fbee6f3d Upgrade to Elasticsearch 7.17.3 
Closes gh-30949
 2022-05-10 18:21:09 +01:00
Andy Wilkinson 94c6a7b25f Upgrade to Couchbase Client 3.3.0 
Closes gh-30948
 2022-05-10 18:21:07 +01:00
Andy Wilkinson a37c202b7d Upgrade to Cassandra Driver 4.14.1 
Closes gh-30947
 2022-05-10 18:21:04 +01:00
Andy Wilkinson e1300c62f2 Upgrade to Caffeine 3.1.0 
Closes gh-30946
 2022-05-10 18:21:01 +01:00
Andy Wilkinson cc1a89b934 Upgrade to Byte Buddy 1.12.10 
Closes gh-30945
 2022-05-10 18:20:58 +01:00
Andy Wilkinson 7ac88a3b11 Upgrade to AspectJ 1.9.9.1 
Closes gh-30944
 2022-05-10 18:20:55 +01:00
Andy Wilkinson b464995471 Upgrade to Artemis 2.22.0 
Closes gh-30943
 2022-05-10 18:20:52 +01:00
Andy Wilkinson bef675ded0 Upgrade to UnboundID LDAPSDK 6.0.5 
Closes gh-30942
 2022-05-10 17:33:29 +01:00
Andy Wilkinson 125773ef70 Upgrade to Selenium 4.1.4 
Closes gh-30941
 2022-05-10 17:33:26 +01:00
Andy Wilkinson dafda8b044 Upgrade to Reactor Bom 2020.0.19 
Closes gh-30940
 2022-05-10 17:33:22 +01:00
Andy Wilkinson caf2903588 Upgrade to Postgresql 42.3.5 
Closes gh-30939
 2022-05-10 17:33:20 +01:00
Andy Wilkinson ec905dd86b Upgrade to Netty 4.1.77.Final 
Closes gh-30938
 2022-05-10 17:33:17 +01:00
Andy Wilkinson a57012c015 Upgrade to MySQL 8.0.29 
Closes gh-30937
 2022-05-10 17:33:15 +01:00
Andy Wilkinson 3eb41ea85c Upgrade to Mockito 4.5.1 
Closes gh-30936
 2022-05-10 17:33:12 +01:00
Andy Wilkinson b0ec81674d Upgrade to Johnzon 1.2.18 
Closes gh-30935
 2022-05-10 17:33:10 +01:00
Andy Wilkinson 694f35d554 Upgrade to Jaybird 4.0.6.java8 
Closes gh-30934
 2022-05-10 17:33:07 +01:00
Andy Wilkinson 86b98d23e8 Upgrade to Infinispan 13.0.10.Final 
Closes gh-30933
 2022-05-10 17:33:04 +01:00
Andy Wilkinson 03e5626689 Upgrade to Flyway 8.5.10 
Closes gh-30932
 2022-05-10 17:33:02 +01:00
Andy Wilkinson 27bd2f7527 Upgrade to Elasticsearch 7.17.3 
Closes gh-30931
 2022-05-10 17:32:59 +01:00
Andy Wilkinson 0b2a25fbc8 Upgrade to Couchbase Client 3.2.7 
Closes gh-30930
 2022-05-10 17:32:56 +01:00
Andy Wilkinson 232e904a54 Upgrade to Cassandra Driver 4.14.1 
Closes gh-30929
 2022-05-10 17:32:54 +01:00
Andy Wilkinson 6bd48c6bf9 Upgrade to Byte Buddy 1.12.10 
Closes gh-30928
 2022-05-10 17:32:51 +01:00
Andy Wilkinson 3fb6260f68 Upgrade to ActiveMQ 5.16.5 
Closes gh-30927
 2022-05-10 17:32:49 +01:00
Andy Wilkinson ba8274b3cb Upgrade to Reactor Bom 2020.0.19 
Closes gh-30926
 2022-05-10 16:58:47 +01:00
Andy Wilkinson b61661ff5f Upgrade to Postgresql 42.3.5 
Closes gh-30925
 2022-05-10 16:58:44 +01:00
Andy Wilkinson 295b3b0fbd Upgrade to Netty tcNative 2.0.52.Final 
Closes gh-30924
 2022-05-10 16:58:42 +01:00
Andy Wilkinson 4c197e4175 Upgrade to Netty 4.1.77.Final 
Closes gh-30923
 2022-05-10 16:58:39 +01:00
Andy Wilkinson 1f4f64553c Upgrade to MySQL 8.0.29 
Closes gh-30922
 2022-05-10 16:58:36 +01:00
Andy Wilkinson bf63740a9a Upgrade to Johnzon 1.2.18 
Closes gh-30921
 2022-05-10 16:58:33 +01:00
Andy Wilkinson 0a3169aab7 Upgrade to Jaybird 4.0.6.java8 
Closes gh-30920
 2022-05-10 16:58:31 +01:00
Andy Wilkinson d0bdb2a061 Upgrade to Hazelcast 4.2.5 
Closes gh-30919
 2022-05-10 16:58:28 +01:00
Andy Wilkinson 23ad3e1952 Upgrade to Couchbase Client 3.2.7 
Closes gh-30918
 2022-05-10 16:58:26 +01:00
Andy Wilkinson 68b54f194f Upgrade to ActiveMQ 5.16.5 
Closes gh-30917
 2022-05-10 16:58:23 +01:00
Andy Wilkinson cffdee72ca Polish 2022-05-10 16:13:16 +01:00
Andy Wilkinson 566ed68403 Contribute reflection hints for configuration property binding 
Closes gh-30916

Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
 2022-05-10 15:31:15 +01:00
Andy Wilkinson 4c17b4c865 Switch BackgroundPreinitializer to implementing Ordered 
Closes gh-30905
 2022-05-10 15:22:38 +01:00
Andy Wilkinson dbf0bcca63 Avoid reflection when Tomcat's configuring Context's ClassLoader 
Closes gh-30904
 2022-05-10 15:22:37 +01:00
Andy Wilkinson 87e78691c4 Use AOT-generated initialization when running in a native image 
Closes gh-30915
 2022-05-10 15:22:16 +01:00
Andy Wilkinson c91b787078 Uses non-AnnotationConfig contexts when using AOT-generated init 
Closes gh-30914
 2022-05-10 15:19:29 +01:00
Andy Wilkinson 432741f06e Upgrade to Reactor Bom 2020.0.19 
Closes gh-30913
 2022-05-10 14:37:43 +01:00
Andy Wilkinson 7157ca4fe5 Upgrade to Netty tcNative 2.0.52.Final 
Closes gh-30912
 2022-05-10 14:37:41 +01:00
Andy Wilkinson 25c320be51 Upgrade to Netty 4.1.77.Final 
Closes gh-30911
 2022-05-10 14:37:39 +01:00
Andy Wilkinson 0713f772ba Upgrade to MySQL 8.0.29 
Closes gh-30910
 2022-05-10 14:37:36 +01:00
Andy Wilkinson 84b1b67e6d Upgrade to Johnzon 1.2.18 
Closes gh-30909
 2022-05-10 14:37:34 +01:00
Andy Wilkinson 705ce88f13 Upgrade to Jaybird 4.0.6.java8 
Closes gh-30908
 2022-05-10 14:37:30 +01:00
Andy Wilkinson 0c19ae5294 Upgrade to Hazelcast 4.1.9 
Closes gh-30907
 2022-05-10 14:37:27 +01:00
Andy Wilkinson 6938df26e0 Upgrade to ActiveMQ 5.16.5 
Closes gh-30906
 2022-05-10 14:37:25 +01:00
Andy Wilkinson 770cb840c3 Use more flexible SpringFactoriesLoader 
Closes gh-30235

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
 2022-05-09 14:13:04 +01:00
Andy Wilkinson 0fbfb8ef09 Remove remnants of support for Embedded Mongo 
See gh-30863 and 7e089a6b
 2022-05-09 09:55:42 +01:00
Scott Frederick 7e089a6b81 Remove support for embedded MongoDB 
This commit removes auto-configuration and dependency management
for Flapdoodle embedded MongoDB in favor of the Spring Boot support
provided by Flapdoodle.

Closes gh-30863
 2022-05-06 17:05:36 -05:00
Andy Wilkinson 3db1715694 Merge branch '2.7.x' 2022-05-06 18:15:38 +01:00
Andy Wilkinson 833e3aec27 Merge branch '2.6.x' into 2.7.x 
Closes gh-30887
 2022-05-06 18:15:20 +01:00
Andy Wilkinson d10addffe3 Merge branch '2.5.x' into 2.6.x 
Closes gh-30886
 2022-05-06 18:15:01 +01:00
christophejan a1f3d68ead Improve debug logging of requests to actuator endpoints on WebFlux 
See gh-30880
 2022-05-06 17:49:27 +01:00
Andy Wilkinson 3980c5af48 Polish "Use Log4jBridgeHandler to route JUL-based logging into Log4j 2" 
See gh-30003
 2022-05-06 15:05:16 +01:00
Piotr P. Karwasz 728e27d193 Use Log4jBridgeHandler to route JUL-based logging into Log4j 2 
Since version 2.15.0 `log4j-jul` contains a `Log4jBridgeHandler`,
that forwards JUL to Log4j 2.x and synchronizes the logger levels of
the two frameworks.

This commmit adds support for the `Log4jBridgeHandler` and sets it as
the bridge handler for the Log4j 2.x stack, replacing the existing
JUL to SLF4J bridge that was used previously.

See gh-30003
 2022-05-06 15:05:08 +01:00
Andy Wilkinson 4a030343d3 Merge branch '2.7.x' 2022-05-06 11:40:11 +01:00
Andy Wilkinson c61cd7761e Merge branch '2.6.x' into 2.7.x 
Closes gh-30883
 2022-05-06 11:37:30 +01:00
Andy Wilkinson 5258cd2814 Merge branch '2.5.x' into 2.6.x 
Closes gh-30882
 2022-05-06 11:29:22 +01:00
Andy Wilkinson 0e7c3547dd Prohibit usage of Micrometer nullability annotations 
Closes gh-30881
 2022-05-06 11:29:08 +01:00
Andy Wilkinson 293a3c9ec1 Fix arguments passed to AOT processing in Gradle plugin 
See gh-30527
 2022-05-06 11:18:01 +01:00
Phillip Webb 8cf63a28b8 Update AOT work to latest Framework code 2022-05-05 15:19:33 -07:00
Scott Frederick 88250f92bd Adapt to changes in Spring Kafka snapshots 
See gh-30645
 2022-05-05 17:17:23 -05:00
Madhura Bhave 7a0e5a032d Delete unused test configuration files 
These files were used by the legacy ConfigFileApplicationListener tests
and are no longer needed
 2022-05-05 11:57:37 -07:00
Madhura Bhave 8d6b442dc4 Remove support for spring.profiles 
Closes gh-22523
 2022-05-05 11:57:37 -07:00
Andy Wilkinson 573fc34e29 Merge branch '2.7.x' 2022-05-05 10:19:32 +01:00
Andy Wilkinson 2b4f042325 Merge branch '2.6.x' into 2.7.x 
Closes gh-30874
 2022-05-05 10:19:19 +01:00
Andy Wilkinson c9571a04ab Merge branch '2.5.x' into 2.6.x 
Closes gh-30873
 2022-05-05 10:19:01 +01:00
Andy Wilkinson 6d4f0232ca Polish "Fix ConditionalOnProperty when used in an aliased composed annotation" 
See gh-30505
 2022-05-05 10:02:27 +01:00
Guirong Hu dc57ad54d5 Fix ConditionalOnProperty when used in an aliased composed annotation 
See gh-30505
 2022-05-05 10:02:15 +01:00
Scott Frederick 2369ce4195 Remove dependency management for AppEngine SDK 
Closes gh-30638
 2022-05-04 16:31:00 -05:00
Andy Wilkinson 1ee079c265 Reinstate support for pooled-jms as it is now JMS 3.0 compatible 
Closes gh-30865
 2022-05-04 18:04:02 +01:00
Brian Clozel 5352c441e1 Do not use application/graphql as default MIME type 
As seen in spring-projects/spring-graphql#375, Spring Boot should also
use "application/json" as the default MIME type but remain compatible
with "application/graphql+json" still if clients POST content with this
type or explicitly accept it.

Closes gh-30860
 2022-05-04 13:05:45 +02:00
Brian Clozel 31cabba828 Switch to Spring for GraphQL 1.0.0-SNAPSHOT 
See gh-30858
 2022-05-04 13:05:45 +02:00
Brian Clozel ecd7c21493 Upgrade to GraphQL Java 18.1 
Closes gh-30859
 2022-05-04 13:05:45 +02:00
Andy Wilkinson 0e00fafe38 Polish "Provide callback mechanism for customizing validation configuration" 
See gh-29429
 2022-05-04 11:45:39 +01:00
当智才让 76a1c6bcaa Provide callback mechanism for customizing validation configuration 
See gh-29429
 2022-05-04 11:36:59 +01:00
Andy Wilkinson d36b63dae6 Polish "Add a configuration property for Kafka's async acks" 
See gh-30776
 2022-05-04 10:44:38 +01:00
TheCK 52c3f1c7ef Add a configuration property for Kafka's async acks 
See gh-30776
 2022-05-04 10:37:22 +01:00
Andy Wilkinson 23f89f0d1e Switch to a same minor version upgrade policy 
Closes gh-30857
 2022-05-04 10:34:50 +01:00
Andy Wilkinson b4e42109d0 Merge branch '2.7.x' 2022-05-04 10:34:15 +01:00
Andy Wilkinson d819aba0b9 Upgrade to Selenium 4.1.3 
Closes gh-30730
 2022-05-04 10:04:36 +01:00
Andy Wilkinson c596afd03a Upgrade to Selenium HtmlUnit 3.61.0 
Closes gh-30855
 2022-05-04 10:04:11 +01:00
Scott Frederick 7dd8dfc197 Handle zero-offset timezone in logging test 
See gh-28654
 2022-05-03 17:48:09 -05:00
Scott Frederick 7f395941c7 Add timezone offset to default logging date format patterns 
Closes gh-28654
 2022-05-03 17:09:27 -05:00
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30851
 2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x 
Closes gh-30850
 2022-05-03 15:14:00 +01:00
Andy Wilkinson 4fd2e0c916 Polish "Fix typos" 
See gh-30773
 2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos 
See gh-30773
 2022-05-03 14:09:37 +01:00
Andy Wilkinson f35e5195ad Merge branch '2.7.x' 2022-05-03 13:55:20 +01:00
Andy Wilkinson 8782e4122c Merge branch '2.6.x' into 2.7.x 
Closes gh-30848
 2022-05-03 13:55:09 +01:00
Andy Wilkinson b20a8bd778 Merge branch '2.5.x' into 2.6.x 
Closes gh-30847
 2022-05-03 13:54:59 +01:00
Andy Wilkinson 798d61fcf0 Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe" 
See gh-30844
 2022-05-03 13:54:13 +01:00
dugenkui03 aeaad006cd Make event handling in ClassPathFileSystemWatcherTests thread-safe 
See gh-30844
 2022-05-03 13:52:55 +01:00
Andy Wilkinson 138e165d5f Merge branch '2.7.x' 2022-05-03 13:52:01 +01:00
Andy Wilkinson 8044df277b Merge branch '2.6.x' into 2.7.x 
Closes gh-30846
 2022-05-03 13:51:49 +01:00
Andy Wilkinson a8b5a1c688 Merge branch '2.5.x' into 2.6.x 
Closes gh-30845
 2022-05-03 13:51:38 +01:00
Andy Wilkinson 026b9e2efe Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe" 
See gh-30705
 2022-05-03 13:49:12 +01:00
dugenkui03 c8d1dfebab Make event handling in JobExecutionExitCodeGenerator thread-safe 
See gh-30705
 2022-05-03 13:48:15 +01:00
Eddú Meléndez f7a7e8cb89 Add auto-configuration for OtlpMeterRegistry 
See gh-30825
 2022-05-03 13:18:07 +01:00
izeye 9f2114170e Apply key values rename consistently 
See gh-30837
 2022-05-03 12:29:52 +01:00
izeye 77c3b6c899 Polish Micrometer tracing changes 
See gh-30833
 2022-05-03 11:39:31 +01:00
Andy Wilkinson 7a98627127 Polish "Fix property in defaultDatabaseIsSet test" 
See gh-30778
 2022-05-03 11:36:12 +01:00
izeye d50b0e4602 Fix property in defaultDatabaseIsSet test 
See gh-30778
 2022-05-03 11:35:44 +01:00
Andy Wilkinson 2cebbe10ce Merge branch '2.7.x' 2022-05-03 11:29:38 +01:00
Andy Wilkinson 61cd05f74b Merge branch '2.6.x' into 2.7.x 
Closes gh-30842
 2022-05-03 11:29:03 +01:00
Andy Wilkinson f1b5f36af8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30841
 2022-05-03 11:28:53 +01:00
Andy Wilkinson f8e5a534a6 Polish "Polish InfluxMetricsExportAutoConfiguration" 
See gh-30824
 2022-05-03 09:50:51 +01:00
Eddú Meléndez b0d5364efa Polish InfluxMetricsExportAutoConfiguration 
See gh-30824
 2022-05-03 09:50:06 +01:00
Andy Wilkinson fcf45d5c22 Add support for invoking AOT to the Gradle plugin 
Closes gh-30527
 2022-04-29 14:32:23 +01:00
Eddú Meléndez 6a65aa4a23 Auto-configure Micrometer's JvmInfoMetrics 
See gh-30832
 2022-04-29 11:04:50 +01:00
Andy Wilkinson 80470f0b26 Add native profile to spring-boot-starter-parent 
Closes gh-30830

Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
 2022-04-28 14:27:56 +01:00
Stephane Nicoll e81c6337c6 Add support for invoking AOT to the Maven Plugin 
This commit adds an `aot-generate` goal to the Maven Plugin that
triggers AOT generation on the application. The new goal shares a
number of properties with the existing `run` goal and uses the same
algorithm to detect the main class to use.

Closes gh-30525
 2022-04-28 13:48:52 +01:00
Andy Wilkinson 096420cc4c Generate native image config data in recommended location 
Closes gh-30827
 2022-04-28 13:38:28 +01:00
Andy Wilkinson 97589d0465 Introduce Hook-based AOT processing 
Closes gh-30555

Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
 2022-04-27 11:26:01 +01:00
Andy Wilkinson 9cd17f8a14 Introduce hooking of SpringApplication 
Closes gh-30538
 2022-04-27 10:53:54 +01:00
Andy Wilkinson 6d15e6d4ef Adapt to breaking API changes in latest Micrometer snapshots 
See gh-30800
 2022-04-27 10:33:25 +01:00
Andy Wilkinson fb16907c0e Fix resolution Batch's Oracle schema location 
Closes gh-30564
 2022-04-25 19:38:37 +01:00
Andy Wilkinson 60e389ea38 Merge branch '2.7.x' 2022-04-25 19:37:48 +01:00
Andy Wilkinson facbc7b47b Merge branch '2.6.x' into 2.7.x 
Closes gh-30795
 2022-04-25 19:31:47 +01:00
Andy Wilkinson bf94ea24d3 Improve testing of Batch schema resolution 
Closes gh-30794
 2022-04-25 19:30:59 +01:00
Andy Wilkinson eacd8c04a5 Merge branch '2.7.x' 2022-04-25 15:03:52 +01:00
Andy Wilkinson 56690a7eb9 Merge branch '2.6.x' into 2.7.x 
Closes gh-30791
 2022-04-25 15:03:32 +01:00
Andy Wilkinson 409ec48e2a Merge branch '2.5.x' into 2.6.x 
Closes gh-30790
 2022-04-25 15:00:51 +01:00
Andy Wilkinson 193ef9a06d Package META-INF/services/ files beneath BOOT-INF/classes/ 
Closes gh-30413
 2022-04-25 14:32:47 +01:00
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party 
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
 2022-04-25 15:26:38 +02:00
Andy Wilkinson 3987deccde Merge branch '2.7.x' 2022-04-25 14:11:40 +01:00
Andy Wilkinson 3c5cea47d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30789
 2022-04-25 14:11:21 +01:00
Andy Wilkinson 3f23c08268 Merge branch '2.5.x' into 2.6.x 
Closes gh-30788
 2022-04-25 14:11:08 +01:00
Andy Wilkinson ce788657ce Improve diagnostics for map binding failures 
Closes gh-30281
 2022-04-25 13:50:09 +01:00
Moritz Halbritter afdb651b04 Auto-configure TracingObservationHandler for HTTP server and clients 
- Auto-configures HttpServerTracingObservationHandler and
  HttpClientTracingObservationHandler into Micrometer Tracing. Both
  handlers are ordered before the DefaultTracingObservationHandler,
  which is only used as a fallback.
- The HttpServerHandler and HttpClientHandler implementations are
  auto-configured in the Brave and OpenTelemetry auto-configurations.

Closes gh-30784
 2022-04-25 14:33:09 +02:00
Andy Wilkinson 331ec1ab21 Merge branch '2.7.x' 2022-04-25 13:02:34 +01:00
Misagh Moayyed d9ed4fbc2e Adjust mustache property name to match replacement 
`spring.mustache.cache` should be replaced with
`spring.mustache.servlet.cache`, to avoid configuration warnings
on startup when using the properties migrator.

See gh-30774
 2022-04-25 12:42:38 +01:00
Andy Wilkinson 4e193dc574 Merge branch '2.7.x' 2022-04-25 12:36:44 +01:00
Andy Wilkinson d0c9d5aabc Merge branch '2.6.x' into 2.7.x 
Closes gh-30787
 2022-04-25 12:36:30 +01:00
Andy Wilkinson 5c3be7c61e Merge branch '2.5.x' into 2.6.x 
Closes gh-30786
 2022-04-25 12:36:14 +01:00
Andy Wilkinson ffe0ec6d4d Use SearchStrategy in MethodValidationExcludeFilter byAnnotation 
Closes gh-30631
 2022-04-25 12:35:41 +01:00
Moritz Halbritter 35efc23deb Merge branch '2.7.x' 2022-04-25 09:15:39 +02:00
Moritz Halbritter e8b7843fe9 Merge branch '2.6.x' into 2.7.x 
Closes gh-30782
 2022-04-25 09:13:52 +02:00
Moritz Halbritter 63eb6b6ad9 Merge branch '2.5.x' into 2.6.x 
Closes gh-30781
 2022-04-25 09:13:34 +02:00
Moritz Halbritter 9b8b87009c Document support for Java 18 
Closes gh-30548
 2022-04-25 09:13:07 +02:00
Stephane Nicoll 4a3299a60f Merge branch '2.7.x' 2022-04-21 13:33:03 +02:00
Stephane Nicoll ce683c3b6f Upgrade to Maven Javadoc Plugin 3.4.0 
Closes gh-30770
 2022-04-21 13:15:20 +02:00
Stephane Nicoll 7ecb51ee39 Upgrade to Janino 3.1.7 
Closes gh-30768
 2022-04-21 13:15:14 +02:00
Stephane Nicoll 7f3922e2fa Upgrade to Infinispan 13.0.9.Final 
Closes gh-30767
 2022-04-21 13:15:12 +02:00
Stephane Nicoll d0e237be10 Upgrade to Flyway 8.5.9 
Closes gh-30766
 2022-04-21 13:15:10 +02:00
Stephane Nicoll f76371be76 Merge branch '2.7.x' 2022-04-21 09:29:02 +02:00
Stephane Nicoll b3e3581271 Polish "Add auto-configuration to Kafka Retry Topics" 
See gh-29812
 2022-04-21 09:26:42 +02:00
tomazfernandes bf46d7244a Add auto-configuration to Kafka Retry Topics 
See gh-29812
 2022-04-21 08:32:04 +02:00
Stephane Nicoll 020e3617af Merge branch '2.7.x' 2022-04-21 08:30:13 +02:00
Madhura Bhave 7a659e4e12 Polish "Add support for aud claim in resource server" 
See gh-29084
 2022-04-21 08:09:08 +02:00
Mushtaq Ahmed ee65627f4c Add support for aud claim in resource server 
See gh-29084
 2022-04-21 08:09:08 +02:00
Stephane Nicoll 58b069a994 Merge branch '2.7.x' 2022-04-21 08:08:34 +02:00
Stephane Nicoll 9025d1d250 Fix deprecation warning 
See gh-28851
 2022-04-21 08:08:20 +02:00
Phillip Webb cd4ee99756 Merge branch '2.7.x' 2022-04-20 16:30:15 -07:00
Phillip Webb 504c4a33db Merge branch '2.6.x' into 2.7.x 
Closes gh-30763
 2022-04-20 16:29:58 -07:00
Phillip Webb c5d650a807 Merge branch '2.5.x' into 2.6.x 
Closes gh-30762
 2022-04-20 16:29:24 -07:00
Phillip Webb 77edb27a07 Fix package tangle caused by ApplicationContextFactory 
Fix package tangle by changing `ApplicationContextFactory.DEFAULT` to
use `spring.factories` to discover implementations rather than needing
direct access to our own `ApplicationContext` classes.

Closes gh-30272
 2022-04-20 16:28:46 -07:00
Phillip Webb c7374fd415 Update copyright year of changed files 2022-04-20 15:30:20 -07:00
Phillip Webb 7a6ca8ce25 Merge branch '2.7.x' 2022-04-20 15:30:01 -07:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Madhura Bhave dfd0e7b948 Merge branch '2.7.x' into main 2022-04-20 12:57:21 -07:00
Madhura Bhave 71acc90da8 Simplify SecurityAutoConfiguration 
Closes gh-28851
 2022-04-20 12:50:10 -07:00
Stephane Nicoll a1099e61e6 Upgrade to Spring Session 2021.2.0-RC1 
Closes gh-30611
 2022-04-20 18:36:49 +02:00
Stephane Nicoll 3731655b34 Upgrade to Spring Session 2021.1.3 
Closes gh-30603
 2022-04-20 18:35:52 +02:00
Stephane Nicoll 5c4b63be11 Upgrade to Spring Session 2021.0.6 
Closes gh-30595
 2022-04-20 18:34:05 +02:00
Stephane Nicoll 7f8e2d89b0 Merge branch '2.7.x' 2022-04-20 16:16:47 +02:00
Stefano Cordio 5729d57c50 Upgrade to Mockito 4.5.0 
This commit also switches to use the Mockito bom.

See gh-30759
 2022-04-20 15:56:05 +02:00
Brian Clozel ee274abe48 Upgrade to Spring for GraphQL 1.0.0-RC1 
Closes gh-30463
 2022-04-20 10:56:51 +02:00
Stephane Nicoll c5953623fa Upgrade to Postgresql 42.3.4 
Closes gh-30758
 2022-04-20 09:26:42 +02:00
Stephane Nicoll d69ca284b9 Upgrade to Lombok 1.18.24 
Closes gh-30757
 2022-04-20 09:26:39 +02:00
Stephane Nicoll bda0fbf22f Upgrade to Janino 3.1.7 
Closes gh-30755
 2022-04-20 09:26:34 +02:00
Moritz Halbritter bb4bccde6c Remove deprecated 'identityprovider' property 
Closes gh-30751
 2022-04-20 09:11:56 +02:00
Stephane Nicoll 1bd1b2a3a4 Upgrade to Lombok 1.18.24 
Closes gh-30753
 2022-04-20 09:11:34 +02:00
Stephane Nicoll 792ebdbbf8 Upgrade to Janino 3.1.7 
Closes gh-30752
 2022-04-20 09:11:32 +02:00
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party' 
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
 2022-04-20 08:25:58 +02:00
Stephane Nicoll 1698faffee Merge branch '2.7.x' 2022-04-20 08:24:32 +02:00
Stephane Nicoll 38c2a5c14b Merge branch '2.6.x' into 2.7.x 
Closes gh-30750
 2022-04-20 08:24:21 +02:00
Stephane Nicoll d049ae8703 Merge branch '2.5.x' into 2.6.x 
Closes gh-30749
 2022-04-20 08:24:07 +02:00
rfigueroa ae267bfab2 Use eclipse-temurin in docker samples 
As AdoptOpenJDK moved to the Eclipse Foundation, this commit updates the
docs to reflect that in docker file samples.

See gh-30748
 2022-04-20 08:21:55 +02:00
Stephane Nicoll b3c1a8b2da Upgrade to Spring Integration 5.5.11 
Closes gh-30704
 2022-04-20 08:09:55 +02:00
Stephane Nicoll 245c6c97ec Upgrade to Spring Integration 5.5.11 
Closes gh-30702
 2022-04-20 08:09:00 +02:00
Stephane Nicoll 1e32f3b718 Upgrade to Spring Integration 5.5.11 
Closes gh-30700
 2022-04-20 08:08:19 +02:00
Stephane Nicoll 424acf1334 Merge branch '2.7.x' 2022-04-20 08:07:06 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1 
Closes gh-30610
 2022-04-20 08:05:15 +02:00
Stephane Nicoll 47bea5c8e2 Upgrade to MongoDB 4.6.0 
Closes gh-30746
 2022-04-20 08:05:15 +02:00
Brian Clozel 6bf6bde6bb Add new auto-configurations to imports 
See gh-30453
 2022-04-19 20:52:35 +02:00
Brian Clozel d137f92f66 Adapt to latest Spring for GraphQL changes 
This commit adapts to changes done in spring-projects/spring-graphql#312
 2022-04-19 16:58:06 +02:00
Stephane Nicoll ba38441a0a Upgrade to Spring Data 2021.1.4 
Closes gh-30602
 2022-04-19 15:36:54 +02:00
Stephane Nicoll 9f7a9546bd Upgrade to Spring Data 2021.0.11 
Closes gh-30594
 2022-04-19 15:35:29 +02:00
Stephane Nicoll 263efe2b86 Merge branch '2.7.x' 2022-04-19 13:10:54 +02:00
Stephane Nicoll 558a80cfa3 Upgrade to Jackson 2.13.2.1 
Closes gh-30741
 2022-04-19 13:10:05 +02:00
Stephane Nicoll 6c706328d8 Upgrade to Spring HATEOAS 1.5.0-RC1 
Closes gh-30745
 2022-04-19 13:10:05 +02:00
Stephane Nicoll 00b175bb7f Upgrade to Jackson 2.13.2.1 
Closes gh-30743
 2022-04-19 13:04:03 +02:00
Stephane Nicoll d3a70c3793 Upgrade to Spring HATEOAS 1.4.2 
Closes gh-30744
 2022-04-19 13:03:38 +02:00
Brian Clozel 2dc2e5ab11 Auto-configure RSocketGraphQlClient 
This commit contributes a `RSocketGraphQlClient.Builder` component to
the context, pre-configured with the `RSocketStrategies`, a customized
`RSocketConnector` and the expected data MIME type.

See gh-30453
 2022-04-19 10:53:15 +02:00
Stephane Nicoll eb2f840446 Merge branch '2.7.x' 2022-04-19 09:55:40 +02:00
Stephane Nicoll 9c3cce58ea Merge branch '2.6.x' into 2.7.x 
Closes gh-30740
 2022-04-19 09:55:29 +02:00
Stephane Nicoll 57b3cb5135 Polish "Fix incorrect link in kafka.adoc" 
See gh-30674
 2022-04-19 09:52:56 +02:00
Chanhyeong Cho 577f0add0c Fix incorrect link in kafka.adoc 
See gh-30674
 2022-04-19 09:48:03 +02:00
Stephane Nicoll b41d4d4f2a Merge branch '2.7.x' 2022-04-19 09:45:42 +02:00
Stephane Nicoll 69045e4eaf Polish "Allow disabling the Dynatrace instruments" 
See gh-30637
 2022-04-19 09:43:05 +02:00
Georg Pirklbauer 7a05faf079 Allow disabling the Dynatrace instruments 
Since Micrometer version 1.9.0, the Dynatrace registry uses specialized
instruments by default, which ensures data is exported in an optimal
format. By using this new flag, users can switch back to the previous
behavior, which uses the original instruments from Micrometer.

See gh-30637
 2022-04-19 09:38:37 +02:00
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 2022-04-19 09:37:08 +02:00
Stephane Nicoll 61915aa4d5 Update copyright year of changed files 
See gh-30695
 2022-04-19 09:36:38 +02:00
izeye ed412af138 Polish 
See gh-30695
 2022-04-19 09:34:28 +02:00
Stephane Nicoll 2ce840986f Merge branch '2.7.x' 2022-04-19 09:25:41 +02:00
Stephane Nicoll 4c5cb772ff Polish 
See gh-30674
 2022-04-19 09:25:02 +02:00
Stephane Nicoll 6e846384df Merge branch '2.7.x' 2022-04-19 09:11:31 +02:00
Stephane Nicoll d7b23edf8b Merge branch '2.6.x' into 2.7.x 
Closes gh-30739
 2022-04-19 09:11:23 +02:00
Stephane Nicoll 91625207b2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30738
 2022-04-19 09:11:01 +02:00
Stephane Nicoll 1fa4701d6d Polish "Validate overrides against CharsetMapperDefault.properties" 
See gh-30692
 2022-04-19 09:03:54 +02:00
Guirong Hu 407ae3b04f Validate overrides against CharsetMapperDefault.properties 
See gh-30692
 2022-04-19 09:03:40 +02:00
dreis2211 a63e730136 Remove unused private methods 
See gh-30655
 2022-04-19 08:45:44 +02:00
Stephane Nicoll 3175fb8302 Merge branch '2.7.x' 2022-04-19 08:44:43 +02:00
Stephane Nicoll a0707124f2 Remove unused method 
See gh-30655
 2022-04-19 08:42:00 +02:00
Stephane Nicoll 58aa58c0d3 Upgrade to Spring Kafka 2.8.5 
Closes gh-30608
 2022-04-19 08:15:25 +02:00
Stephane Nicoll 8bdc4f4395 Upgrade to Spring AMQP 2.4.4 
Closes gh-30703
 2022-04-19 08:14:57 +02:00
Stephane Nicoll b098bf9283 Upgrade to Spring Security 2.7.0-RC1 
Closes gh-30609
 2022-04-19 08:14:36 +02:00
Stephane Nicoll d4f9420bef Upgrade to Spring LDAP 2.4.0-RC1 
Closes gh-30606
 2022-04-19 08:14:03 +02:00
Stephane Nicoll 52b54f434b Upgrade to Spring Kafka 2.8.5 
Closes gh-30600
 2022-04-19 08:09:57 +02:00
Stephane Nicoll 3438934a9e Upgrade to Spring AMQP 2.4.4 
Closes gh-30701
 2022-04-19 08:07:17 +02:00
Stephane Nicoll 1c6ef781cd Upgrade to Spring Security 5.6.3 
Closes gh-30601
 2022-04-19 08:06:53 +02:00
Stephane Nicoll 376aa199ba Upgrade to Spring LDAP 2.3.7 
Closes gh-30598
 2022-04-19 08:03:54 +02:00
Stephane Nicoll 0ad6ae9a03 Upgrade to Spring Kafka 2.7.13 
Closes gh-30592
 2022-04-19 07:59:57 +02:00
Stephane Nicoll 1c08f503ba Upgrade to Spring AMQP 2.3.16 
Closes gh-30699
 2022-04-19 07:59:18 +02:00
Stephane Nicoll c25a2eb274 Upgrade to Spring Security 5.5.6 
Closes gh-30593
 2022-04-19 07:57:19 +02:00
Stephane Nicoll 07ba83be5d Upgrade to Spring LDAP 2.3.7 
Closes gh-30589
 2022-04-19 07:56:56 +02:00
Stephane Nicoll 5d6885e9a3 Merge branch '2.7.x' 2022-04-18 13:29:39 +02:00
Stephane Nicoll 24f2880c7a Upgrade to Spring Retry 1.3.3 
Closes gh-30607
 2022-04-18 13:10:13 +02:00
Stephane Nicoll e09840ae65 Upgrade to Undertow 2.2.17.Final 
Closes gh-30732
 2022-04-18 13:10:13 +02:00
Stephane Nicoll 6b007448d4 Upgrade to RSocket 1.1.2 
Closes gh-30729
 2022-04-18 10:54:40 +02:00
Stephane Nicoll cbf2da995b Upgrade to Postgresql 42.3.4 
Closes gh-30728
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 390b97cb42 Upgrade to Pooled JMS 1.2.4 
Closes gh-30727
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 5921eda8b9 Upgrade to Netty 4.1.76.Final 
Closes gh-30726
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 53c38f7601 Upgrade to MIMEPull 1.10.0 
Closes gh-30725
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 5737a92fa1 Upgrade to Maven Shade Plugin 3.3.0 
Closes gh-30724
 2022-04-18 10:54:38 +02:00
Stephane Nicoll 1b167bfdf2 Upgrade to Maven Clean Plugin 3.2.0 
Closes gh-30723
 2022-04-18 10:54:38 +02:00
Stephane Nicoll 313b203540 Upgrade to MariaDB 3.0.4 
Closes gh-30722
 2022-04-18 10:54:38 +02:00
Stephane Nicoll bb394b2294 Upgrade to Lombok 1.18.24 
Closes gh-30721
 2022-04-18 10:54:38 +02:00
Stephane Nicoll fe966bc24e Upgrade to Liquibase 4.9.1 
Closes gh-30720
 2022-04-18 10:54:38 +02:00
Stephane Nicoll 3ed0716646 Upgrade to Kotlin Coroutines 1.6.1 
Closes gh-30719
 2022-04-18 10:54:37 +02:00
Stephane Nicoll 8655cfd3f1 Upgrade to Jetty 9.4.46.v20220331 
Closes gh-30717
 2022-04-18 10:54:37 +02:00
Stephane Nicoll 95123c93b4 Upgrade to Jackson Bom 2.13.2.20220328 
Closes gh-30716
 2022-04-18 10:54:36 +02:00
Stephane Nicoll eb6603c265 Upgrade to Hibernate 5.6.8.Final 
Closes gh-30715
 2022-04-18 10:49:21 +02:00
Stephane Nicoll 79a3d098e6 Upgrade to H2 2.1.212 
Closes gh-30714
 2022-04-18 10:49:19 +02:00
Stephane Nicoll 634ba0ace1 Upgrade to Flyway 8.5.8 
Closes gh-30713
 2022-04-18 10:49:17 +02:00
Stephane Nicoll e918a4d21d Upgrade to Elasticsearch 7.17.2 
Closes gh-30712
 2022-04-18 10:49:15 +02:00
Stephane Nicoll 4c3a7670e2 Upgrade to Byte Buddy 1.12.9 
Closes gh-30711
 2022-04-18 10:49:12 +02:00
Stephane Nicoll 1dd859da10 Upgrade to AppEngine SDK 1.9.96 
Closes gh-30710
 2022-04-18 10:49:10 +02:00
Stephane Nicoll e46f92b278 Upgrade to Micrometer 1.9.0-RC1 
Closes gh-30605
 2022-04-17 19:24:32 +02:00
Stephane Nicoll 6cbb4a4f33 Merge branch '2.7.x' 2022-04-16 09:07:59 +02:00
Stephane Nicoll 73b98d0cb8 Polish 2022-04-16 09:07:46 +02:00
Stephane Nicoll 7a6bb7208d Start building against Spring Integration 5.5.11 snapshots 
See gh-30704
 2022-04-16 09:06:23 +02:00
Stephane Nicoll f340a90ade Start building against Spring AMQP 2.4.4 snapshots 
See gh-30703
 2022-04-16 09:05:45 +02:00
Stephane Nicoll 140c14cefc Start building against Spring Integration 5.5.11 snapshots 
See gh-30702
 2022-04-16 08:56:33 +02:00
Stephane Nicoll aed4bc5696 Start building against Spring AMQP 2.4.4 snapshots 
See gh-30701
 2022-04-16 08:55:39 +02:00
Stephane Nicoll 8e1e909444 Start building against Spring Integration 5.5.11 snapshots 
See gh-30700
 2022-04-16 08:54:14 +02:00
Stephane Nicoll 5cdcdbdcf1 Start building against Spring AMQP 2.3.16 snapshots 
See gh-30699
 2022-04-16 08:53:18 +02:00
Stephane Nicoll 8c68b33240 Polish "Start building against Micrometer 1.10.0 snapshots" 
See gh-30693
 2022-04-15 15:59:24 +02:00
Marcin Grzejszczak 87991d93a5 Start building against Micrometer 1.10.0 snapshots 
See gh-30693
 2022-04-15 14:16:16 +02:00
Stephane Nicoll af7c20491b Upgrade to Undertow 2.2.17.Final 
Closes gh-30690
 2022-04-15 08:29:10 +02:00
Stephane Nicoll 7d8128adc8 Upgrade to RSocket 1.1.2 
Closes gh-30688
 2022-04-15 08:29:05 +02:00
Stephane Nicoll aa76f451e3 Upgrade to Pooled JMS 1.2.4 
Closes gh-30687
 2022-04-15 08:29:03 +02:00
Stephane Nicoll 5d430b4267 Upgrade to Netty 4.1.76.Final 
Closes gh-30686
 2022-04-15 08:29:01 +02:00
Stephane Nicoll 9a89e83be4 Upgrade to Jetty 9.4.46.v20220331 
Closes gh-30684
 2022-04-15 08:28:57 +02:00
Stephane Nicoll aa629c8510 Upgrade to Hibernate 5.6.8.Final 
Closes gh-30683
 2022-04-15 08:28:54 +02:00
Stephane Nicoll be5c168e8c Upgrade to AppEngine SDK 1.9.96 
Closes gh-30682
 2022-04-15 08:28:52 +02:00
Stephane Nicoll 1be434e0a3 Upgrade to Spring Retry 1.3.3 
Closes gh-30599
 2022-04-15 08:26:19 +02:00
Stephane Nicoll 9299329256 Upgrade to Spring Retry 1.3.3 
Closes gh-30590
 2022-04-15 08:25:42 +02:00
Stephane Nicoll be2b70452e Upgrade to Undertow 2.2.17.Final 
Closes gh-30681
 2022-04-15 07:49:53 +02:00
Stephane Nicoll ded1810bd1 Upgrade to RSocket 1.1.2 
Closes gh-30679
 2022-04-15 07:49:49 +02:00
Stephane Nicoll a913e4fdd5 Upgrade to Pooled JMS 1.2.4 
Closes gh-30678
 2022-04-15 07:49:46 +02:00
Stephane Nicoll 0389bc84db Upgrade to Netty 4.1.76.Final 
Closes gh-30677
 2022-04-15 07:49:44 +02:00
Stephane Nicoll a245028b05 Upgrade to Jetty 9.4.46.v20220331 
Closes gh-30676
 2022-04-15 07:49:42 +02:00
Stephane Nicoll c6473bb5b5 Upgrade to AppEngine SDK 1.9.96 
Closes gh-30675
 2022-04-15 07:49:40 +02:00
Stephane Nicoll 2fd04d9711 Upgrade to Micrometer 1.8.5 
Closes gh-30597
 2022-04-15 07:46:20 +02:00
Stephane Nicoll 5661c18d26 Upgrade to Micrometer 1.7.11 
Closes gh-30588
 2022-04-15 07:45:32 +02:00
Andy Wilkinson 4a401bfa16 Adapt to breaking changes in Spring Session Data Redis 
See gh-30639
 2022-04-14 20:41:20 +01:00
Brian Clozel eddb2b16ff Configure RSocket server support in GraphQL 
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
 2022-04-14 19:54:40 +02:00
Andy Wilkinson 7e97073994 Merge branch '2.7.x' 2022-04-14 18:38:26 +01:00
Andy Wilkinson 74494f1d37 Merge branch '2.6.x' into 2.7.x 
Closes gh-30671
 2022-04-14 18:38:09 +01:00
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x 
Closes gh-30670
 2022-04-14 18:37:55 +01:00
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully 
Closes gh-30654
 2022-04-14 18:36:15 +01:00
Andy Wilkinson 9658661bd4 Merge branch '2.7.x' 2022-04-14 14:53:40 +01:00
Andy Wilkinson 7789a18d23 Merge branch '2.6.x' into 2.7.x 
Closes gh-30667
 2022-04-14 14:51:22 +01:00
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x 
Closes gh-30666
 2022-04-14 14:51:09 +01:00
Andy Wilkinson 8f1b8622ba Ensure that webEnvironment=NONE creates non-web context 
Previously, if spring.main.web-application-type was configured in
application.properties to servlet or reactive, setting
webEnvironment=NONE on @SpringBootTest would not work correctly and
a servlet or reactive web application context would be created
based on the value of spring.main.web-application-type.

This commit updates the test context bootstapper to set
spring.main.web-application-type to none when webEnvironment has been
set to none. This is done in the merged context configuration's
property source properties which are applied to the environment in a
high-precedence test property source that will override configuration
in application.properties.

Closes gh-29695
 2022-04-14 14:44:30 +01:00
Andy Wilkinson 21ccd58f67 Merge branch '2.7.x' 2022-04-14 13:29:08 +01:00
Andy Wilkinson 4545d39603 Merge branch '2.6.x' into 2.7.x 
Closes gh-30665
 2022-04-14 13:28:39 +01:00
Andy Wilkinson 887fa4a13f Merge branch '2.5.x' into 2.6.x 
Closes gh-30664
 2022-04-14 12:40:29 +01:00
Andy Wilkinson c8de843d85 Honor final web application type when creating context in tests 
Previously, SpringBootContextLoader would configure its
SpringApplication with an ApplicationContextFactory that ignores
the WebApplicationType with which its called and instead returns a
hard-coded type of context based on the type of the
MergedContextConfiguration. This hard-coding would result in the
wrong type of context being used if a subsequent change was made to
the application's WebApplicationType, for example due to binding of
the spring.main.web-application-type configuration property.

This commit updates SpringBootContextLoader to configure
SpringApplication with an ApplicationContextFactory that takes the
WebApplicationType with which it is called into consideration.

Fixes gh-29170
 2022-04-14 12:26:07 +01:00
Stephane Nicoll c654638654 Polish "Add link to @Order annotation" 
See gh-30572
 2022-04-14 10:39:22 +02:00
prd c72f3d79af Add link to @Order annotation 
See gh-30572
 2022-04-14 10:36:33 +02:00
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry 
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
 2022-04-14 09:14:44 +02:00
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 2022-04-13 16:29:00 -05:00
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates 
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
 2022-04-13 16:28:04 -05:00
Scott Frederick 9aff0a998f Merge branch '2.7.x' 2022-04-13 16:09:48 -05:00
Scott Frederick f032690d0a Add support for CNB platform API 0.9 
Fixes gh-30566
 2022-04-13 16:09:32 -05:00
Andy Wilkinson 3d5086a42d Merge branch '2.7.x' 2022-04-13 19:24:47 +01:00
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics 
Closes gh-30282
 2022-04-13 19:24:06 +01:00
Andy Wilkinson d1cd95eb13 Merge branch '2.7.x' 2022-04-13 18:13:29 +01:00
Andy Wilkinson 5e76671859 Remove remaining code that was deprecated in 2.5 
Closes gh-30442
 2022-04-13 18:09:39 +01:00
Andy Wilkinson c37857c6c6 Merge branch '2.7.x' 2022-04-13 14:20:27 +01:00
Andy Wilkinson 631b876165 Deprecate DatabaseDriver.GAE 
Closes gh-29984
 2022-04-13 14:19:09 +01:00
Moritz Halbritter 2c42be9392 Merge branch '2.7.x' 2022-04-13 15:00:27 +02:00
Moritz Halbritter 6c04241ad6 Merge branch '2.6.x' into 2.7.x 
Closes gh-30652
 2022-04-13 15:00:14 +02:00
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x 
Closes gh-30651
 2022-04-13 14:59:59 +02:00
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties 
Closes gh-30649
 2022-04-13 14:59:48 +02:00
Stephane Nicoll b5713ba5e7 Upgrade to Spring Framework 5.3.19 
Closes gh-30518
 2022-04-13 13:20:01 +02:00
Stephane Nicoll 138192230c Upgrade to Spring Framework 5.3.19 
Closes gh-30517
 2022-04-13 13:19:06 +02:00
Stephane Nicoll 08954fce85 Upgrade to Spring Framework 5.3.19 
Closes gh-30516
 2022-04-13 13:11:13 +02:00
Andy Wilkinson fe46392144 Merge branch '2.7.x' 2022-04-13 10:04:02 +01:00
Andy Wilkinson 27a936e466 Fix Elastic health indicator without RestHighLevelClient 
Closes gh-28496
 2022-04-13 10:02:47 +01:00
Stephane Nicoll 62069ead48 Merge branch '2.7.x' 2022-04-13 09:18:54 +02:00
Stephane Nicoll 00a481e4e9 Upgrade to Reactor 2020.0.18 
Closes gh-30604
 2022-04-13 09:17:43 +02:00
Andy Wilkinson 258ae5e153 Merge branch '2.7.x' 2022-04-12 21:58:41 +01:00
Andy Wilkinson 562627fb42 Deprecate auto-configuration for RestHighLevelClient 
Closes gh-28598
 2022-04-12 21:58:08 +01:00
Andy Wilkinson 4e054385a4 Polish 2022-04-12 21:58:08 +01:00
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration" 
See gh-28496
 2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration 
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
 2022-04-12 21:13:05 +01:00
Brian Clozel e0ae1d3501 Use auto-configured JSON codecs for GraphQlTester 
Prior to this commit, the auto-configured
`ExecutionGraphQlServiceTester` would use a default Jackson
`ObjectMapper` provided by the builder for its JSON
serialization/deserialization needs. Other testers, like the
`HttpGraphQlTester` are based on auto-configured components which
already use the auto-configured `ObjectMapper`.

This commit uses the newly introduced `encoder(Encoder<?>)` and
`decoder(Decoder<?>)` builder methods to configure custom JSON codecs
honoring the application configuration.

Closes gh-30646
 2022-04-12 21:28:21 +02:00
rstoyanchev b91bfc7067 Update WebMVC GraphQL autoconfig to the latest 
As a result of changes for
https://github.com/spring-projects/spring-graphql/issues/342,
GraphQlWebSocketHandler now exposes a method to create the
WebSocketHttpRequestHandler, pre-configured with a context propagating
HandshakeInterceptor. This commit updates the autoconfig to use it.

Closes gh-30641
 2022-04-12 20:17:29 +02:00
Brian Clozel e57bbdfcf5 Polish 
See gh-29666
 2022-04-12 18:41:01 +02:00
Brian Clozel 3485070aee Switch to Spring Kafka SNAPSHOTs 
See gh-30645
 2022-04-12 17:40:01 +02:00
Brian Clozel be88b62302 Switch to Spring Session SNAPSHOTs 
See gh-30639
 2022-04-12 17:22:46 +02:00
Brian Clozel f2e295802d Switch to Spring Security SNAPSHOTs 
See gh-30633
 2022-04-12 17:22:16 +02:00
Brian Clozel 305a0c5c96 Switch to Spring HATEOAS SNAPSHOTs 
See gh-30632
 2022-04-12 17:03:34 +02:00
Brian Clozel 2651068c17 Switch to Spring Data SNAPSHOTs 
See gh-30634
 2022-04-12 17:02:51 +02:00
Brian Clozel 77b7f2f1ce Switch to Spring Framework SNAPSHOTs 
See gh-30624
 2022-04-12 17:02:03 +02:00
Stephane Nicoll 368ba019de Upgrade to Reactor 2020.0.18 
Closes gh-30596
 2022-04-12 16:46:31 +02:00
Stephane Nicoll a1fe2b8857 Upgrade to Reactor 2020.0.18 
Closes gh-30587
 2022-04-12 16:26:56 +02:00
Andy Wilkinson 44211564a4 Adapt to latest changes in Micrometer 2.0 snapshots 
See gh-29666
 2022-04-12 15:25:43 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots 
See gh-30605
 2022-04-12 11:47:34 +01:00
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test 
Closes gh-29589
 2022-04-12 08:48:43 +01:00
Andy Wilkinson 8d18e5fc0e Merge branch '2.7.x' 2022-04-11 15:23:10 +01:00
Andy Wilkinson b8b903527a Update tag keys to comply with Micrometer recommendations 
Closes gh-30536
 2022-04-11 15:21:35 +01:00
Stephane Nicoll 6f62e1c743 Start building against Spring Session 2021.2.0-RC1 snapshots 
See gh-30611
 2022-04-09 17:27:48 +02:00
Stephane Nicoll 2ed65b3035 Start building against Spring Security 2.7.0-RC1 snapshots 
See gh-30609
 2022-04-09 17:27:48 +02:00
Stephane Nicoll 8658765eb4 Start building against Spring Kafka 2.8.5 snapshots 
See gh-30608
 2022-04-09 17:27:48 +02:00
Stephane Nicoll 726c4e9ced Start building against Spring Retry 1.3.3 snapshots 
See gh-30607
 2022-04-09 17:15:20 +02:00
Stephane Nicoll 65efc75c6f Start building against Spring LDAP 2.4.0-RC1 snapshots 
See gh-30606
 2022-04-09 17:15:20 +02:00
Stephane Nicoll 454f409a14 Start building against Micrometer 1.9.0-RC1 snapshots 
See gh-30605
 2022-04-09 17:15:20 +02:00
Stephane Nicoll 719fb625ef Start building against Reactor 2020.0.18 snapshots 
See gh-30604
 2022-04-09 17:15:20 +02:00
Stephane Nicoll 2ded2bf71a Adapt to latest change in Spring Framework snapshots 2022-04-09 17:10:48 +02:00
Stephane Nicoll 2a36d3dd14 Start building against Spring Session 2021.1.3 snapshots 
See gh-30603
 2022-04-09 10:01:02 +02:00
Stephane Nicoll c080a29feb Start building against Spring Security 5.6.3 snapshots 
See gh-30601
 2022-04-09 10:01:02 +02:00
Stephane Nicoll e42eeca549 Start building against Spring Kafka 2.8.5 snapshots 
See gh-30600
 2022-04-09 10:01:01 +02:00
Stephane Nicoll 65e2c20ca8 Start building against Spring Data 2021.1.4 snapshots 
See gh-30602
 2022-04-09 10:01:01 +02:00
Stephane Nicoll 33994a9f54 Start building against Spring Retry 1.3.3 snapshots 
See gh-30599
 2022-04-09 10:01:01 +02:00
Stephane Nicoll 9eb6f714b5 Start building against Spring LDAP 2.3.7 snapshots 
See gh-30598
 2022-04-09 10:01:01 +02:00
Stephane Nicoll ccdd49040f Start building against Micrometer 1.8.5 snapshots 
See gh-30597
 2022-04-09 10:01:01 +02:00
Stephane Nicoll e735bb2fcd Start building against Spring Framework 5.3.19 snapshots 
See gh-30517
 2022-04-09 10:01:00 +02:00
Stephane Nicoll 13cd3d2ce0 Start building against Reactor 2020.0.18 snapshots 
See gh-30596
 2022-04-09 09:35:22 +02:00
Andy Wilkinson 6d865c2646 Merge branch '2.7.x' 2022-04-08 21:02:35 +01:00
Andy Wilkinson 7534e50d0b Merge branch '2.6.x' into 2.7.x 
Closes gh-30621
 2022-04-08 21:02:16 +01:00
Andy Wilkinson 7e44745816 Merge branch '2.5.x' into 2.6.x 
Closes gh-30620
 2022-04-08 21:01:48 +01:00
Andy Wilkinson b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests" 
See gh-30514
 2022-04-08 20:56:20 +01:00
Vivek Gupta 5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests 
See gh-30514
 2022-04-08 20:55:54 +01:00
Andy Wilkinson 136189c86f Merge branch '2.7.x' 2022-04-08 14:05:07 +01:00
Andy Wilkinson f209d77cb2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30617
 2022-04-08 14:04:43 +01:00
Andy Wilkinson d6731805b6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30616
 2022-04-08 14:03:58 +01:00
Andy Wilkinson 70fa7e5e93 Make properties field final 
Closes gh-30615
 2022-04-08 14:03:29 +01:00
Stephane Nicoll 6aa8436c6d Start building against Spring Session 2021.0.6 snapshots 
See gh-30595
 2022-04-08 10:09:30 +02:00
Stephane Nicoll 455c37645d Start building against Spring Security 5.5.6 snapshots 
See gh-30593
 2022-04-08 10:09:00 +02:00
Stephane Nicoll bb8be2425a Start building against Spring Kafka 2.7.13 snapshots 
See gh-30592
 2022-04-08 10:08:35 +02:00
Stephane Nicoll aab8fc80ec Start building against Spring Data 2021.0.11 snapshots 
See gh-30594
 2022-04-08 10:08:10 +02:00
Stephane Nicoll 0080e45172 Start building against Spring Retry 1.3.3 snapshots 
See gh-30590
 2022-04-08 10:07:41 +02:00
Stephane Nicoll 5b05304c2c Start building against Spring LDAP 2.3.7 snapshots 
See gh-30589
 2022-04-08 10:07:13 +02:00
Stephane Nicoll ea6e87adef Start building against Micrometer 1.7.11 snapshots 
See gh-30588
 2022-04-08 10:06:34 +02:00
Stephane Nicoll e70451635c Start building against Spring Framework 5.3.19 snapshots 
See gh-30516
 2022-04-08 10:06:02 +02:00
Stephane Nicoll 9dda20cfab Start building against Reactor 2020.0.18 snapshots 
See gh-30587
 2022-04-08 09:48:36 +02:00
Scott Frederick 0dd9493dc1 Merge branch '2.7.x' 2022-04-07 17:12:14 -05:00
Scott Frederick 90aee8ef2f Polish FailureAnalyzers deprecation message 
Fixes gh-30578
 2022-04-07 17:10:45 -05:00
Scott Frederick d67dcf16cd Migrate FailureAnalyzers to constructor injection 
All `FailureAnalyzer` implementations should use constructor
injection for `BeanFactory` and `Environment` instead of implementing
`BeanFactoryAware` or `EnvironmentAware` interfaces.

Fixes gh-30585
 2022-04-07 16:58:59 -05:00
Andy Wilkinson 2dcc1ea257 Merge branch '2.7.x' 2022-04-07 20:44:38 +01:00
Andy Wilkinson 612e4114d2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30584
 2022-04-07 20:44:29 +01:00
Andy Wilkinson f027faafa2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30583
 2022-04-07 20:44:10 +01:00
izeye 618d113fad Move Jetty 9 specific exclusions to correct dependency 
See gh-30522
 2022-04-07 20:41:42 +01:00
Andy Wilkinson 41213a8c4e Merge branch '2.7.x' 2022-04-07 20:33:30 +01:00
Andy Wilkinson 5a26e936de Merge branch '2.6.x' into 2.7.x 
Closes gh-30582
 2022-04-07 20:31:46 +01:00
Andy Wilkinson a2c08f9f99 Merge branch '2.5.x' into 2.6.x 
Closes gh-30581
 2022-04-07 20:31:22 +01:00
Andy Wilkinson 35154a96f3 Polish "Fix NPE in configprops endpoint" 
See gh-30068
 2022-04-07 19:44:06 +01:00
qxo a1fe05f40b Fix NPE in configprops endpoint 
This works around spring-projects/spring-framework#28298. The bug
means that when a @Configuration class is annotated with
@ConfigurationProperties any bean defined by a static @Bean method
is considered to be annotated with @ConfigurationProperties.

See gh-30068
 2022-04-07 19:40:29 +01:00
Andy Wilkinson fac2430dff Merge branch 'gh-30358' 2022-04-07 19:17:27 +01:00
Andy Wilkinson dbc59052ba Polish "Add failure analyzer for missing web factory bean" 
See gh-30358
 2022-04-07 18:55:04 +01:00
Guirong Hu dfafccaba5 Add failure analyzer for missing web factory bean 
See gh-30358
 2022-04-07 18:50:50 +01:00
Andy Wilkinson 95c8d7f79d Merge branch '2.7.x' 2022-04-07 18:50:13 +01:00
Andy Wilkinson febea4711e Make Reactive and ServletWebServerFactory extend marker interface 
Closes gh-30579
 2022-04-07 18:20:38 +01:00
Andy Wilkinson e6b485b317 Merge branch '2.7.x' 2022-04-07 16:31:58 +01:00
Andy Wilkinson 8727361221 Polish "Order ExitCodeGenerators and return first non-zero exit code" 
See gh-30457
 2022-04-07 16:31:19 +01:00
dugenkui 6718b10fa9 Order ExitCodeGenerators and return first non-zero exit code 
See gh-30457
 2022-04-07 16:30:09 +01:00
Stephane Nicoll 3e67ffd233 Merge branch '2.7.x' 2022-04-07 09:18:26 +02:00