Commit Graph

14836 Commits

Author SHA1 Message Date
Stephane Nicoll 2485c05a50 Upgrade to Glassfish JAXB 2.3.6
Closes gh-29769
2022-02-14 13:43:23 +01:00
Stephane Nicoll 6c09d4d7a1 Upgrade to Dropwizard Metrics 4.1.30
Closes gh-29768
2022-02-14 13:43:22 +01:00
Stephane Nicoll 81aec09357 Upgrade to AppEngine SDK 1.9.94
Closes gh-29767
2022-02-14 13:43:22 +01:00
Andy Wilkinson 1fd4a4d86b Remove code related to unsupported versions of Gradle
Closes gh-29681
2022-02-14 12:31:21 +00:00
Stephane Nicoll 1f01345057 Fix assertion due to toString change in Spring Framework 2022-02-13 18:01:00 +01:00
Andy Wilkinson 387795d4db Remove trailing space from media type for ots mapping
The regular expression in the new test is intended to match the
documented [1] ABNF for a media type:

    type-name = reg-name
    subtype-name = reg-name

    reg-name = 1*127reg-name-chars
    reg-name-chars = ALPHA / DIGIT / "!" /
                     "#" / "$" / "&" / "." /
                     "+" / "-" / "^" / "_"

Closes gh-29746

[1] https://datatracker.ietf.org/doc/html/rfc4288#section-4.2
2022-02-11 14:09:53 +00:00
Andy Wilkinson c3eee4ad68 Align Gradle's plugin's META-INF repackaging with Maven plugin's
Closes gh-28562
2022-02-11 13:32:52 +00:00
Andy Wilkinson c46b45a1e3 Add dependency management for liquibase-cdi
Closes gh-29676
2022-02-11 11:34:51 +00:00
Stephane Nicoll e242dc5ce8 Start building against Spring Session 2021.0.5 snapshots
See gh-29715
2022-02-11 09:29:06 +01:00
Stephane Nicoll 7afd33589f Start building against Spring Batch 4.3.5 snapshots
See gh-29714
2022-02-11 09:28:41 +01:00
Stephane Nicoll 3c3ebafa31 Start building against Spring Security 5.5.5 snapshots
See gh-29713
2022-02-11 09:28:17 +01:00
Stephane Nicoll b892bb4415 Start building against Spring Kafka 2.7.11 snapshots
See gh-29712
2022-02-11 09:27:52 +01:00
Stephane Nicoll cd94b27f2d Start building against Spring Data 2021.0.9 snapshots
See gh-29711
2022-02-11 09:27:28 +01:00
Stephane Nicoll 29d502da5b Start building against Spring LDAP 2.3.6 snapshots
See gh-29710
2022-02-11 09:27:05 +01:00
Stephane Nicoll d15149c1a3 Start building against Spring Framework 5.3.16 snapshots
See gh-29709
2022-02-11 09:26:35 +01:00
Stephane Nicoll 0f630debb3 Start building against Micrometer 1.7.9 snapshots
See gh-29708
2022-02-11 09:26:11 +01:00
Stephane Nicoll 5767e1fda1 Start building against Reactor 2020.0.16 snapshots
See gh-29707
2022-02-11 09:25:38 +01:00
Andy Wilkinson 6901f6dab2 Test our Gradle plugin against Gradle 7.4
Closes gh-29673
2022-02-10 16:57:13 +00:00
Andy Wilkinson 64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
See gh-29333
2022-02-10 15:01:57 +00:00
Guirong Hu cec69feb95 Configure ForwardedHeaderFilter with Tomcat's use relative redirects
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.

This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.

See gh-29333
2022-02-10 15:01:56 +00:00
Moritz Halbritter 096ba72a39 Add documentation for WebMvc.fn
See gh-29683
2022-02-10 13:14:34 +01:00
Moritz Halbritter 262db65a38 Ignore invalid stream types when reading log update events
See gh-29675
2022-02-09 14:03:02 +01:00
Moritz Halbritter 52d9ba58d8 Move appendix subsections under appendix section
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
2022-02-09 12:04:05 +00:00
Andy Wilkinson 48fe1513fe Test documented build script snippets when they change
Closes gh-29684
2022-02-09 11:33:40 +00:00
Mike Partridge 2e9dcdd96d Replace use of classifier with archiveClassifier
classifier has been deprecated so the docs should be using its
replacement, archiveClassifier, instead.

See gh-29611
2022-02-09 11:31:22 +00:00
Andy Wilkinson 43ca2d2cb0 Access classpath lazily to allow later changes to be picked up
Previously, the classpath of bootJar, bootWar, and bootRun was
configured directly as a FileCollection derived from the main source
set's runtime classpath. This direct configuration meant that
subsequent changes to the main source set's runtime classpath may not
have been picked up.

This commit changes the configuration of the classpath to use a
Callable. This indirection allows subsequent changes to the main
source set's runtime classpath to be picked up as long as they
occur before Gradle calls the callable.

Closes gh-29672
2022-02-08 19:21:37 +00:00
Phillip Webb 52f1799c20 Polish formatting 2022-02-05 10:15:43 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3
Closes gh-29656
2022-02-04 19:43:47 -08:00
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests
Closes gh-29648
2022-02-04 09:49:15 +01:00
Phillip Webb 2b40ce09d8 Update copyright year of changed files 2022-02-02 10:35:40 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
2022-02-01 16:24:13 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
2022-02-01 09:37:15 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover"
See gh-29438
2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover
See gh-29438
2022-01-31 16:28:28 +01:00
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests"
See gh-29522
2022-01-31 16:22:28 +01:00
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests
See gh-29522
2022-01-31 16:01:04 +01:00
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change
Closes gh-28781
2022-01-25 12:11:19 +00:00
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-01-25 08:58:42 +01:00
Scott Frederick 000cbfa2d9 Set file permissions on all created test files
Closes gh-29551
2022-01-24 16:19:20 -06:00
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain
See gh-29523
2022-01-24 09:35:44 +01:00
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2
See gh-29535
2022-01-24 09:28:53 +01:00
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5
Closes gh-29496
2022-01-20 10:29:26 +01:00
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
2022-01-19 15:53:07 -08:00
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
2022-01-19 17:26:55 +00:00
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether
Closes gh-29255
2022-01-19 13:18:05 +00:00
Stephane Nicoll 4eb458f7d8 Prevent early resolution of factory beans
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
2022-01-19 11:49:56 +01:00
Stephane Nicoll cdd479556f Upgrade to Pooled JMS 1.2.3
Closes gh-29466
2022-01-19 08:12:08 +01:00
Stephane Nicoll 849fb8e435 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29465
2022-01-19 08:12:07 +01:00
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28
Closes gh-29464
2022-01-19 08:12:06 +01:00
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8
Closes gh-29314
2022-01-19 08:09:50 +01:00
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
2022-01-18 16:14:52 -08:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
2022-01-18 20:34:08 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
2022-01-17 13:05:15 +00:00
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10
Closes gh-29313
2022-01-17 08:41:47 +01:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
2022-01-14 22:55:26 -08:00
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
2022-01-14 20:32:34 -08:00
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
2022-01-14 13:47:22 -08:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
2022-01-14 15:51:08 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
2022-01-14 15:48:31 +00:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file
See gh-29112
2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb 27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb 9cf55808fb Ensure run user actually exists
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
2022-01-12 14:05:30 -08:00
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final
Closes gh-29341
2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29340
2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10
Closes gh-29339
2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29338
2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29337
2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8
Closes gh-29336
2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final
Closes gh-29335
2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3
Closes gh-29334
2022-01-12 13:51:15 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots
See gh-29326
2022-01-12 09:29:36 +01:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29321
2022-01-11 20:09:39 +00:00
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots
See gh-29314
2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots
See gh-29313
2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots
See gh-29312
2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots
See gh-29310
2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15
Closes gh-29309
2022-01-11 17:22:18 +01:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
2022-01-05 11:49:48 +00:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Stephane Nicoll 04ce0e65cd Polish assertion 2022-01-03 09:26:22 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
2022-01-02 11:24:58 +01:00
Stephane Nicoll 4b6aa81687 Upgrade to Log4j2 2.17.1
Closes gh-29183
2021-12-29 11:29:25 +01:00
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3
See gh-29161
2021-12-25 09:52:14 +01:00
Stephane Nicoll 369046c37d Upgrade to Spring Integration 5.5.7
Closes gh-28966
2021-12-21 17:09:38 +01:00
Stephane Nicoll f3621702fb Upgrade to Hazelcast 4.1.8
Closes gh-29145
2021-12-21 14:24:50 +01:00
Stephane Nicoll a6350f2307 Upgrade to Spring Session 2021.0.4
Closes gh-28965
2021-12-21 14:00:18 +01:00
Stephane Nicoll b1ab3b8898 Revert "Upgrade to Spring Kafka 2.7.10"
See gh-29114
2021-12-21 09:30:44 +01:00
Stephane Nicoll 44a9145bf8 Upgrade to Spring Security 5.5.4
Closes gh-28964
2021-12-21 09:04:47 +01:00
Stephane Nicoll 6f8e1166c6 Upgrade to Spring Kafka 2.7.10
Closes gh-29114
2021-12-21 09:04:05 +01:00
Stephane Nicoll b2c2e6d0ca Upgrade to Spring AMQP 2.3.13
Closes gh-28994
2021-12-21 09:03:40 +01:00
Scott Frederick e4b0575a12 Do not consider bridge methods when binding java bean properties
Fixes gh-28917
2021-12-20 13:57:36 -06:00
Madhura Bhave 99e650bd27 Document devtools remote support not available with WebFlux
Closes gh-28955
2021-12-20 09:19:34 -08:00
Pavel Anisimov b704ee0b30 Polish reference doc
See gh-29115
2021-12-20 12:36:33 +01:00
Stephane Nicoll fbb7f12f43 Upgrade to XmlUnit2 2.8.4
Closes gh-29123
2021-12-20 10:48:17 +01:00
Stephane Nicoll 620c6ec275 Upgrade to Infinispan 12.1.10.Final
Closes gh-29121
2021-12-20 09:57:12 +01:00
Stephane Nicoll d0cd7dcf60 Upgrade to Hibernate 5.4.33
Closes gh-29120
2021-12-20 09:57:11 +01:00
Stephane Nicoll cb81801907 Upgrade to Ehcache3 3.9.9
Closes gh-29119
2021-12-20 09:57:10 +01:00
Stephane Nicoll d8d97df34a Upgrade to Dropwizard Metrics 4.1.29
Closes gh-29118
2021-12-20 09:57:08 +01:00
Stephane Nicoll 8306287158 Upgrade to DB2 JDBC 11.5.7.0
Closes gh-29117
2021-12-20 09:57:06 +01:00
Stephane Nicoll f619d66244 Upgrade to Spring LDAP 2.3.5
Closes gh-28963
2021-12-19 18:45:23 +01:00
Stephane Nicoll aab30b13b3 Start building against Spring Kafka 2.7.10 snapshots
See gh-29114
2021-12-19 18:30:54 +01:00
Stephane Nicoll cb02944c71 Upgrade to Log4j2 2.17.0
Closes gh-28983
2021-12-18 08:52:22 +01:00
Andy Wilkinson 2fec06ac7e Find annotation without initializing factory beans
Closes gh-28977
2021-12-17 16:08:30 +01:00
Brian Clozel 5d0206320a Upgrade to Logback 1.2.9
Closes gh-29011
2021-12-17 12:13:02 +01:00
Pavel Anisimov 415c58e21b Polish CacheManager customization section in reference doc
See gh-29094
2021-12-17 10:48:55 +01:00
Stephane Nicoll 8c9d398422 Test our Gradle plugin against Gradle 7.3.2
Closes gh-29093
2021-12-17 09:11:44 +01:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Stephane Nicoll b8bf2cbbc7 Upgrade to Spring Framework 5.3.14
Closes gh-28961
2021-12-16 17:50:18 +01:00
Stephane Nicoll 30ebb17b2b Polish 2021-12-15 16:38:27 +01:00
Stephane Nicoll 28214e1e8c Upgrade to Reactor 2020.0.14
Closes gh-28960
2021-12-15 15:11:38 +01:00
Stephane Nicoll 97ee63b55b Upgrade to Undertow 2.2.14.Final
Closes gh-29051
2021-12-15 14:01:27 +01:00
Stephane Nicoll 74ce8b7516 Upgrade to Thymeleaf 3.0.14.RELEASE
Closes gh-29049
2021-12-15 14:01:25 +01:00
Stephane Nicoll e234ccd457 Upgrade to Spring WS 3.1.2
Closes gh-29048
2021-12-15 14:01:24 +01:00
Stephane Nicoll 272e184259 Upgrade to JDOM2 2.0.6.1
Closes gh-29046
2021-12-15 14:01:21 +01:00
Stephane Nicoll 084eae5124 Upgrade to Jackson Bom 2.12.6
Closes gh-29045
2021-12-15 14:01:20 +01:00
Stephane Nicoll d60c0593f3 Upgrade to HttpCore 4.4.15
Closes gh-29044
2021-12-15 14:01:19 +01:00
Stephane Nicoll 8c10266c62 Upgrade to HttpAsyncClient 4.1.5
Closes gh-29043
2021-12-15 14:01:18 +01:00
Stephane Nicoll 70805793a1 Upgrade to Hazelcast 4.1.7
Closes gh-29042
2021-12-15 14:01:16 +01:00
Stephane Nicoll f0a4ac6154 Upgrade to Ehcache3 3.9.8
Closes gh-29041
2021-12-15 14:01:15 +01:00
Stephane Nicoll 41a9b08049 Upgrade to Dropwizard Metrics 4.1.27
Closes gh-29040
2021-12-15 14:01:14 +01:00
Stephane Nicoll b7e233805f Upgrade to Caffeine 2.9.3
Closes gh-29039
2021-12-15 14:01:12 +01:00
Stephane Nicoll 6dcc289e6b Upgrade to AppEngine SDK 1.9.93
Closes gh-29038
2021-12-15 14:01:11 +01:00
copbint 0a9a6639e5 Remove redundant log4j-to-slf4j
See gh-29019
2021-12-15 09:40:10 +01:00
Stephane Nicoll 4c57d1717d Upgrade to Log4j2 2.16.0
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll 157b3aa25f Allow platform to be configured in DataSourceInitializers
Closes gh-28932
2021-12-14 15:07:32 +01:00
Stephane Nicoll d18eae35e5 Upgrade to Logback 1.2.8
Closes gh-29011
2021-12-14 14:26:12 +01:00
Stephane Nicoll 1bda928ad3 Upgrade to Netty 4.1.72.Final
Closes gh-29004
2021-12-13 17:55:38 +01:00
Stephane Nicoll 496cd3d2ba Polish
See gh-28999
2021-12-13 09:23:08 +01:00
Stephane Nicoll 93f75a7d12 Start building against Spring AMQP 2.3.13 snapshots
See gh-28994
2021-12-11 17:19:08 +01:00
Stephane Nicoll 1d8e3a865e Upgrade to Log4j2 2.15.0
Closes gh-28983
2021-12-10 14:44:50 +01:00
Stephane Nicoll f6f5aec183 Polish "Check for the presence of Spring Security"
See gh-28967
2021-12-10 10:59:00 +01:00
Guirong Hu 4462f9157e Check for the presence of Spring Security
See gh-28967
2021-12-10 10:58:30 +01:00
Stephane Nicoll f1f43e8577 Start building against Spring Integration 5.5.7 snapshots
See gh-28966
2021-12-10 06:54:25 +01:00
Stephane Nicoll e53bac272c Start building against Spring Session 2021.0.4 snapshots
See gh-28965
2021-12-10 06:54:01 +01:00
Stephane Nicoll 9894e90567 Start building against Spring Security 5.5.4 snapshots
See gh-28964
2021-12-10 06:53:38 +01:00
Stephane Nicoll a3b31db31d Start building against Spring LDAP 2.3.5 snapshots
See gh-28963
2021-12-10 06:53:13 +01:00
Stephane Nicoll 33ce2ab73b Upgrade to Micrometer 1.7.7
Closes gh-28962
2021-12-10 06:51:25 +01:00
Stephane Nicoll 4a35c7111f Start building against Spring Framework 5.3.14 snapshots
See gh-28961
2021-12-10 06:50:52 +01:00
Stephane Nicoll 7af3bd54a1 Start building against Reactor 2020.0.14 snapshots
See gh-28960
2021-12-10 06:50:21 +01:00
Scott Frederick b0b2cd79b4 Use latest buildpack image tag when no tag is provided
Fixes gh-28921
2021-12-07 14:10:10 -06:00
Scott Frederick 467c092fdc Remove classpath index manifest attribute from repackaged war files
Fixes gh-28895
2021-12-03 11:41:28 -06:00
Andy Wilkinson af60a8a7cf Test our Gradle plugin against Gradle 7.3.1
Closes gh-28890
2021-12-02 10:29:22 +00:00
Stephane Nicoll 1bb3f906a7 Polish
See gh-28836
2021-11-29 09:35:51 +01:00
fml2 1d786e49e9 Fix typos in the "External Application Properties" section
See gh-28830
2021-11-28 11:17:22 +01:00
Xavier Bouclet dce979d51f Fix output of "spring --version" in reference documentation
See gh-28831
2021-11-28 11:14:14 +01:00
Madhura Bhave 27eb992252 Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
2021-11-24 10:29:35 -08:00
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties
Closes gh-28762
2021-11-22 10:03:21 +00:00
Stephane Nicoll 667bca05ec Polish "Add package info for Spring Data metrics support"
See gh-28756
2021-11-20 17:29:52 +01:00
charissathomas 42ae5114ef Create package-info.java
Closes #28731
2021-11-20 17:29:22 +01:00
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson 96d98a0f6f Declare dir task inputs with relative path sensitivity
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Madhura Bhave 64270eca51 Convert environment used by SpringBootTestContextLoader
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
2021-11-17 16:40:53 -08:00
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
2021-11-17 16:14:25 +01:00
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28718
2021-11-17 15:02:27 +01:00
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8
Closes gh-28717
2021-11-17 15:02:25 +01:00
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x
Closes gh-28250
2021-11-17 10:06:41 +00:00
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4
Closes gh-28230
2021-11-17 10:04:51 +00:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
2021-11-17 08:50:32 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
2021-11-16 09:08:15 +01:00
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
2021-11-16 09:08:14 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter
See gh-28683
2021-11-16 08:33:56 +01:00
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9
Closes gh-28539
2021-11-15 19:57:41 +01:00
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12
Closes gh-28600
2021-11-15 19:57:15 +01:00
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3
Closes gh-28679
2021-11-15 12:47:51 +00:00
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x
Closes gh-28680
2021-11-15 12:08:49 +00:00
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc
See gh-28677
2021-11-15 12:07:22 +00:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x
Closes gh-28672
2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file
See gh-28532
2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition
See gh-28532
2021-11-14 08:19:43 +01:00
Stephane Nicoll e396aa310f Upgrade to Spring Data 2021.0.7
Closes gh-28512
2021-11-13 16:17:57 +01:00
Stephane Nicoll 52098229c0 Upgrade to Spring HATEOAS 1.3.6
Closes gh-28609
2021-11-13 16:17:35 +01:00
Stephane Nicoll e7d62ffb01 Upgrade to Spring Data 2020.0.15
Closes gh-28508
2021-11-13 16:16:51 +01:00
Stephane Nicoll f3e2a40424 Upgrade to Spring HATEOAS 1.2.11
Closes gh-28608
2021-11-13 16:16:17 +01:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson ef02db9ed1 Merge branch '2.4.x' into 2.5.x
Closes gh-28659
2021-11-12 20:03:53 +00:00
Andy Wilkinson 0889cdd516 Add dependency management for Glassfish JSTL
To be used in place of javax.servlet:jstl

Closes gh-28657
2021-11-12 20:03:15 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 1d1ab21ac3 Start building against Spring HATEOAS 1.3.6 snapshots
See gh-28609
2021-11-11 10:00:37 +00:00
Andy Wilkinson ede3e4e6a0 Start building against Spring HATEOAS 1.2.11 snapshots
See gh-28608
2021-11-11 09:59:05 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28606
2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI
Closes gh-28594
2021-11-11 09:54:50 +00:00
Stephane Nicoll 0b808fdd3c Upgrade to Micrometer 1.7.6
Closes gh-28511
2021-11-11 09:59:21 +01:00
Stephane Nicoll f969b60031 Upgrade to Spring Framework 5.3.13
Closes gh-28510
2021-11-11 09:57:53 +01:00
Stephane Nicoll 24c578e3ad Upgrade to Micrometer 1.6.13
Closes gh-28507
2021-11-11 09:57:22 +01:00
Stephane Nicoll c8d9f94821 Upgrade to Spring Framework 5.3.13
Closes gh-28506
2021-11-11 09:56:52 +01:00
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 2021-11-10 20:17:36 +00:00
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering
See gh-28506
2021-11-10 20:15:56 +00:00
Stephane Nicoll 4229039ba4 Start building against Spring AMQP 2.3.12 snapshots
See gh-28600
2021-11-10 19:51:53 +01:00
Stephane Nicoll 85e06438e3 Start building against Spring AMQP 2.3.12 snapshots
See gh-28599
2021-11-10 19:50:24 +01:00
Stephane Nicoll e5b168a227 Upgrade to Reactor 2020.0.13
Closes gh-28505
2021-11-09 19:43:48 +01:00
Stephane Nicoll ab1748f06f Upgrade to Reactor 2020.0.13
Closes gh-28505
2021-11-09 19:42:57 +01:00
Phillip Webb ddd38a7ac3 Merge branch '2.4.x' into 2.5.x 2021-11-08 13:14:35 -08:00
Phillip Webb 75bf430eb1 Polish ImportsContextCustomizerTests
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
2021-11-08 13:13:04 -08:00
Phillip Webb 6406ee5609 Merge branch '2.4.x' into 2.5.x
Closes gh-28565
2021-11-08 13:08:52 -08:00
Phillip Webb 8a14e1e2e9 Polish 'Ignore JUnit annotations when caching test contexts'
See gh-28563
2021-11-08 13:07:26 -08:00
Loïc Ledoyen 23876d8a32 Ignore JUnit annotations when caching test contexts
Update `ImportsContextCustomizer` to ignore JUnit annotations.

See gh-28563
2021-11-08 13:06:23 -08:00
Stephane Nicoll f37406f7b1 Upgrade to Netty tcNative 2.0.45.Final
Closes gh-28561
2021-11-08 08:59:23 +01:00
Stephane Nicoll 4c8dbd7469 Upgrade to Netty 4.1.70.Final
Closes gh-28560
2021-11-08 08:59:22 +01:00
Stephane Nicoll 92193caff6 Upgrade to Johnzon 1.2.15
Closes gh-28559
2021-11-08 08:59:21 +01:00
Stephane Nicoll 019971f375 Upgrade to Hazelcast 4.1.6
Closes gh-28558
2021-11-08 08:59:20 +01:00
Stephane Nicoll 388f8a33a5 Upgrade to Gson 2.8.9
Closes gh-28557
2021-11-08 08:59:19 +01:00
Stephane Nicoll c8a1734e0f Upgrade to AppEngine SDK 1.9.92
Closes gh-28556
2021-11-08 08:59:18 +01:00
Stephane Nicoll e802d6b102 Upgrade to Netty tcNative 2.0.45.Final
Closes gh-28555
2021-11-08 08:32:07 +01:00
Stephane Nicoll c14b07717c Upgrade to Netty 4.1.70.Final
Closes gh-28554
2021-11-08 08:32:05 +01:00
Stephane Nicoll e06bb693f8 Upgrade to Johnzon 1.2.15
Closes gh-28553
2021-11-08 08:32:04 +01:00
Stephane Nicoll 2584463fed Upgrade to Gson 2.8.9
Closes gh-28552
2021-11-08 08:32:03 +01:00
Stephane Nicoll c5830b083c Upgrade to AppEngine SDK 1.9.92
Closes gh-28551
2021-11-08 08:32:02 +01:00
Stephane Nicoll 91f7ff3ba3 Merge branch '2.4.x' into 2.5.x
Closes gh-28549
2021-11-08 08:29:43 +01:00
Stephane Nicoll 188278ae4a Polish "Fix typo"
See gh-28548
2021-11-08 08:29:11 +01:00
slowjoe007 5a121197fc Fix typo
See gh-28548
2021-11-08 08:28:28 +01:00
Stephane Nicoll 4304eea319 Polish contribution
See gh-28531
2021-11-06 12:03:22 +01:00
dreis2211 7d594aa301 Avoid duplicate AOP proxy class definition with FilteredClassLoader
See gh-28531
2021-11-06 11:58:28 +01:00
Stephane Nicoll cd5508a679 Polish 2021-11-05 13:43:38 +01:00
Stephane Nicoll 79c9d21926 Start building against Spring Batch 4.3.4 snapshots
See gh-28250
2021-11-05 10:44:30 +01:00
Stephane Nicoll 45deb1ac56 Start building against Spring Kafka 2.7.9 snapshots
See gh-28539
2021-11-05 10:43:59 +01:00
Stephane Nicoll 6984d80389 Start building against Spring Integration 5.5.6 snapshots
See gh-28513
2021-11-05 10:43:28 +01:00
Stephane Nicoll b9e1bf6b1a Start building against Spring Data 2021.0.7 snapshots
See gh-28512
2021-11-05 10:43:00 +01:00
Stephane Nicoll d36c0f21b3 Start building against Micrometer 1.7.6 snapshots
See gh-28511
2021-11-05 10:42:34 +01:00
Stephane Nicoll 71fb6ef9e1 Start building against Spring Framework 5.3.13 snapshots
See gh-28510
2021-11-05 10:42:04 +01:00
Stephane Nicoll 8426fd9488 Start building against Reactor 2020.0.13 snapshots
See gh-28509
2021-11-05 10:41:39 +01:00
Stephane Nicoll 190d39a4f9 Start building against Spring Batch 4.3.4 snapshots
See gh-28230
2021-11-05 10:06:58 +01:00
Stephane Nicoll 5c995a2d9b Start building against Spring Data 2020.0.15 snapshots
See gh-28508
2021-11-05 10:06:27 +01:00
Stephane Nicoll 176496bd18 Start building against Micrometer 1.6.13 snapshots
See gh-28507
2021-11-05 10:05:38 +01:00
Stephane Nicoll 7ae68b6ccc Start building against Spring Framework 5.3.13 snapshots
See gh-28506
2021-11-05 10:05:11 +01:00
Stephane Nicoll d887e438eb Start building against Reactor 2020.0.13 snapshots
See gh-28505
2021-11-05 10:04:46 +01:00
Stephane Nicoll 06e9991e6a Polish
See gh-28501
2021-11-02 09:04:32 +01:00
Andy Wilkinson 33249e9414 Merge branch '2.4.x' into 2.5.x
Closes gh-28489
2021-10-29 15:52:08 +01:00
Andy Wilkinson 12d8f942be Stop logging to the file used in the generated documentation
Closes gh-28488
2021-10-29 15:51:32 +01:00
Andy Wilkinson 5e42f27b36 Merge branch '2.4.x' into 2.5.x
Closes gh-28486
2021-10-29 15:49:49 +01:00
Andy Wilkinson e4e1958b65 Make Logback fall back to JVM's default charset
The charset "default" is an alias for US-ASCII, not the JVM's default
charset. This commit updates the built-in Logback configuration to
use Charset.defaultCharset().name() in place of "default" in the
Java-based configuration. In the XML-based configuration where
Charset.defaultCharset().name() cannot be called, we emulate its
behaviour [1] by using the file.encoding system property, falling back
to UTF-8 when it's not set.

Fixes gh-27230

[1] 19be6113dd/jdk/src/share/classes/java/nio/charset/Charset.java (L604-L617)
2021-10-29 14:40:05 +01:00
Andy Wilkinson 07ed7ab944 Merge branch '2.4.x' into 2.5.x
Closes gh-28482
2021-10-29 11:37:33 +01:00
Andy Wilkinson 2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default
Closes gh-28481
2021-10-29 11:23:35 +01:00
Andy Wilkinson ae93bb3a11 Merge branch '2.4.x' into 2.5.x
Closes gh-28479
2021-10-29 11:12:04 +01:00
Andy Wilkinson 10f0017d69 Fix method validation in child contexts
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
2021-10-29 10:08:57 +01:00
Stephane Nicoll 66553ac8c7 Add .gitattributes
Closes gh-28473
2021-10-28 15:27:49 +02:00
Stephane Nicoll 1b3f52d609 Harmonize line endings
See gh-27615
2021-10-28 15:22:57 +02:00
Andy Wilkinson 7fbbb4e08a Merge branch '2.4.x' into 2.5.x
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson 72f80f3ae6 Upgrade to Testcontainers 1.16.1
Closes gh-28468
2021-10-28 13:06:41 +01:00
Andy Wilkinson b375f9fac0 Ignore parameters when checking if */* is accepted
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.

This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.

Fixes gh-28446
2021-10-28 12:27:34 +01:00
Stephane Nicoll ce38d592f9 Merge branch '2.4.x' into 2.5.x
Closes gh-28466
2021-10-28 11:53:19 +02:00
Stephane Nicoll 265199f42b Polish "Fix description of "logging.logback.rollingpolicy.max-history""
See gh-28448
2021-10-28 11:50:38 +02:00
Guillaume Husta a05b2207f8 Fix description of "logging.logback.rollingpolicy.max-history"
See gh-28448
2021-10-28 11:45:42 +02:00
Andy Wilkinson 4d811f66ec Merge branch '2.4.x' into 2.5.x
Closes gh-28442
2021-10-22 15:48:28 +01:00
Andy Wilkinson 7607587b6c Stabilize liveReloadOnClassPathChanged()
Closes gh-28441
2021-10-22 15:47:51 +01:00
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x
Closes gh-28439
2021-10-22 15:23:07 +01:00
Andy Wilkinson a545b6e0b4 Polish "Polish"
See gh-28367
2021-10-22 15:19:13 +01:00
Leo Li 1586232761 Polish
See gh-28367
2021-10-22 15:11:57 +01:00
Andy Wilkinson 3fb5af9dd3 Merge branch '2.4.x' into 2.5.x
Closes gh-28434
2021-10-22 12:29:14 +01:00
Andy Wilkinson 8a78864edd Polish "Explain how to disable/configure the ActiveMQ embedded broker"
See gh-28183
2021-10-22 12:27:50 +01:00
Moritz Kammerer 0c5f0efcea Explain how to disable/configure the ActiveMQ embedded broker
See gh-28183
2021-10-22 12:27:37 +01:00
Stephane Nicoll 1edd1e8c20 Merge branch '2.4.x' into 2.5.x
Closes gh-28433
2021-10-22 11:26:54 +02:00
Stephane Nicoll 773b0f93b7 Upgrade to Commons Compress 1.21
Closes gh-28429
2021-10-22 11:26:22 +02:00
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
2021-10-22 10:10:50 +01:00
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages"
See 2f6651c3cb.

Closes gh-28408
2021-10-22 10:08:27 +01:00
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
2021-10-21 11:27:29 -07:00
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages
Closes gh-28408
2021-10-21 11:24:54 -07:00
Stephane Nicoll 6cdafc4b72 Upgrade to Spring Session 2021.0.3
Closes gh-28248
2021-10-21 09:13:41 +02:00
Stephane Nicoll 3abda656f0 Upgrade to Spring Session 2020.0.7
Closes gh-28229
2021-10-21 09:00:26 +02:00
Stephane Nicoll d80d692029 Upgrade to Spring Framework 5.3.12
Closes gh-28241
2021-10-21 08:53:57 +02:00
Stephane Nicoll 91524ccc95 Upgrade to Spring Framework 5.3.12
Closes gh-28223
2021-10-21 08:53:23 +02:00
Stephane Nicoll 7328f609c2 Upgrade to XmlUnit2 2.8.3
Closes gh-28397
2021-10-20 09:26:11 +02:00
Stephane Nicoll 8d3e67e561 Upgrade to SendGrid 4.7.6
Closes gh-28396
2021-10-20 09:26:10 +02:00
Stephane Nicoll 80e3c9a9cc Upgrade to MySQL 8.0.27
Closes gh-28395
2021-10-20 09:26:09 +02:00
Stephane Nicoll cae0b50393 Upgrade to Ehcache3 3.9.7
Closes gh-28394
2021-10-20 09:26:07 +02:00
Stephane Nicoll 3d2091136a Upgrade to Nimbus JOSE JWT 8.23
Closes gh-28392
2021-10-20 08:47:14 +02:00
Stephane Nicoll 3e6da7ee2b Upgrade to MySQL 8.0.27
Closes gh-28391
2021-10-20 08:47:13 +02:00
Stephane Nicoll 5865246920 Upgrade to Ehcache3 3.9.7
Closes gh-28390
2021-10-20 08:47:12 +02:00
Stephane Nicoll 9b1660a111 Upgrade to Spring Integration 5.5.5
Closes gh-28249
2021-10-20 08:43:36 +02:00
Andy Wilkinson f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots
This reverts commit 196013fc39, reversing
changes made to 8b0c563832.

Closes gh-28384
See gh-28241
2021-10-19 18:41:23 +01:00
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
2021-10-19 17:50:59 +01:00
Andy Wilkinson 76272ffb62 Merge branch '2.4.x' into 2.5.x
Closes gh-28382
2021-10-19 17:43:30 +01:00
Andy Wilkinson 54ce51e43c Polish "Fix typos in EnvironmentPostProcessor javadoc"
See gh-28376
2021-10-19 17:43:16 +01:00
fml2 ded396b728 Fix typos in EnvironmentPostProcessor javadoc
See gh-28376
2021-10-19 17:41:46 +01:00
Artem Bilan 344d008848 Remove redundant info about DefaultMetricsFactory
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
2021-10-19 16:55:51 +01:00
Andy Wilkinson ab3396de26 Upgrade to Spring Security 5.5.3
Closes gh-28247
2021-10-19 14:35:22 +01:00
Andy Wilkinson d767e0e1f1 Upgrade to Spring Kafka 2.7.8
Closes gh-28246
2021-10-19 14:34:39 +01:00
Andy Wilkinson ce8671ff37 Upgrade to Spring Security 5.4.9
Closes gh-28228
2021-10-19 14:32:57 +01:00
Andy Wilkinson 669caa92f8 Upgrade to Spring Kafka 2.6.11
Closes gh-28227
2021-10-19 14:32:33 +01:00
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x
Closes gh-28379
2021-10-19 14:17:53 +01:00
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC
Fixes gh-28378
2021-10-19 13:52:45 +01:00
Andy Wilkinson bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration
See gh-28345
2021-10-19 11:03:20 +01:00
Phillip Webb b93a629dbe Shutdown in-memory R2DBC databases before devtools restart
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.

The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.

Fixes gh-28345
2021-10-18 21:46:12 -07:00
Phillip Webb 19d3007806 Polish 2021-10-18 21:44:56 -07:00
Andy Wilkinson f87b2478d5 Upgrade to Spring AMQP 2.3.11
Closes gh-28245
2021-10-18 19:14:28 +01:00
Andy Wilkinson 754b52c6bc Upgrade to Spring AMQP 2.3.11
Closes gh-28226
2021-10-18 19:12:19 +01:00
Andy Wilkinson 5f4c001316 Merge branch '2.4.x' into 2.5.x
Closes gh-28371
2021-10-18 15:06:58 +01:00
Andy Wilkinson a93cf64834 Make JMX endpoints available when lazy init is enabled
Closes gh-28335
2021-10-18 13:37:45 +01:00
Andy Wilkinson a722fe46fb Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 13:32:15 +01:00
Andy Wilkinson 779439311d Revert "Upgrade to Spring Data 2020.0.14"
This reverts commit 752789d3ee.

See gh-28225
2021-10-18 12:59:20 +01:00
Andy Wilkinson c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit c0605ffc71.

See gh-28250
2021-10-18 12:31:23 +01:00
Andy Wilkinson 22e7ba6f64 Revert "Start building against Spring Batch 4.3.4 snapshots"
This reverts commit 33ffae8e74.

See gh-28230
2021-10-18 12:30:20 +01:00
Andy Wilkinson 16dbdc5d88 Upgrade to Spring Data 2021.0.6
Closes gh-28244
2021-10-18 12:28:20 +01:00
Andy Wilkinson 752789d3ee Upgrade to Spring Data 2020.0.14
Closes gh-28225
2021-10-18 12:26:24 +01:00
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x
See gh-28241
2021-10-18 10:23:31 +01:00
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC
See gh-28223
2021-10-18 10:15:53 +01:00
Stephane Nicoll a445304584 Upgrade to Netty 4.1.69.Final
Closes gh-28360
2021-10-15 11:36:47 +02:00
Stephane Nicoll bad37f9e37 Upgrade to Netty 4.1.69.Final
Closes gh-28359
2021-10-15 11:30:53 +02:00
Stephane Nicoll 1a1d074f5b Upgrade to Spring HATEOAS 1.3.5
Closes gh-28243
2021-10-15 10:07:02 +02:00
Stephane Nicoll e3a2d42a96 Upgrade to Micrometer 1.7.5
Closes gh-28242
2021-10-15 10:06:33 +02:00
Stephane Nicoll c743442a78 Upgrade to Spring HATEOAS 1.2.10
Closes gh-28358
2021-10-15 09:58:05 +02:00
Stephane Nicoll a569786b79 Upgrade to Micrometer 1.6.12
Closes gh-28224
2021-10-15 09:57:29 +02:00
Phillip Webb a93304c973 Merge branch '2.4.x' into 2.5.x
Closes gh-28356
2021-10-14 21:48:53 -07:00
Phillip Webb 7388f2b60b Attempt to reduce JarFileWrapper heap consumption
Update `JarURLConnection` to use a single shared wrapper per
jar file rather than creating a new one each time. This update
should help to reduce GC pressure.

Fixes gh-28042
2021-10-14 21:48:01 -07:00
Phillip Webb 467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb 8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
2021-10-14 17:38:05 -07:00
Phillip Webb 670d1672de Revert "Remove unnecessary bind-api dependency from test starter"
This reverts commit 9867651024.

See gh-28085
2021-10-14 14:26:02 -07:00
Phillip Webb cf8a1b8b04 Merge branch '2.4.x' into 2.5.x
Closes gh-28353
2021-10-14 12:24:04 -07:00
Phillip Webb b68b3737d7 Sanitize flattened VCAP_SERVICES properties
Update `Sanitizer` to also include flattened `vcap.services.*`
properties.

Fixes gh-28085
2021-10-14 12:22:57 -07:00
Phillip Webb aeadb0ceb6 Merge branch '2.4.x' into 2.5.x
Closes gh-28351
2021-10-14 12:16:38 -07:00
Andy Wilkinson 540468b2f0 Fix parsing of day duration meter values
Switch `MeterValue` parsing logic so that we try `Duration` before
`double`. Prior to this commit, the value `1d` would result in `1.0`
rather than "1 day".

Fixes gh-28302
2021-10-14 12:13:39 -07:00
Phillip Webb a9df8c3ef4 Merge branch '2.4.x' into 2.5.x
Closes gh-28349
2021-10-14 12:05:22 -07:00
Martin Vietz 9867651024 Remove unnecessary bind-api dependency from test starter
See gh-28344
2021-10-14 12:02:57 -07:00
Phillip Webb 2430d8a41a Merge branch '2.4.x' into 2.5.x
Closes gh-28347
2021-10-14 11:27:17 -07:00
Phillip Webb 4dc5142128 Prevent cache from consuming too much memory
Change the cache in `CachingOperationInvoker` to be a reference based
map and also clean stale entries when a specific threshold is met.

Fixes gh-28313
2021-10-14 11:23:56 -07:00
Andy Wilkinson 865615e099 Merge branch '2.4.x' into 2.5.x
Closes gh-28340
2021-10-14 14:10:33 +01:00
Andy Wilkinson ce1a1415ab Use official Jakarta Management API dependency in ActiveMQ starter
Fixes gh-28339
2021-10-14 14:10:18 +01:00
Andy Wilkinson 3800f060b5 Merge branch '2.4.x' into 2.5.x
Closes gh-28336
2021-10-14 13:42:54 +01:00
Andy Wilkinson 2fb8c8d27e Check starters for unnecessary exclusions
Closes gh-28332
2021-10-14 13:37:53 +01:00
Stephane Nicoll 0dcdabed9e Upgrade to Spring Framework 5.3.11
Closes gh-28241
2021-10-14 14:20:06 +02:00
Stephane Nicoll 26d0afc205 Upgrade to Spring Framework 5.3.11
Closes gh-28223
2021-10-14 14:18:54 +02:00
Andy Wilkinson 5fd5556b1f Merge branch '2.4.x' into 2.5.x
Closes gh-28333
2021-10-14 10:37:16 +01:00
Martin Vietz a10db66b16 Remove unnecessary mail dependency from oauth2-client starter
See gh-28308
2021-10-14 10:36:16 +01:00
Andy Wilkinson d3037103fe Merge branch '2.4.x' into 2.5.x
Closes gh-28330
2021-10-14 10:13:24 +01:00
Andy Wilkinson 9f13941c2f Prohibit org.jboss.spec.* dependencies
Closes gh-28329
2021-10-14 10:09:30 +01:00
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb 0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Phillip Webb 9abf9e6731 Modify more tests for static resource location filtering
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
2021-10-13 18:45:22 -07:00