Commit Graph

17820 Commits

Author SHA1 Message Date
tudormarc e313aa5f6c Document that Lombok must be configured before our annotation processor
See gh-31190
2022-06-13 14:33:21 +02:00
Stephane Nicoll 365d96daf6 Merge branch '2.7.x'
Closes gh-31355
2022-06-13 14:29:40 +02:00
Stephane Nicoll 72dd51ae0b Merge branch '2.6.x' into 2.7.x
Closes gh-31354
2022-06-13 14:29:18 +02:00
Moritz Halbritter 42e8f65b80 Move @ConditionalOnClass from methods to inner classes
Closes gh-31353
2022-06-13 13:41:58 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples
See gh-31143
2022-06-13 13:15:56 +02:00
Stephane Nicoll b3601643af Add hints for web resource default locations
Closes gh-31278
2022-06-13 11:09:48 +02:00
Stephane Nicoll 063e56dbff Polish 2022-06-13 09:44:02 +02:00
Phillip Webb 380776a9b2 Merge branch '2.7.x' 2022-06-10 16:13:50 -07:00
Phillip Webb 7bf82b5349 Merge branch '2.6.x' into 2.7.x 2022-06-10 16:13:35 -07:00
Phillip Webb 63fdd729f5 Refine conversion service type check
Update fix to account for primitive types.

See gh-28592
2022-06-10 16:12:38 -07:00
Phillip Webb 8937924508 Merge branch '2.7.x'
Closes gh-31342
2022-06-10 14:30:28 -07:00
Phillip Webb beb1c15219 Merge branch '2.6.x' into 2.7.x
Closes gh-31341
2022-06-10 14:30:02 -07:00
Phillip Webb 31b0264d94 Ensure conversion service actually converts to the correct type
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.

Fixes gh-28592
2022-06-10 14:29:25 -07:00
Phillip Webb cb745b4259 Merge branch '2.7.x'
Closes gh-31340
2022-06-10 12:43:38 -07:00
Anthony Vanelverdinghe ed1e7382ab Fix typo in ImportCandidates javadoc
See gh-31277
2022-06-10 12:42:43 -07:00
Phillip Webb ff4e6f7639 Merge branch '2.7.x'
Closes gh-31339
2022-06-10 12:38:48 -07:00
Phillip Webb 0f7fa84214 Polish 'Update Dynatrace documentation for Micrometer 1.9.0'
See gh-31132
2022-06-10 12:36:45 -07:00
Georg Pirklbauer 6df9f50642 Update Dynatrace documentation for Micrometer 1.9.0
Update the actuator documentation for Dynatrace to reflect the
updates and improvements that were made in Micrometer 1.9.0.

See gh-31132
2022-06-10 12:34:05 -07:00
Andy Wilkinson 2155aac464 Upgrade to REST Assured 5.1.1
Closes gh-31333
2022-06-10 13:44:22 +01:00
Andy Wilkinson 9ff411e6af Upgrade to Mockito 4.6.1
Closes gh-31332
2022-06-10 13:44:21 +01:00
Andy Wilkinson d4be484d27 Upgrade to AssertJ 3.23.1
Closes gh-31331
2022-06-10 13:44:21 +01:00
Moritz Halbritter 3799170c4d Disable metrics and tracing in web endpoints integration tests
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter 486b3073ce Add tracing in integration tests paragraph to the documentation
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter 8fab9f290c Back off tracing auto-configurations if tracing is disabled
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter b019ff6102 Wavefront sender configuration is no longer an auto-configuration
It's now a regular configuration class which is imported from
the Wavefront metrics and tracing auto-configurations
2022-06-10 14:25:12 +02:00
Moritz Halbritter 943e9033c0 Add @ConditionalOnEnabledTracing condition
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter b250d8a1e4 Add @AutoConfigureObservability annotation
This annotation is read by ObservabilityContextCustomizerFactory, which
then sets test properties depending on the annotation attributes.

@AutoConfigureMetrics is deprecated, to support backwards compatability
it's now meta-annotated with @AutoConfigureObservability

See gh-31308
2022-06-10 14:25:12 +02:00
Andy Wilkinson 36f01eb40b Fix compilation error with Tomcat 10
There's no setter for the max header size in Tomcat 10 as it's now
inherited from the underlying HTTP 1.1 protocol. The test that
was merged forwards from 2.7.x is retained to verify that this is
the case.

See gh-31330
2022-06-10 12:40:40 +01:00
Andy Wilkinson b6ebf4a7db Merge branch '2.7.x'
Closes gh-31330
2022-06-10 11:36:11 +01:00
Andy Wilkinson 7f584a95a6 Merge branch '2.6.x' into 2.7.x
Closes gh-31329
2022-06-10 11:35:54 +01:00
Andy Wilkinson e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat
Closes gh-31322
2022-06-10 11:32:57 +01:00
Moritz Halbritter 41e9867bc4 Register all ObservationHandler, regardless which context they use
Closes #31272
2022-06-10 10:12:35 +02:00
Andy Wilkinson 29cd148e05 Start building against Spring Framework 5.3.1 snapshots
See gh-31319
2022-06-09 20:55:14 +01:00
Andy Wilkinson ed897fc922 Start building against Spring Framework 5.3.21 snapshots
See gh-31318
2022-06-09 19:37:50 +01:00
Moritz Halbritter d1647cf68c Don't back off on user-supplied SpanHandlers
Instead the auto-configuration now backs off only on ZipkinSpanHandler.

Closes gh-31273
2022-06-09 15:17:14 +02:00
Andy Wilkinson 91bb5aa222 Move auto-config of ReactiveElasticClient to elasticsearch pkg
Closes gh-28068
2022-06-09 11:42:09 +01:00
Phillip Webb c56783064d Support management contexts with AOT
Refactor child management configuration and add AOT generation support.
A new `ChildManagementContextInitializer` class now performs the child
context initialization and also handles AOT processing concerns.

Closes gh-31163
2022-06-08 19:24:46 -07:00
Phillip Webb a729f71cba Polish LogbackRuntimeHintsRegistrar 2022-06-08 19:24:45 -07:00
Phillip Webb e8f9386594 Add Runnable variant of TestPropertyValues.applyToSystemProperties
Closes gh-31303
2022-06-08 19:24:45 -07:00
Phillip Webb 11184aae8d Allow ApplicationContextRunner to return non-refreshed context
Add `AbstractApplicationContextRunner.prepare` which can be used to
test an `ApplicationContext` that has been prepared but not refreshed.

Closes gh-31302
2022-06-08 19:02:12 -07:00
Andy Wilkinson 46c262d3cc Merge branch '2.7.x'
Closes gh-31283
2022-06-08 19:24:49 +01:00
Andy Wilkinson 12eb7a8795 Merge branch '2.6.x' into 2.7.x
Closes gh-31282
2022-06-08 19:24:07 +01:00
Andy Wilkinson a651061e2c Remove SpringApplicationHierarchyTests
Closes gh-31281
2022-06-08 19:23:26 +01:00
Andy Wilkinson 62f40f2c38 Apply initializers and bean registrations before registering classes
Previously, classes were registered first which meant that their
conditions were evaluated before any initializers and bean
registrations were applied. This prevented the bean registrations and
initializers from affecting the outcome of the condition evaluation.

This commit inverts the ordering so that classes are not registerd,
and therefore their conditions are not evaluated, until after the
bean registrations and initializers have been applied.

Closes gh-31280
2022-06-08 18:45:54 +01:00
Stephane Nicoll e30391ca7a Use Application as target for generated code
Closes gh-31274
2022-06-08 14:51:17 +02:00
Stephane Nicoll 8413002bcb Polish
See gh-31247
2022-06-07 20:02:06 +02:00
Andy Wilkinson 869bb91c80 Polish 2022-06-07 17:52:11 +01:00
Stephane Nicoll ac16432fad Add AOT support for immutable ConfigurationProperties bean definitions
This commit introduces a dedicated AotProcessors for immutable
configuration properties beans as their bean definition use an
instance supplier that needs special handling. If such a bean definition
is detected, dedicated code is generated that replicates the behavior
of the instance supplier.

Closes gh-31247
2022-06-07 14:26:35 +02:00
Brian Clozel 3f0c14187a Register runtime hints for @ConfigurationProperties
Prior to this commit, the `@ConfigurationProperties` annotation would
not be registered for reflection hints: this means it could be missing
at runtime in a native image and would not be registered for JDK
proxying - this can fail the synthesized annotation resolution.

This commit ensures that hints are registered for this annotation if
configuration properties are declared in the bean factory.

Fixes gh-31227
2022-06-07 09:50:56 +02:00
Stephane Nicoll e2c42e4bbf Merge branch '2.7.x'
Closes gh-31262
2022-06-07 09:16:19 +02:00
Stephane Nicoll 8e550933a8 Merge branch '2.6.x' into 2.7.x
Closes gh-31261
2022-06-07 09:16:10 +02:00
Stephane Nicoll bbb5966bca Upgrade integration tests to Apache Maven 3.8.5
Closes gh-31260
2022-06-07 09:15:41 +02:00
Stephane Nicoll 1c94f835c7 Copy AOT-generated classes
Closes gh-31245
2022-06-07 08:59:57 +02:00
Andy Wilkinson 11cbb2549e Merge branch '2.7.x'
Closes gh-31256
2022-06-06 17:03:41 +01:00
Andy Wilkinson c379456722 Remove dependency management for spring-ldap-ldif-batch
The spring-ldap-ldif-batch module was removed in Spring LDAP 2.4.0 in
favor of the equivalent code that already exists in Spring Batch.
This commit aligns Boot's dependency management with this removal.

Closes gh-31254
2022-06-06 17:01:28 +01:00
Stephane Nicoll c996e4335a Fix singleton handling of ConfigurationProperties hints
Closes gh-31248
2022-06-04 12:29:45 +02:00
Stephane Nicoll cf19c176f6 Adapt test to change in Spring Framework snapshots 2022-06-03 18:11:10 +02:00
Stephane Nicoll 2a405c94a8 Add missing test
Closes gh-31249
2022-06-03 17:41:29 +02:00
Stephane Nicoll fb439b6824 Permit AOT-generated code to run on the JVM as well
This commit updates the codebase so that AOT-generated code can run on
the JVM in an opt-in fashion alongside the existing support of native
images.

When optimizations have been generated, setting the "spring.aot.enabled"
spring property (JVM or spring.properties) allows to opt-in for that
behavior on the JVM.

Closes gh-31244
2022-06-03 10:10:56 +02:00
Stephane Nicoll 0dbcb5f6d3 Start building against Spring Framework 6.0.0-M5 snapshots
See gh-31241
2022-06-02 16:19:58 +02:00
Phillip Webb 13fba65638 Polish 2022-06-01 09:53:21 -07:00
Phillip Webb 6d80723598 Relocate AotProcessingHook
Relocate `AotProcessingHook` to be an static class of `AotProcessor`.
2022-05-31 15:51:12 -07:00
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