Commit Graph

12929 Commits

Author SHA1 Message Date
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x
Closes gh-26181
2021-04-20 17:58:14 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3
Closes gh-26179
2021-04-20 17:05:58 +02:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include
Closes gh-26163
2021-04-20 10:23:42 +02:00
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata
Closes gh-26127
2021-04-20 10:22:43 +02:00
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x
Closes gh-26159
2021-04-19 17:01:28 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
2021-04-19 16:53:50 +02:00
Stephane Nicoll 54613c77d4 Exclude beans with scheduled methods from global lazy init
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
2021-04-19 14:04:03 +02:00
Andy Wilkinson 0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
See gh-26149
2021-04-19 10:23:27 +01:00
Sriram 4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names
See gh-26149
2021-04-19 10:06:07 +01:00
Phillip Webb 302d500ee9 Add StandardConfigDataResource.getProfile method
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.

Fixes gh-25940
2021-04-15 12:01:34 -07:00
Stephane Nicoll f814beacec Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
2021-04-15 09:05:10 +02:00
Stephane Nicoll e8eb68a458 Upgrade to Spring Session Dragonfruit-SR3
Closes gh-25907
2021-04-15 09:01:55 +02:00
Phillip Webb 5b836f3aee Merge branch '2.3.x' into 2.4.x
Closes gh-26124
2021-04-14 17:42:38 -07:00
Phillip Webb 61ff3c98bf Polish 'Don't detect CloudPlatform when property is set'
See gh-25455
2021-04-14 17:29:30 -07:00
nguyensach 70f44d3a56 Don't detect CloudPlatform when property is set
Update `CloudPlatform.isActive` to back-off from detection when any
`spring.main.cloud-platform` property is set.

See gh-25455
2021-04-14 17:24:37 -07:00
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
2021-04-14 15:02:42 -07:00
Andy Wilkinson 1f0127036c Upgrade to Spring Integration 5.4.6
Closes gh-26113
2021-04-14 17:26:54 +01:00
Andy Wilkinson e6130c6ce0 Upgrade to Spring Integration 5.3.7.RELEASE
Closes gh-26112
2021-04-14 17:24:22 +01:00
Stephane Nicoll 401ebc672b Merge branch '2.3.x' into 2.4.x
Closes gh-26110
2021-04-14 15:43:57 +02:00
Stephane Nicoll ab785d9417 Document limitations of using deferred JPA bootstrap
Closes gh-24027
2021-04-14 15:38:34 +02:00
Stephane Nicoll 0d81b4d07e Merge branch '2.3.x' into 2.4.x
Closes gh-26108
2021-04-14 15:04:28 +02:00
Stephane Nicoll 0fb482579b Harmonize Neo4jContainer startup options
Closes gh-26084
2021-04-14 14:50:04 +02:00
Stephane Nicoll 0cedbf6e06 Upgrade to Spring Data 2020.0.8
Closes gh-25910
2021-04-14 13:37:24 +02:00
Stephane Nicoll 1de2dd9ecb Upgrade to Spring Data Neumann-SR9
Closes gh-25905
2021-04-14 13:31:16 +02:00
Stephane Nicoll 62a70475c2 Fix class condition on deprecated class
Closes gh-26107
2021-04-14 13:30:20 +02:00
Stephane Nicoll 1855f96d07 Polish "Document spring.config.additional-location should be used early"
See gh-26085
2021-04-14 10:06:06 +02:00
Shannon Carey b0b1c04fc4 Document spring.config.additional-location should be used early
See gh-26085
2021-04-14 10:03:56 +02:00
Stephane Nicoll 90fccd7097 Upgrade to SAAJ Impl 1.5.3
Closes gh-26104
2021-04-14 08:47:27 +02:00
Stephane Nicoll 54d23bac9d Upgrade to Micrometer 1.6.6
Closes gh-26103
2021-04-14 08:47:26 +02:00
Stephane Nicoll 3a8736a112 Upgrade to Lettuce 6.0.4.RELEASE
Closes gh-26102
2021-04-14 08:47:25 +02:00
Stephane Nicoll 0429ab4b88 Upgrade to HSQLDB 2.5.2
Closes gh-26101
2021-04-14 08:47:24 +02:00
Stephane Nicoll 00b53b5bdb Upgrade to Glassfish JAXB 2.3.4
Closes gh-26100
2021-04-14 08:47:22 +02:00
Stephane Nicoll cb2a7dd4cb Upgrade to SAAJ Impl 1.5.3
Closes gh-26099
2021-04-14 08:28:19 +02:00
Stephane Nicoll cb1d7a3bc8 Upgrade to Micrometer 1.5.13
Closes gh-26098
2021-04-14 08:28:18 +02:00
Stephane Nicoll 7c85ebc9c9 Upgrade to Lettuce 5.3.7.RELEASE
Closes gh-26097
2021-04-14 08:28:16 +02:00
Stephane Nicoll 274cfc0af0 Upgrade to HSQLDB 2.5.2
Closes gh-26096
2021-04-14 08:28:14 +02:00
Stephane Nicoll 4a5cb3f29e Upgrade to Glassfish JAXB 2.3.4
Closes gh-26095
2021-04-14 08:28:13 +02:00
Stephane Nicoll caa21b0fbe Upgrade to Flatten Maven Plugin 1.2.7
Closes gh-26094
2021-04-14 08:28:12 +02:00
Andy Wilkinson a58b25b5db Add package-info to o.s.b.test.autoconfigure.data.Cassandra
Closes gh-26081
2021-04-13 20:14:29 +01:00
Stephane Nicoll d10409a8ad Upgrade to Spring Framework 5.3.6
Closes gh-25909
2021-04-13 14:34:53 +02:00
Stephane Nicoll 9854a96f6e Upgrade to Spring Framework 5.2.14
Closes gh-25903
2021-04-13 14:34:08 +02:00
Stephane Nicoll 65dd408785 Upgrade to Spring Security 5.4.6
Closes gh-25911
2021-04-13 08:26:46 +02:00
Stephane Nicoll 3e4ee05aaa Upgrade to Reactor 2020.0.6
Closes gh-25908
2021-04-13 08:26:46 +02:00
Stephane Nicoll 75b65ddf62 Upgrade to Spring Security 5.3.9
Closes gh-25906
2021-04-13 08:20:13 +02:00
Stephane Nicoll a3502accbf Upgrade to Reactor Dysprosium-SR19
Closes gh-25902
2021-04-13 08:19:32 +02:00
Scott Frederick 91ee590fd4 Remove @Persistent from MongoDB entity scanning
This commit removes `org.springframework.data.annotation.Persistent`
from the annotation types used for MongoDB entity scanning to align
with Spring Data MongoDB.

Fixes gh-25797
2021-04-12 16:04:38 -05:00
Stephane Nicoll 305bcb10ae Merge branch '2.3.x' into 2.4.x
Closes gh-26029
2021-04-12 16:55:26 +02:00
Stephane Nicoll d96fcf320c Harmonize Elasticsearch converter auto-configuration
This commit harmonizes our auto-configuration so that default converters
are configured the same way ElasticsearchConfigurationSupport does.

Closes gh-25087
2021-04-12 16:51:57 +02:00
Stephane Nicoll fd6ad5b889 Merge branch '2.3.x' into 2.4.x
Closes gh-26024
2021-04-12 14:19:41 +02:00
Stephane Nicoll 7286c33f53 Document default behaviour of DataJpaTest#showSql
Closes gh-25843
2021-04-12 14:14:36 +02:00
Stephane Nicoll b2d167c186 Upgrade to Undertow 2.2.7.Final
Closes gh-26020
2021-04-12 08:57:57 +02:00
Stephane Nicoll d9d051053d Upgrade to Sun Mail 1.6.7
Closes gh-26018
2021-04-12 08:57:54 +02:00
Stephane Nicoll cddc0b625b Upgrade to Netty tcNative 2.0.38.Final
Closes gh-26017
2021-04-12 08:57:52 +02:00
Stephane Nicoll df9b17104c Upgrade to Netty 4.1.63.Final
Closes gh-26016
2021-04-12 08:57:51 +02:00
Stephane Nicoll 50922949bd Upgrade to MIMEPull 1.9.14
Closes gh-26015
2021-04-12 08:57:49 +02:00
Stephane Nicoll 8097d22821 Upgrade to Lombok 1.18.20
Closes gh-26014
2021-04-12 08:57:48 +02:00
Stephane Nicoll 20f47b3149 Upgrade to Jetty 9.4.39.v20210325
Closes gh-26012
2021-04-12 08:57:45 +02:00
Stephane Nicoll 3906719382 Upgrade to Jetty Reactive HTTPClient 1.1.7
Closes gh-26011
2021-04-12 08:57:43 +02:00
Stephane Nicoll 1bc2c3658a Upgrade to Jaybird 3.0.11
Closes gh-26010
2021-04-12 08:57:42 +02:00
Stephane Nicoll 6b98be6db9 Upgrade to Jakarta Mail 1.6.7
Closes gh-26009
2021-04-12 08:57:40 +02:00
Stephane Nicoll 4d8382b25c Upgrade to Hibernate 5.4.30.Final
Closes gh-26008
2021-04-12 08:57:38 +02:00
Stephane Nicoll 3f2cebd545 Upgrade to Dropwizard Metrics 4.1.19
Closes gh-26007
2021-04-12 08:57:37 +02:00
Stephane Nicoll 2d6c6282d9 Upgrade to AppEngine SDK 1.9.88
Closes gh-26006
2021-04-12 08:57:33 +02:00
Scott Frederick 6a7f1f1c56 Merge branch '2.3.x' into 2.4.x
Closes gh-25992
2021-04-09 14:11:47 -05:00
Scott Frederick e19443093d Document runtime JVM configuration when building an image
Fixes gh-21478
2021-04-09 14:06:24 -05:00
Andy Wilkinson 06168bb130 Polish FileSystemWatcherTests
See gh-25982
2021-04-09 15:05:29 +01:00
Andy Wilkinson 638aa87d13 Merge branch '2.3.x' into 2.4.x
Closes gh-25982
2021-04-09 14:40:34 +01:00
Andy Wilkinson 02e6b7c89c Make FileSystemWatcherTests more robust
Previously, several tests in FileSystemWatcherTests assumed that all
of the changes detected by the watcher would be grouped into a single
change set. This assumption breaks down when a test runs slowly (due
to CPU or IO contention, for example), and making changes to the file
system takes long then the watcher's polling interval. When this
happens, the changes will be split across two (or more).

This commit attempts to make the tests more robust. The tests now
tolerate multiple changes sets by combining them and asserting that
across the n change sets, only the expected changes were detected.

Closes gh-25901
2021-04-09 14:35:41 +01:00
dreis2211 afd4b582ed Fix typos in docs
See gh-25947
2021-04-09 14:18:53 +02:00
Stephane Nicoll c5c07185bf Upgrade to Undertow 2.1.7.Final
Closes gh-25978
2021-04-09 14:02:48 +02:00
Stephane Nicoll 02b951cab1 Upgrade to Sun Mail 1.6.7
Closes gh-25976
2021-04-09 14:02:46 +02:00
Stephane Nicoll 7e8c5fcb84 Upgrade to Spring Kafka 2.5.12.RELEASE
Closes gh-25975
2021-04-09 14:02:45 +02:00
Stephane Nicoll ae9576dfcb Upgrade to Spring Batch 4.2.6.RELEASE
Closes gh-25974
2021-04-09 14:02:44 +02:00
Stephane Nicoll f43f8f6d73 Upgrade to Spring AMQP 2.2.16.RELEASE
Closes gh-25973
2021-04-09 14:02:42 +02:00
Stephane Nicoll 4e0733e363 Upgrade to RSocket 1.0.4
Closes gh-25972
2021-04-09 14:02:41 +02:00
Stephane Nicoll 74016134b4 Upgrade to R2DBC Bom Arabba-SR9
Closes gh-25971
2021-04-09 14:02:40 +02:00
Stephane Nicoll 6c6c6aee78 Upgrade to Postgresql 42.2.19
Closes gh-25970
2021-04-09 14:02:39 +02:00
Stephane Nicoll dd9e705afb Upgrade to OAuth2 OIDC SDK 7.1.3
Closes gh-25969
2021-04-09 14:02:37 +02:00
Stephane Nicoll 877bc6d7e6 Upgrade to Netty tcNative 2.0.38.Final
Closes gh-25968
2021-04-09 14:02:36 +02:00
Stephane Nicoll 4eb20f4298 Upgrade to Netty 4.1.63.Final
Closes gh-25967
2021-04-09 14:02:35 +02:00
Stephane Nicoll 6a76ecfbc8 Upgrade to Neo4j OGM 3.2.21
Closes gh-25966
2021-04-09 14:02:33 +02:00
Stephane Nicoll 2ea065a6cf Upgrade to MongoDB 4.0.6
Closes gh-25965
2021-04-09 14:02:32 +02:00
Stephane Nicoll d2117b6b3f Upgrade to MIMEPull 1.9.14
Closes gh-25964
2021-04-09 14:02:31 +02:00
Stephane Nicoll cccb1332b3 Upgrade to Micrometer 1.5.12
Closes gh-25963
2021-04-09 14:02:29 +02:00
Stephane Nicoll f58cda7b53 Upgrade to Maven Invoker Plugin 3.2.2
Closes gh-25962
2021-04-09 14:02:28 +02:00
Stephane Nicoll 7ccebf5fb3 Upgrade to Lombok 1.18.20
Closes gh-25961
2021-04-09 14:02:27 +02:00
Stephane Nicoll 030af053ec Upgrade to Jetty 9.4.39.v20210325
Closes gh-25960
2021-04-09 14:02:26 +02:00
Stephane Nicoll e70590ecb8 Upgrade to Jetty Reactive HTTPClient 1.1.7
Closes gh-25959
2021-04-09 14:02:24 +02:00
Stephane Nicoll 7b61e0cad2 Upgrade to Jaybird 3.0.11
Closes gh-25958
2021-04-09 14:02:23 +02:00
Stephane Nicoll 894a4379f1 Upgrade to Jakarta Mail 1.6.7
Closes gh-25957
2021-04-09 14:02:22 +02:00
Stephane Nicoll 79679ff314 Upgrade to Hibernate 5.4.30.Final
Closes gh-25956
2021-04-09 14:02:21 +02:00
Stephane Nicoll 741d60563f Upgrade to Dropwizard Metrics 4.1.19
Closes gh-25955
2021-04-09 14:02:19 +02:00
Stephane Nicoll d599b0c558 Upgrade to Byte Buddy 1.10.22
Closes gh-25954
2021-04-09 14:02:18 +02:00
Stephane Nicoll bffa26fefa Upgrade to AppEngine SDK 1.9.88
Closes gh-25953
2021-04-09 14:02:17 +02:00
Scott Frederick 9108b81bb2 Merge branch '2.3.x' into 2.4.x
Closes gh-25937
2021-04-08 13:03:26 -05:00
Scott Frederick 0ad7f76263 Preserve file permissions in images built by Gradle
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.

Fixes gh-25915
2021-04-08 12:56:41 -05:00
Stephane Nicoll 5aa1e683c0 Start building against Spring Session 2020.0.4 snapshots
See gh-25912
2021-04-08 18:02:04 +02:00
Stephane Nicoll 0f53663cf6 Start building against Spring Security 5.4.6 snapshots
See gh-25911
2021-04-08 18:02:03 +02:00
Stephane Nicoll aa8f5433ee Start building against Spring Data 2020.0.8 snapshots
See gh-25910
2021-04-08 18:02:03 +02:00
Stephane Nicoll f1b2db03e0 Start building against Spring Framework 5.3.6 snapshots
See gh-25909
2021-04-08 18:02:03 +02:00
Brian Clozel a0ee0601ef Fix SSL configuration with Reactor Netty
Prior to this commit, the SslServerCustomizer would use a Reactor Netty
API that lets users customize the SSL configuration, but later override
some of the choices with defaults.

This commits moves from the new deprecated Reactor Netty API and instead
uses a new variant that builds the defaults and lets developers override
them if they want to.

Fixes gh-25913
2021-04-08 17:09:31 +02:00
Stephane Nicoll c6205f10f1 Merge branch '2.3.x' into 2.4.x
Closes gh-25922
2021-04-08 10:13:45 +02:00
Stephane Nicoll 25b7495d8e Polish "Properly close input streams when loading key stores"
See gh-25884
2021-04-08 09:25:03 +02:00
Alex Belyaev 1e3f5c342b Properly close input streams when loading key stores
See gh-25884
2021-04-08 09:21:58 +02:00
Stephane Nicoll 2a60503849 Start building against Spring Session Dragonfruit-SR3 snapshots
See gh-25907
2021-04-07 15:43:12 +02:00
Stephane Nicoll e4bf730f0b Start building against Spring Security 5.3.9 snapshots
See gh-25906
2021-04-07 15:42:42 +02:00
Stephane Nicoll b12a725977 Start building against Spring Data Neumann-SR9 snapshots
See gh-25905
2021-04-07 15:42:07 +02:00
Stephane Nicoll 80e893ebae Upgrade to Spring HATEOAS 1.1.5
Closes gh-25904
2021-04-07 15:41:34 +02:00
Stephane Nicoll aab5859fde Start building against Spring Framework 5.2.14 snapshots
See gh-25903
2021-04-07 15:41:17 +02:00
Stephane Nicoll ac1117f1a1 Start building against Reactor Reactor Dysprosium-SR19
See gh-25902
2021-04-07 15:40:40 +02:00
Andy Wilkinson e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
2021-04-07 10:19:20 +01:00
Andy Wilkinson b35d1ec6e8 Revert "Use test harness for image building integration tests"
This reverts commit da9d8d6055.

See gh-25838
2021-04-07 09:30:51 +01:00
Phillip Webb 8a04547454 Fix checkstyle violation
See gh-25766
2021-04-05 18:18:52 -07:00
Phillip Webb 5774ea3f0c Support profile specific ConfigData imports
Update the `ConfigData` import support to allow individual property
sources to be imported with a higher precedence than profile specific
imports.

Prior to this commit, imported sources would always have a higher
precedence than the file that imported them, but a lower precedence
than any profile-specific variant of the same file.

For example, given an `application.properties` that imports `myconfig`,
the contributor tree would be as follows:

	ROOT
	 +- `application.properties`
	 |    +- myconfig
	 +- `application-<profile>.properties`

The precedence would be:

	1) `application-<profile>.properties`
	2) myconfig
	3) `application.properties`

This works well for most situations, but can be confusing if import is
for a profile-specific property source. For example:

	ROOT
	 +- `application.properties`
	 |    +- myconfig
	 |    +- myconfig-<profile>
	 +- `application-<profile>.properties`

Results in the order precedence of:

	1) `application-<profile>.properties`
	2) myconfig-<profile>
	3) myconfig
	4) `application.properties`

This means that whilst `myconfig` overrides `application.properties`,
`myconfig-profile` does not override `application-<profile>.properties`.

For this specific situation, the preferable order would be:

	1) myconfig-<profile>
	2) `application-<profile>.properties`
	3) myconfig
	4) `application.properties`

To support this alternative ordering a new `PROFILE_SPECIFIC` config
data option has been added. Additionally, options may now be specified
on a per-source basis by using the `PropertySourceOptions` interface.

Fixes gh-25766
2021-04-05 15:55:03 -07:00
Tommy Ludwig 3746385f98 Polish HealthIndicators table in docs
`=======` was showing up in the header of the table, which should not
be there.

See gh-25882
2021-04-05 09:10:25 +02:00
Stephane Nicoll db3dfffdca Polish contribution
See gh-25875
2021-04-04 11:15:49 +02:00
izeye 852e5778a3 Polish
See gh-25875
2021-04-04 11:12:03 +02:00
Andy Wilkinson 0005263f76 Merge branch '2.3.x' into 2.4.x
Closes gh-25869
2021-04-01 19:01:28 +01:00
Andy Wilkinson 1b91c1706e Ensure that Cassandra's DriverConfigLoader is only closed once
Fixes gh-25796
2021-04-01 18:57:35 +01:00
Andy Wilkinson ba28f21e27 Merge branch '2.3.x' into 2.4.x
Closes gh-25866
2021-04-01 16:51:31 +01:00
Andy Wilkinson cbf37b3a8b Use main as the branch name in info endpoint example
Closes gh-25865
2021-04-01 16:46:37 +01:00
Andy Wilkinson d82889f42e Merge branch '2.3.x' into 2.4.x
Closes gh-25863
2021-04-01 15:00:51 +01:00
Andy Wilkinson cf0bd0f959 Polish "Fix no such bean definition with ancestor-defined Validator"
See gh-25800
2021-04-01 15:00:10 +01:00
MatejNedic 8958101510 Fix no such bean definition with ancestor-defined Validator
See gh-25800
2021-04-01 14:59:50 +01:00
Andy Wilkinson d1359220ed Merge branch '2.3.x' into 2.4.x
Closes gh-25861
2021-04-01 10:07:59 +01:00
Andy Wilkinson 7d632ea397 Use ApplicationContextRunner in ValidationAutoConfigurationTests
Closes gh-25859
2021-04-01 10:01:37 +01:00
Andy Wilkinson 0e4b66a3ea Merge branch '2.3.x' into 2.4.x
Closes gh-25844
2021-03-31 17:29:11 +01:00
Andy Wilkinson 1a84b0610e Align PushGatewayManager's exception handling with PushMeterRegistry's
Previously, would log an error for any exception and also stop
publishing for an UnknownHostException. By constrast, Micrometer's
PushMeterRegistry treats all exceptions the same, logging a warning
and continuing with subsequent push attempts.

This commit updates the push gateway manager's behaviour to match
PushMeterRegistry. UknownHostExceptions no longer receive special
treatment and push (and delete) failures are now logged as warnings
rather than errors.

Fixes gh-25804
2021-03-31 17:01:08 +01:00
Scott Frederick 586ce00e06 Merge branch '2.3.x' into 2.4.x
Closes gh-25839
2021-03-30 17:39:10 -05:00
Scott Frederick da9d8d6055 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
2021-03-30 16:48:28 -05:00
Andy Wilkinson 563b8a8cec Merge branch '2.3.x' into 2.4.x
See gh-25836
2021-03-30 20:52:15 +01:00
Andy Wilkinson e94f8bba62 Ensure that upstream jars have been built
See gh-25835
2021-03-30 20:51:33 +01:00
Andy Wilkinson 38a4f135a9 Merge branch '2.3.x' into 2.4.x
Closes gh-25836
2021-03-30 20:42:29 +01:00
Andy Wilkinson ca9a619259 Defer processing of zipTree source until execution time
Closes gh-25835
2021-03-30 20:41:46 +01:00
Andy Wilkinson 7a846ad41f Merge branch '2.3.x' into 2.4.x
Closes gh-25832
2021-03-30 18:18:10 +01:00
Andy Wilkinson 5a086321c6 Polish "Document Failsafe configuration when not using starter parent"
See gh-25621
2021-03-30 18:16:21 +01:00
robert-smith-911 0d79fd3e01 Document Failsafe configuration when not using starter parent
See gh-25621
2021-03-30 18:02:12 +01:00
Phillip Webb a28a3ae090 Merge branch '2.3.x' into 2.4.x 2021-03-30 09:25:46 -07:00
Phillip Webb 9c8a97809d Consistent use of @deprecated since
Restore the patch version number for consistency with `@since`
tags.

See gh-25808
2021-03-30 09:20:30 -07:00
Andy Wilkinson d9ce30b15c Merge branch '2.3.x' into 2.4.x
See gh-25825
2021-03-30 09:23:24 +01:00
Andy Wilkinson 8b6eef6f1d Consistent use of @deprecated since
See gh-25808
2021-03-30 09:22:45 +01:00
Phillip Webb a0f5169966 Polish 2021-03-29 15:51:13 -07:00
Phillip Webb 363f5829d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb 26dd1b9a26 Update deprecations with for removal targets
Update all deprecation tags to include a removal target.

Closes gh-25808
2021-03-29 15:44:58 -07:00
Andy Wilkinson a025f3d252 Merge branch '2.3.x' into 2.4.x
Closes gh-25822
2021-03-29 14:38:38 +01:00
Andy Wilkinson 896f20e1d3 Improve diagnostics of ClassPathFileSystemWatcherTests
Closes gh-25821
2021-03-29 14:37:25 +01:00
Stephane Nicoll 8bb4020bd4 Polish
See gh-25819
2021-03-29 14:36:26 +02:00
Andy Wilkinson 403e747c46 Use constructor injection in SpringBootRepositoryRestConfigurer
Closes gh-25819
2021-03-29 13:00:02 +01:00
Stephane Nicoll d1aaee46bb Merge branch '2.3.x' into 2.4.x
Closes gh-25812
2021-03-27 08:06:02 +01:00
dreis2211 be4491959b Fix flaky QuartzAutoConfigurationTests
See gh-25810
2021-03-27 08:00:52 +01:00
Scott Frederick 4015d70f00 Merge branch '2.3.x' into 2.4.x
Closes gh-25789
2021-03-26 15:16:01 -05:00
Scott Frederick 3ad5f1013a Fix Maven image building with classifiers
Fixes gh-25736
2021-03-26 11:36:38 -05:00
Andy Wilkinson af7e4e211c Support all known endpoint types
Previously, the configuration metadata annotation processor only
declared support for `@Endpoint` and none of the other more
specialized `@…Endpoint` annotations that are meta-annotated with
`@Endpoint` such as `@WebEndpoint` and `@JmxEndpoint. This would
result in missing metadata if a full or incremental build only
compiled classes annotated with one of the more specialized
`@…Endpoint` annotations as the annotation processor would not be
called.

This commit updates the processor's supported annotation types to
include every known `@…Endpoint` annotation. The test processor has
also been similarly updated to align its behaviour with that of the
main processor.

Fixes gh-25388
2021-03-25 15:23:09 +00:00
Phillip Webb 35aeae5a4f Deprecate Bootstrapper
Deprecate the `Bootstrapper` interface entirely and provide a
`BootstrapRegistryInitializer` alternative so that people can migrate.

Unfortunately our previous attempt to fix the typo in the `Bootstrapper`
interface didn't provide us a way to remove the deprecated method
without impacting users. It was also problematic for people who were
implementing `Bootstrapper` rather than using a lambda since they needed
to introduce the deprecated method.

We unfortunately can't see a way to fix the original typo without
introducing a new interface.

Fixes gh-25735
2021-03-24 14:10:12 -07:00
Phillip Webb ddf5c9f5d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25786
2021-03-24 12:52:51 -07:00
Phillip Webb 88b74097ba Polish 'Ignore quality value when removing MediaType.ALL'
See gh-25778
2021-03-24 12:35:56 -07:00
Fábio Ramon 3090a3a71f Ignore quality value when removing MediaType.ALL
Update the default reactive exception handler so that `MediaType.ALL`
is removed regardless of any quality setting. Prior to this commit,
the "match-all" media type was not properly ignored if it has a quality
value and would show HTML content if the accept header was
`application/json, */*;q=0.9`.

See gh-25778
2021-03-24 12:35:32 -07:00
Phillip Webb 5274cf2459 Merge branch '2.3.x' into 2.4.x
Closes gh-25784
2021-03-24 12:23:44 -07:00
Phillip Webb 130cc5b036 Chain caught InvalidEndpointRequestExceptions
Update `AbstractWebMvcEndpointHandlerMapping` to chain any caught
InvalidEndpointRequestExceptions so that a more complete stacktrace
is available. The exception has also been updated to a
`ResponseStatusException` so that the reason can be propagated.

Fixes gh-25642
2021-03-24 12:22:26 -07:00
Phillip Webb ca9fae6b47 Merge branch '2.3.x' into 2.4.x
Closes gh-25774
2021-03-23 17:07:44 -07:00
Phillip Webb ec21202d54 Delete unpacked jars when the JVM exits
Update `JarFileArchive` so that any unpacked files are now deleted when
the JVM exits.

Closes gh-25773
2021-03-23 17:06:56 -07:00
Phillip Webb 05f61bccea Align unpack logic with Files.createTempDirectory
Update `JarFileArchive` to align the way that it creates temp files and
folders with the way that `Files.createTempDirectory` works.

Closes gh-25772
2021-03-23 17:06:56 -07:00
Phillip Webb b8873578ca Add missing @Deprecated annotations 2021-03-23 17:06:53 -07:00
Phillip Webb 9af6c895c9 Merge branch '2.3.x' into 2.4.x 2021-03-23 13:09:25 -07:00
Phillip Webb 2b591387b8 Restore tomcat-embed TldPatterns
Restore tomcat-embed-core-* and tomcat-embed-logging-* patterns which
were inadvertently removed in commit 0ec8d281ef.

See gh-25764
2021-03-23 13:07:15 -07:00
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb 82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Phillip Webb 56674b9031 Merge branch '2.3.x' into 2.4.x
Closes gh-25770
2021-03-23 12:48:51 -07:00
Phillip Webb 0ec8d281ef Align TldPatterns with Tomcat default
Update `TldPatterns` to align with the latest default shipped by Tomcat.
This commit also introduces a test to ensure that we will remain aligned
going forwards.

Closes gh-25764
2021-03-23 12:46:27 -07:00
Andy Wilkinson 96ba9ae47f Merge branch '2.3.x' into 2.4.x
Closes gh-25768
2021-03-23 14:48:24 +00:00
Andy Wilkinson 62023104de Test auto-configured MockRestServiceServer with metrics and a root URI
Closes gh-25741
2021-03-23 14:37:37 +00:00
Andy Wilkinson 33cf8b3bc4 Merge branch '2.3.x' into 2.4.x
Closes gh-25765
2021-03-23 13:06:35 +00:00
Andy Wilkinson bf6f36a783 Apply any root URI to RestTemplate metric's URI tag
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.

This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.

Fixes gh-25744
2021-03-23 13:05:54 +00:00
Stephane Nicoll 2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
2021-03-22 14:44:48 +01:00
Stephane Nicoll c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
2021-03-22 14:41:25 +01:00
bono007 674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
2021-03-22 13:53:28 +01:00
Scott Frederick 6f860b441b Merge branch '2.3.x' into 2.4.x
Closes gh-25700
2021-03-19 14:52:20 -05:00
Stephane Nicoll 072c858d0e Upgrade to Spring Batch 4.3.2
Closes gh-25579
2021-03-18 08:28:36 +01:00
Stephane Nicoll 8e35d6a5fc Upgrade to Spring Integration 5.4.5
Closes gh-25646
2021-03-18 07:55:06 +01:00
Scott Frederick e4fa39df01 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
2021-03-17 15:19:21 -05:00
Andy Wilkinson 0d7a60f8cf Upgrade to Spring AMQP 2.3.6
Closes gh-25647
2021-03-17 18:27:16 +00:00
Andy Wilkinson 5005bd3ded Upgrade to Spring Kafka 2.6.7
Closes gh-25578
2021-03-17 18:26:44 +00:00
Stephane Nicoll 6f9352bda9 Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:09:37 +01:00
Stephane Nicoll 42994349fe Merge branch '2.3.x' into 2.4.x
Closes gh-25724
2021-03-17 15:08:32 +01:00
Stephane Nicoll 446e838b1b Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:07:02 +01:00
Stephane Nicoll 606c871d4a Upgrade to Spring Data 2020.0.6
Closes gh-25547
2021-03-17 14:27:48 +01:00
Stephane Nicoll 052624ffb2 Upgrade to Lettuce 6.0.3.RELEASE
Closes gh-25720
2021-03-17 14:25:38 +01:00
Stephane Nicoll a8667daf52 Upgrade to Kotlin Coroutines 1.4.3
Closes gh-25719
2021-03-17 14:25:36 +01:00
Andy Wilkinson 758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson 5595fd4017 Merge branch '2.3.x' into 2.4.x
Closes gh-25715
2021-03-17 11:31:46 +00:00
Andy Wilkinson 0e0418546b Test spring-boot:build-image when repackage is also invoked
Closes gh-25714
2021-03-17 11:19:29 +00:00
Andy Wilkinson ed4e419b0c Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit eaa510872a, reversing
changes made to 3e69522e2d.

See gh-25700
2021-03-17 11:13:58 +00:00
Andy Wilkinson ae2ff7849b Revert "Fail fast when finalName is misconfigured"
This reverts commit 263b7c20e4.

See gh-25590
2021-03-17 11:11:24 +00:00
Scott Frederick eaa510872a Merge branch '2.3.x' into 2.4.x
Closes gh-25700
2021-03-16 17:31:32 -05:00
Scott Frederick 263b7c20e4 Fail fast when finalName is misconfigured
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
2021-03-16 17:22:48 -05:00
Andy Wilkinson 3e69522e2d Merge branch '2.3.x' into 2.4.x
Closes gh-25702
2021-03-16 20:25:25 +00:00
Andy Wilkinson f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1
Closes gh-25558
2021-03-16 20:24:45 +00:00
Andy Wilkinson 2560f261cd Merge branch '2.3.x' into 2.4.x
Closes gh-25692
2021-03-16 16:35:31 +00:00
Andy Wilkinson a832cc9ccd Polish "Improve error message when no resources exist at a script location"
See gh-25620
2021-03-16 16:20:11 +00:00
Yuta Saito 42841b895f Improve error message when no resources exist at a script location
See gh-25620
2021-03-16 16:19:27 +00:00
Andy Wilkinson 226ee61dea Create exception reporters when needed so they pick up current state
Fixes gh-25691
2021-03-16 16:13:40 +00:00
Andy Wilkinson f9db1968bf Upgrade to Micrometer 1.6.5
Closes gh-25543
2021-03-16 10:53:15 +00:00
Andy Wilkinson af23da1dff Upgrade to Spring HATEOAS 1.2.5
Closes gh-25545
2021-03-16 10:52:37 +00:00
Stephane Nicoll e100291043 Upgrade to Spring Framework 5.3.5
Closes gh-25541
2021-03-16 10:37:41 +01:00
Stephane Nicoll c8fbbe9eaa Upgrade to Reactor 2020.0.5
Closes gh-25539
2021-03-16 08:27:25 +01:00
Stephane Nicoll 6b9032b4d3 Document that Java 16 is supported
Closes gh-25527
2021-03-15 16:08:56 +01:00
Stephane Nicoll 9aa1ce235f Document DataSource implementations supported by DataSourceBuilder
Closes gh-25333
2021-03-15 14:25:22 +01:00
Stephane Nicoll c66db586bf Upgrade to Undertow 2.2.5.Final
Closes gh-25641
2021-03-15 09:22:18 +01:00
Stephane Nicoll bf4ebcf6ea Upgrade to Tomcat 9.0.44
Closes gh-25640
2021-03-15 09:22:16 +01:00
Stephane Nicoll e0b54cb102 Upgrade to Sun Mail 1.6.6
Closes gh-25639
2021-03-15 09:22:15 +01:00
Stephane Nicoll 0c67a6ad2c Upgrade to R2DBC Bom Arabba-SR9
Closes gh-25638
2021-03-15 09:22:14 +01:00
Stephane Nicoll 97e54fc48c Upgrade to Postgresql 42.2.19
Closes gh-25637
2021-03-15 09:22:13 +01:00
Stephane Nicoll 3362dd0f09 Upgrade to OAuth2 OIDC SDK 8.36.1
Closes gh-25636
2021-03-15 09:22:12 +01:00
Stephane Nicoll 3d4b89a154 Upgrade to Netty 4.1.60.Final
Closes gh-25635
2021-03-15 09:22:11 +01:00
Stephane Nicoll eafb15b22d Upgrade to MongoDB 4.1.2
Closes gh-25634
2021-03-15 09:22:09 +01:00
Stephane Nicoll 88fbd24650 Upgrade to Maven Invoker Plugin 3.2.2
Closes gh-25633
2021-03-15 09:22:08 +01:00
Stephane Nicoll b930710d48 Upgrade to jOOQ 3.14.8
Closes gh-25631
2021-03-15 09:22:05 +01:00
Stephane Nicoll df49298cc6 Upgrade to Jetty Reactive HTTPClient 1.1.6
Closes gh-25630
2021-03-15 09:22:04 +01:00
Stephane Nicoll af8b5974d9 Upgrade to Jakarta Mail 1.6.6
Closes gh-25629
2021-03-15 09:22:03 +01:00
Stephane Nicoll c743569113 Upgrade to Infinispan 11.0.10.Final
Closes gh-25628
2021-03-15 09:22:01 +01:00
Stephane Nicoll 89b10d71e6 Upgrade to Hibernate 5.4.29.Final
Closes gh-25627
2021-03-15 09:22:00 +01:00
Stephane Nicoll ce13db4d86 Upgrade to Ehcache3 3.9.2
Closes gh-25626
2021-03-15 09:21:59 +01:00
Stephane Nicoll f276be74a9 Upgrade to Dropwizard Metrics 4.1.18
Closes gh-25625
2021-03-15 09:21:58 +01:00
Stephane Nicoll ace3376a0b Upgrade to Byte Buddy 1.10.22
Closes gh-25624
2021-03-15 09:21:57 +01:00
Stephane Nicoll 947d81e03f Upgrade to AppEngine SDK 1.9.87
Closes gh-25623
2021-03-15 09:21:56 +01:00
Stephane Nicoll 5535453555 Start building against Spring Batch 4.3.2 snapshots
See gh-25579
2021-03-14 08:26:33 +01:00
Stephane Nicoll f63dcec60d Start building against Spring Kafka 2.6.7 snapshots
See gh-25578
2021-03-14 08:26:33 +01:00
Stephane Nicoll 759e543337 Start building against Micrometer 1.6.5 snapshots
See gh-25543
2021-03-14 08:26:28 +01:00
izeye 09f4d4b9bf Polish
See gh-25617
2021-03-13 18:08:54 +01:00
Madhura Bhave 11649bc1f0 Merge branch '2.3.x' into 2.4.x
Closes gh-25614
2021-03-12 14:02:34 -08:00
Madhura Bhave df1d1dbaa9 Fallback to BeanPropertyBindingResult for unbound property validation
gh-17424 updated `ValidationBindHandler` so that it would
only look at bound values when validating. This commit updates
`ValidationBindHandler` to use Spring Framework's `BeanPropertyBindingResult`.
This means that for fields that are not bound, JavaBean accessor methods can
be used to get the value to validate.

Fixes gh-25356
2021-03-12 13:56:54 -08:00
Andy Wilkinson 24d729ee3b Close ClassLoader so jar it references can be deleted on Windows
Polishes 952ac7b8
2021-03-11 15:44:52 +00:00
Andy Wilkinson c43ae0b2d3 Merge branch '2.3.x' into 2.4.x
Closes gh-25603
2021-03-11 11:12:54 +00:00
maruoovv b401be1589 Correct javadoc for ON_PARAM
See gh-25480
2021-03-11 11:12:04 +00:00
Johnny Lim 90666faf6d Add Javadoc since tag to Bootstrapper.initialize()
See gh-25596
2021-03-11 09:34:57 +00:00
Andy Wilkinson 952ac7b8d2 Don't use RestartClassLoader when proxying classes it did not load
Fixes gh-19010
Fixes gh-25367
2021-03-10 17:12:38 +00:00
Stephane Nicoll 6840440220 Merge branch '2.3.x' into 2.4.x
Closes gh-25573
2021-03-10 15:15:21 +01:00
Stephane Nicoll f38e863fbc Properly subscribe to CloseableConnectionFactory#close
Closes gh-25565
2021-03-10 15:03:27 +01:00
Stephane Nicoll d5b1fd5b31 Merge branch '2.3.x' into 2.4.x
Closes gh-25569
2021-03-10 13:24:32 +01:00
Stephane Nicoll c8101f8c9b Remove host name in R2DBC's embedded H2 url
Closes gh-25560
2021-03-10 13:24:08 +01:00
Stephane Nicoll cad9fa2fc0 Start building against Spring Data 2020.0.6 snapshots
See gh-25547
2021-03-10 08:07:44 +01:00
Stephane Nicoll 924bb53c69 Start building against Spring HATEOAS 1.2.5 snapshots
See gh-25545
2021-03-10 08:07:17 +01:00
Stephane Nicoll d2733b26b6 Start building against Spring Framework 5.3.5 snapshots
See gh-25541
2021-03-10 08:06:44 +01:00
Stephane Nicoll 0985845c3b Start building against Reactor 2020.0.5 snapshots
See gh-25539
2021-03-10 08:06:06 +01:00
Andy Wilkinson 9be36f3a72 Merge branch '2.3.x' into 2.4.x 2021-03-09 11:11:46 +00:00
Andy Wilkinson 3e9341fbb4 Start using Spring Asciidoctor 0.5.1 snapshots
See gh-25558
2021-03-09 10:59:26 +00:00
Andy Wilkinson dace7bb742 Merge branch '2.3.x' into 2.4.x 2021-03-09 09:25:45 +00:00
Andy Wilkinson b76a9951e9 Polish RSocketServerAutoConfiguration 2021-03-09 09:25:34 +00:00
Andy Wilkinson ba5c57c1b2 Merge branch '2.3.x' into 2.4.x
Closes gh-25555
2021-03-09 09:21:38 +00:00
Andy Wilkinson 84637acbdc Make embedded RSocket server back off without spring-web
Fixes gh-25551
2021-03-09 08:53:25 +00:00
dreis2211 b85a50b7b6 Suppress rawtypes warning
See gh-25531
2021-03-08 08:47:16 +01:00
dreis2211 2575621e06 Fix some illegal reflective access warnings
See gh-25531
2021-03-08 08:47:10 +01:00
Andy Wilkinson 3c84ea9350 Try to stabilize tests that use Neo4jContainer
Closes gh-25520
2021-03-05 15:36:45 +00:00
Andy Wilkinson f9ef05f71e Polish "Add Bootstrapper initialize method to fix typo"
See gh-25400
2021-03-05 15:06:51 +00:00
cprayer bee6f41393 Add Bootstrapper initialize method to fix typo
See gh-25400
2021-03-05 15:06:50 +00:00
Stephane Nicoll ddf75f095c Merge branch '2.3.x' into 2.4.x
Closes gh-25515
2021-03-05 15:47:36 +01:00
Stephane Nicoll 6ebc69d704 Polish "Include properties in source merge algorithm"
See gh-25507
2021-03-05 15:47:09 +01:00
Bertrand Renuart cf4bc6e9e0 Include properties in source merge algorithm
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.

See gh-25507
2021-03-05 15:47:09 +01:00
Andy Wilkinson 2f95c1e2c8 Merge branch '2.3.x' into 2.4.x
Closes gh-25513
2021-03-05 14:16:07 +00:00
Andy Wilkinson 22b73f3020 Polish "Improve documentaion of Mockito test execution listeners"
See gh-25375
2021-03-05 14:14:36 +00:00
cdalexndr 72562e0fd4 Improve documentaion of Mockito test execution listeners
See gh-25375
2021-03-05 12:49:18 +00:00
Andy Wilkinson 836ad76df1 Merge branch '2.3.x' into 2.4.x
Closes gh-25510
2021-03-05 11:03:08 +00:00
Andy Wilkinson 92133d47d0 Polish "Make link to Actuator API docs more prominent"
See gh-25486
2021-03-05 10:58:47 +00:00
cdalexndr 5f4e1b747e Make link to Actuator API docs more prominent
See gh-25486
2021-03-05 10:57:59 +00:00
Andy Wilkinson ac258a95a2 Merge branch '2.3.x' into 2.4.x
Closes gh-25508
2021-03-05 10:39:52 +00:00
Andy Wilkinson c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path"
See gh-25505
2021-03-05 10:13:32 +00:00
trungPa 2993e68715 Prevent extracting zip entries outside of destination path
See gh-25505
2021-03-05 10:12:06 +00:00
dreis2211 89a44f3da4 Fix some assertions
See gh-25499
2021-03-05 09:56:55 +01:00
Madhura Bhave ae630e03ce Warn against using multi-document files with TestPropertySource
Closes gh-24945
2021-03-04 14:46:59 -08:00
Madhura Bhave cfac223cff Document configtree support for Docker secrets
Closes gh-25095
2021-03-04 13:02:28 -08:00
Andy Wilkinson 1ce6e796fe Polish "Allow the project to be built with Java 16"
See gh-25171
2021-03-04 18:54:58 +00:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
2021-03-04 18:54:56 +00:00
Madhura Bhave 181d0ee932 Merge default property sources
Fixes gh-25408
2021-03-04 09:46:00 -08:00
Andy Wilkinson ca414733f3 Reinstate support for placeholders in @EntityScan
Fixes gh-25436
2021-03-04 12:21:27 +00:00
Stephane Nicoll e5d8b6029b Merge branch '2.3.x' into 2.4.x
Closes gh-25483
2021-03-03 15:16:08 +01:00
Stephane Nicoll 8e67ae7113 Fix fallback fork value for spring-boot:stop
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.

Closes gh-25472
2021-03-03 15:15:04 +01:00
Scott Frederick afb60d6161 Add tests for Gradle examples used in plugin docs
Fixes gh-25468
2021-03-01 15:22:15 -06:00
Stephane Nicoll 63cca9b8c6 Polish "Document precedence between properties and yaml"
See gh-25300
2021-03-01 10:44:43 +01:00
Robert Smith 20ed8c2ec3 Document precedence between properties and yaml
See gh-25300
2021-03-01 10:39:34 +01:00
Stephane Nicoll ed1c68f567 Update copyright year of changed file
See gh-25454
2021-03-01 10:06:23 +01:00
jnizet cbab2396e2 Fix property name in gradle plugin documentation
See gh-25454
2021-03-01 10:01:52 +01:00
Stephane Nicoll aa032e093b Upgrade to Jetty 9.4.38.v20210224
Closes gh-25461
2021-03-01 09:22:06 +01:00
Stephane Nicoll dd2dc22085 Upgrade to Jetty 9.4.38.v20210224
Closes gh-25460
2021-03-01 09:20:33 +01:00
Andy Wilkinson cb600f1c0b Merge branch '2.3.x' into 2.4.x
Closes gh-25449
2021-02-26 14:26:57 +00:00
Andy Wilkinson 8f72ca6521 Use ResourceConfig customization to register endpoints with Jersey
Previously, actuator endpoints were registered with Jersey upon
injection of the ResourceConfig bean into a registrar class rather than
using a ResourceConfigCustomizer. This was done to fix a problem
when running the Actuator on a separate port where the main application
context's customizers were also applied to the management context,
breaking the singleton contract for those resources. This approach
meant that the registration could be performed at any point after the
ResourceConfig had been created. When Jersey's configured as a Filter
this resulted in the registration failing as the attempt was being made
after the Filter lifecyle callbacks which make the ResourceConfig
immutable.

This commit reworks the endpoint registration to be performed using a
ManagementContextResourceConfigCustomizer, a resource config customizer
that's only applied to the ResourceConfig that's used by the Actuator.
When there's a separate management context, this ResourceConfig is
created by the Actuator's auto-configuration and the management context
resource config customizers are applied to it during its creation. The
main application's customizers are not applied. When the actuator is
using the same context as the main application, this ResourceConfig is
created by the main application. In this case a
ResourceConfigCustomizer is defined that delegates to all
ManagementContextResourceConfigCustomizers, allowing them to register
the actuator endpoints with the main ResourceConfig.

Fixes gh-25262
2021-02-26 14:25:24 +00:00
Andy Wilkinson d48551ff12 Merge branch '2.3.x' into 2.4.x
Closes gh-25437
2021-02-25 17:32:40 +00:00
Stefan Wolf 86ca32e694 Enable stricter validation for Gradle plugin
See gh-25409
2021-02-25 17:28:51 +00:00
John Blum cec4d45cf6 Fix grammatical error in documentation
See gh-25411
2021-02-25 15:57:56 +01:00
Andy Wilkinson ecf8437d4a Merge branch '2.3.x' into 2.4.x
Closes gh-25430
2021-02-25 14:28:28 +00:00
dreis2211 101d88a840 Update Testcontainers image versions
See gh-25412
2021-02-25 14:27:41 +00:00
Andy Wilkinson b477312100 Upgrade to Testcontainers 1.15.2
Closes gh-25423
2021-02-25 13:51:44 +00:00
Andy Wilkinson 9af8ad432a Upgrade to MockK 1.10.6
Closes gh-25422
2021-02-25 13:51:43 +00:00
Andy Wilkinson 070d3d434c Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25421
2021-02-25 13:51:41 +00:00
Andy Wilkinson 5f0d72487e Upgrade to Testcontainers 1.15.2
Closes gh-25420
2021-02-25 13:50:16 +00:00
Andy Wilkinson ac78f55ba8 Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25419
2021-02-25 13:48:53 +00:00
Stephane Nicoll 7c5a5c6663 Merge branch '2.3.x' into 2.4.x
Closes gh-25385
2021-02-22 10:45:55 +01:00
Stephane Nicoll 77daae1480 Update copyright year of changed file
See gh-25382
2021-02-22 10:41:49 +01:00
Mustafa Ulu abc90db32f Fix wording error in build-info goal description
See gh-25382
2021-02-22 10:26:53 +01:00
Stephane Nicoll 9e6302ee6a Merge branch '2.3.x' into 2.4.x
Closes gh-25371
2021-02-19 12:49:40 +01:00
Tommy Ludwig bd2a890899 Polish HTTP client metrics documentation wording
See gh-25353
2021-02-19 12:48:56 +01:00
Stephane Nicoll 526474f3b8 Add username alias for Postgres's PGSimpleDataSource
Closes gh-25363
2021-02-18 14:07:05 +01:00
Andy Wilkinson bb56de715b Upgrade to Spring Security 5.4.5
This commit also downgrade JOSE JWT to address an incompatibility with
the OIDC SDK 8.x. The OIDC SDK has also been upgraded to the latest 8.x
release to align with the version used by Spring Security.

Closes gh-25221
Fixes gh-25070
2021-02-18 11:33:18 +00:00
Andy Wilkinson 08f73e01da Upgrade to Spring Kafka 2.6.6
Closes gh-25292
2021-02-18 11:31:18 +00:00
Andy Wilkinson 50a258a9ec Upgrade to Spring Integration 5.4.4
Closes gh-25289
2021-02-18 11:30:43 +00:00
Andy Wilkinson 332ab5e1c6 Upgrade to Spring AMQP 2.3.5
Closes gh-25290
2021-02-18 11:30:04 +00:00
Andy Wilkinson a2695f215c Upgrade to Spring Data 2020.0.5
Closes gh-25002
2021-02-18 11:29:22 +00:00
Andy Wilkinson 6eb51eb2c3 Start building against Spring Data 2020.0.5 snapshots
See gh-25002
2021-02-18 08:32:04 +00:00
Sébastien Deleuze 512efa1687 Refactor CacheConfigurations to avoid storing configuration classes
This commit refactors CacheConfigurations implementation to make
it more native friendly by storing strings instead of classes in
order to avoid loading the configuration classes
when CacheConfigurations is initialized at build time.

See gh-25321
2021-02-18 09:24:54 +01:00
Madhura Bhave b5e1787641 Make devtools securityFilterChain back-off in presence of WebSecurityConfigurerAdapter
Fixes gh-25147
2021-02-17 15:26:11 -08:00
Andy Wilkinson 3ad68a39b6 Upgrade to Spring Integration 5.3.6.RELEASE
Closes gh-25283
2021-02-17 22:28:20 +00:00
Madhura Bhave 00a358b4d3 Throw or warn for invalid config properties with list syntax
Fixes gh-25309
2021-02-17 12:45:37 -08:00
Andy Wilkinson bec065dfd3 Upgrade to Spring AMQP 2.2.15.RELEASE
Closes gh-25284
2021-02-17 18:12:59 +00:00
Andy Wilkinson 08e86741fd Don't scan for `@Persistent` types as they may not be meant for Neo4j
Closes gh-25069
2021-02-17 17:49:12 +00:00
Madhura Bhave 52a15647a9 Polish "Remove old documentation relating to yaml and profiles"
See gh-24620
2021-02-17 09:43:44 -08:00
Ramiro Aparicio 93f822e7b6 Remove old documentation relating to yaml and profiles
See gh-24620
2021-02-17 09:43:29 -08:00
Stephane Nicoll 5d1bb3025b Add username alias for H2's JdbcDataSource
Closes gh-25263
2021-02-17 17:40:34 +01:00
Andy Wilkinson 87efacf039 Upgrade to Spring HATEOAS 1.2.4
Closes gh-25341
2021-02-17 16:24:39 +00:00
Andy Wilkinson cc35ffbfd9 Upgrade to RxJava2 2.2.21
Closes gh-25340
2021-02-17 16:24:38 +00:00
Andy Wilkinson 299134fb14 Upgrade to JUnit 4.13.2
Closes gh-25339
2021-02-17 16:24:36 +00:00
Andy Wilkinson edc7253635 Upgrade to FreeMarker 2.3.31
Closes gh-25338
2021-02-17 16:24:35 +00:00
Andy Wilkinson 29d46c86c9 Upgrade to Spring Data Neumann-SR7
Closes gh-25282
2021-02-17 15:04:50 +00:00
Andy Wilkinson 0348b57b16 Upgrade to Spring HATEOAS 1.1.4.RELEASE
Closes gh-25337
2021-02-17 15:04:22 +00:00
Andy Wilkinson 6ce61c504d Upgrade to RxJava2 2.2.21
Closes gh-25336
2021-02-17 15:04:20 +00:00
Andy Wilkinson 92c82a4f54 Upgrade to JUnit 4.13.2
Closes gh-25335
2021-02-17 15:04:19 +00:00
Andy Wilkinson 74b33cce5e Upgrade to FreeMarker 2.3.31
Closes gh-25334
2021-02-17 15:04:18 +00:00
Andy Wilkinson a91f32d14e Temporarily work around breaking API change in Spring Data Couchbase
See gh-25002
2021-02-17 13:47:50 +00:00
Andy Wilkinson d922d0f859 Upgrade to Micrometer 1.6.4
Closes gh-25291
2021-02-17 12:47:15 +00:00
Andy Wilkinson 43c923b3d5 Upgrade to Micrometer 1.5.11
Closes gh-25285
2021-02-17 12:25:56 +00:00
Stephane Nicoll 44d765bd00 Upgrade to Spring Framework 5.3.4
Closes gh-24998
2021-02-16 15:16:00 +01:00
Stephane Nicoll 32f6719ec1 Upgrade to Spring Framework 5.2.13
Closes gh-25281
2021-02-16 15:15:13 +01:00
Stephane Nicoll f6b5964258 Merge branch '2.3.x' into 2.4.x
Closes gh-25312
2021-02-16 13:50:55 +01:00
Stephane Nicoll 0da7822e27 Update copyright of changed files
See gh-25265
2021-02-16 13:50:15 +01:00
melburne 2163c96205 Fix incorrect detection of Amazon Redshift
See gh-25265
2021-02-16 13:50:15 +01:00
Andy Wilkinson 0dbf907f73 Merge branch '2.3.x' into 2.4.x
Closes gh-25310
2021-02-16 12:43:20 +00:00
Andy Wilkinson 78941c32c4 Polish "Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used"
See gh-25279
2021-02-16 12:08:08 +00:00
Eddú Meléndez c55200d19a Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used
See gh-25279
2021-02-16 12:06:09 +00:00
Andy Wilkinson b86351d0cf Merge branch '2.3.x' into 2.4.x
Closes gh-25307
2021-02-16 11:30:03 +00:00
Andy Wilkinson a2adb877ee Polish "Encourage use of maven-publish plugin in Gradle docs"
See gh-25299
2021-02-16 11:22:47 +00:00
Robert Smith c0a5245a3e Encourage use of maven-publish plugin in Gradle docs
See gh-25299
2021-02-16 11:19:27 +00:00
Andy Wilkinson 29af4b953f Add dependency management for new hibernate-micrometer module
Fixes gh-25277
2021-02-16 11:09:02 +00:00
Andy Wilkinson c3cdfec9cb Merge branch '2.3.x' into 2.4.x
Closes gh-25305
2021-02-16 10:37:05 +00:00
Andy Wilkinson f907dc2f58 Add dependency management for new hibernate-micrometer module
Fixes gh-25277
2021-02-16 10:36:30 +00:00
Andy Wilkinson 55e3ca66e2 Replace native image system property with call to NativeDetector
Closes gh-25303
2021-02-16 10:34:34 +00:00
Stephane Nicoll dcbc3a29aa Upgrade to Reactor 2020.0.4
Closes gh-25286
2021-02-16 08:49:23 +01:00
Stephane Nicoll 98964990d4 Upgrade to Reactor Dysprosium-SR17
Closes gh-25280
2021-02-16 08:47:30 +01:00
Stephane Nicoll a9ff33f74f Merge branch '2.3.x' into 2.4.x
Closes gh-25297
2021-02-15 14:15:42 +01:00
Stephane Nicoll 569002e917 Polish "Document Kafka Streams metrics support"
See gh-25272
2021-02-15 14:11:34 +01:00
izeye dff4ca2293 Document Kafka Streams metrics support
See gh-25272
2021-02-15 14:07:39 +01:00
Stephane Nicoll 3f9f9a4637 Polish "Start building against Spring Data Neumann-SR7 snapshots"
See gh-25282
2021-02-15 13:46:39 +01:00
Stephane Nicoll 0bc03c7141 Associate application classloader to auto-configured Hazelcast instance
Closes gh-24836
2021-02-15 10:08:23 +01:00
Stephane Nicoll 5576f26115 Start building against Spring Kafka 2.6.6 snapshots
See gh-25292
2021-02-15 07:24:17 +01:00
Stephane Nicoll 67e1b64a23 Start building against Micrometer 1.6.4 snapshots
See gh-25291
2021-02-15 07:23:45 +01:00
Stephane Nicoll f8caab121d Start building against Spring AMQP 2.3.5 snapshots
See gh-25290
2021-02-15 07:23:22 +01:00
Stephane Nicoll 8a4f49c30b Start building against Spring Integration 5.4.4 snapshots
See gh-25289
2021-02-15 07:22:43 +01:00
Stephane Nicoll 31a98f90c8 Start building against Reactor 2020.0.4 snapshots
See gh-25286
2021-02-15 07:19:53 +01:00
Stephane Nicoll bab0862fdd Start building against Micrometer 1.5.11 snapshots
See gh-25285
2021-02-15 06:55:42 +01:00
Stephane Nicoll 080bec0b20 Start building against Spring AMQP 2.2.15 snapshots
See gh-25284
2021-02-15 06:55:42 +01:00
Stephane Nicoll 1004617d2f Start building against Spring Integration 5.3.6 snapshots
See gh-25283
2021-02-15 06:55:42 +01:00
Stephane Nicoll f1dda97900 Start building against Spring Data Neumann-SR7 snapshots
See gh-25282
2021-02-15 06:55:40 +01:00
Stephane Nicoll 33736e818b Start building against Spring Framework 5.2.13 snapshots
See gh-25281
2021-02-15 06:52:34 +01:00
Stephane Nicoll 2c2fedc156 Start building against Reactor Dysprosium-SR17 snapshots
See gh-25280
2021-02-15 06:52:00 +01:00
Stephane Nicoll 61e9d04c68 Update copyright of changes files
See gh-25266
2021-02-14 09:35:36 +01:00
izeye f48893def5 Polish 2021-02-14 09:34:30 +01:00
Stephane Nicoll 3471adcf09 Merge branch '2.3.x' into 2.4.x 2021-02-14 09:32:21 +01:00
Stephane Nicoll b7f5f5cac0 Polish
See gh-25266
2021-02-14 09:29:48 +01:00
Andy Wilkinson 392be57003 Apply Logback system properties and not just common properties to context
Closes gh-24894
2021-02-12 14:34:31 +00:00
Andy Wilkinson 5a21395b0b Upgrade to Undertow 2.2.4.Final
Closes gh-25224
2021-02-12 11:27:00 +00:00
Andy Wilkinson 28fc2b1d52 Upgrade to Tomcat 9.0.43
Closes gh-25223
2021-02-12 11:26:59 +00:00
Andy Wilkinson 58c823ef22 Upgrade to Spring Session Bom 2020.0.3
Closes gh-25222
2021-02-12 11:26:59 +00:00
Andy Wilkinson 51ca7d67ba Upgrade to Netty 4.1.59.Final
Closes gh-25220
2021-02-12 10:07:00 +00:00
Andy Wilkinson ca24fd1437 Upgrade to MySQL 8.0.23
Closes gh-25219
2021-02-12 10:06:59 +00:00
Andy Wilkinson 5dfe3ccc89 Upgrade to MariaDB 2.7.2
Closes gh-25218
2021-02-12 10:06:58 +00:00
Andy Wilkinson d7cc673ac0 Upgrade to Lombok 1.18.18
Closes gh-25217
2021-02-12 10:06:57 +00:00
Andy Wilkinson d50be39bee Upgrade to JUnit Jupiter 5.7.1
Closes gh-25215
2021-02-12 10:06:54 +00:00
Andy Wilkinson 636a99ecd3 Upgrade to jOOQ 3.14.7
Closes gh-25214
2021-02-12 10:06:53 +00:00
Andy Wilkinson d2630151ce Upgrade to Johnzon 1.2.10
Closes gh-25213
2021-02-12 10:06:51 +00:00
Andy Wilkinson 1c2265feac Upgrade to Jetty 9.4.36.v20210114
Closes gh-25212
2021-02-12 10:06:50 +00:00
Andy Wilkinson 1ceba0910b Upgrade to Jaybird 3.0.10
Closes gh-25211
2021-02-12 10:06:49 +00:00
Andy Wilkinson 7d5484e9d1 Upgrade to Janino 3.1.3
Closes gh-25210
2021-02-12 10:06:48 +00:00
Andy Wilkinson d5cb97984f Upgrade to Infinispan 11.0.9.Final
Closes gh-25209
2021-02-12 10:06:47 +00:00
Andy Wilkinson 8f1bda83be Upgrade to Hibernate 5.4.28.Final
Closes gh-25208
2021-02-12 10:06:46 +00:00
Andy Wilkinson bd24553f7e Upgrade to Byte Buddy 1.10.20
Closes gh-25207
2021-02-12 10:06:45 +00:00
Andy Wilkinson fc4c101503 Upgrade to AppEngine SDK 1.9.86
Closes gh-25206
2021-02-12 10:06:44 +00:00
Andy Wilkinson 1adc4118da Upgrade to ActiveMQ 5.16.1
Closes gh-25205
2021-02-12 10:06:42 +00:00
Andy Wilkinson 63de8dec1f Upgrade to Undertow 2.1.6.Final
Closes gh-25204
2021-02-12 09:28:27 +00:00
Andy Wilkinson b1dd3fb827 Upgrade to Tomcat 9.0.43
Closes gh-25203
2021-02-12 09:28:26 +00:00
Andy Wilkinson aaad1613dc Upgrade to Spring Session Bom Dragonfruit-SR2
Closes gh-25202
2021-02-12 09:28:25 +00:00
Andy Wilkinson 13cbc1a80b Upgrade to Spring Security 5.3.8.RELEASE
Closes gh-25201
2021-02-12 09:28:23 +00:00
Andy Wilkinson 8e86957efc Upgrade to Netty 4.1.59.Final
Closes gh-25200
2021-02-12 09:28:22 +00:00
Andy Wilkinson f728367785 Upgrade to Neo4j OGM 3.2.20
Closes gh-25199
2021-02-12 09:28:21 +00:00
Andy Wilkinson e3bed12a16 Upgrade to MySQL 8.0.23
Closes gh-25198
2021-02-12 09:28:20 +00:00
Andy Wilkinson aa5e33bc83 Upgrade to Lombok 1.18.18
Closes gh-25197
2021-02-12 09:28:19 +00:00
Andy Wilkinson 97d4837feb Upgrade to Johnzon 1.2.10
Closes gh-25196
2021-02-12 09:28:18 +00:00
Andy Wilkinson 87404581b9 Upgrade to Jetty 9.4.36.v20210114
Closes gh-25195
2021-02-12 09:28:17 +00:00
Andy Wilkinson 05d805ad60 Upgrade to Jaybird 3.0.10
Closes gh-25194
2021-02-12 09:28:15 +00:00
Andy Wilkinson 3ada6e9304 Upgrade to Janino 3.1.3
Closes gh-25193
2021-02-12 09:28:14 +00:00
Andy Wilkinson adc601b72c Upgrade to Hibernate 5.4.28.Final
Closes gh-25192
2021-02-12 09:28:13 +00:00
Andy Wilkinson 4b6418f11f Upgrade to Hazelcast 3.12.12
Closes gh-25191
2021-02-12 09:28:12 +00:00
Andy Wilkinson 88afda03a3 Upgrade to Byte Buddy 1.10.20
Closes gh-25190
2021-02-12 09:28:11 +00:00
Andy Wilkinson fa6c749215 Upgrade to AppEngine SDK 1.9.86
Closes gh-25189
2021-02-12 09:28:10 +00:00
Andy Wilkinson 9ba28a8b99 Merge branch '2.3.x' into 2.4.x
Closes gh-25185
2021-02-11 20:12:30 +00:00
Andy Wilkinson bd64e05203 Instrument AMQP AbstractCF when defined as a ConnectionFactory
Fixes gh-25138
2021-02-11 20:09:40 +00:00
Stephane Nicoll 75fc896321 Avoid Illegal reflective access warnings with devtools
This commit improves RestartClassLoader to use a method introduced in
SmartClassLoader to avoid triggering a warning on Java 11 and later.

See https://github.com/spring-projects/spring-framework/issues/26403

Closes gh-24857
2021-02-11 13:55:10 +01:00
Andy Wilkinson 698672e1cb Merge branch '2.3.x' into 2.4.x
Closes gh-25182
2021-02-11 10:23:20 +00:00
Andy Wilkinson 82dc2dffbd Select specific CLI distribution in CLI's integration tests
Previously, CommandLineInvoker would use the first -bin.zip file found
in build/distributions. If this directory contained multiple zips from
building different versions of Spring Boot, this could result in the
tests being run against the wrong version of the CLI.

This commit updates CommandLineInvoker look for a specific zip in
build/distributions, using the version from gradle.properties to
identify it.

Closes gh-25179
2021-02-11 10:20:30 +00:00
Andy Wilkinson 9da3b65ff3 Merge branch '2.3.x' into 2.4.x
Closes gh-25174
2021-02-10 19:41:56 +00:00
Andy Wilkinson 708cbd7294 Ignore events from other contexts when waiting for DS init to complete
Fixes gh-24966
2021-02-10 15:07:44 +00:00
Stephane Nicoll 46bc551c2b Merge branch '2.3.x' into 2.4.x
Closes gh-25169
2021-02-10 15:14:21 +01:00
Stephane Nicoll 1524793a92 Fix use of deprecated Cassandra properties in integration tests
Closes gh-25148
2021-02-10 15:12:20 +01:00
Andy Wilkinson 45e6c12cb6 Consider transitives when identifying project dependencies
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.

This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.

Fixes gh-25163
2021-02-10 12:10:07 +00:00
Stephane Nicoll 7cb1605c11 Merge branch '2.3.x' into 2.4.x
Closes gh-25166
2021-02-10 10:45:54 +01:00
Stephane Nicoll e5098697cb Polish "Validate Cassandra defaults"
See gh-25130
2021-02-10 10:18:28 +01:00
bono007 f71ab69aeb Validate Cassandra defaults
See gh-25130
2021-02-10 10:15:31 +01:00
Stephane Nicoll acc8f3708b Update copyright of changed file
See gh-25150
2021-02-10 09:37:04 +01:00
bono007 4ef82c45ac Fix defaults for Cassandra's initQueryTimeout and idleTimeout
See gh-25150
2021-02-10 09:36:17 +01:00
Andy Wilkinson caa9249987 Merge branch '2.3.x' into 2.4.x
Closes gh-25142
2021-02-09 14:11:59 +00:00
Andy Wilkinson 7898b6afb0 Remove duplicate publication from spring-boot-docs
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll 9218965104 Merge branch '2.3.x' into 2.4.x
Closes gh-25140
2021-02-09 15:04:28 +01:00
dreis2211 4937547b8a Fix build deprecation warnings about duplicate jar entries
See gh-25116
2021-02-09 14:45:58 +01:00
izeye 63ee99bf75 Polish
See gh-25093
2021-02-09 09:48:35 +01:00
Stephane Nicoll b2818680fd Polish "Clarify usage of BufferingApplicationStartup"
See gh-25075
2021-02-09 09:44:19 +01:00
Oleg Sukhov 853dbc3de3 Clarify usage of BufferingApplicationStartup
See gh-25075
2021-02-09 09:21:52 +01:00
Andy Wilkinson 297e3079d0 Fix handling of UriTemplateRequestEntity in TestRestTemplate
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.

This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.

Fixes gh-25097

[1] a0f4d81db7
2021-02-04 10:59:00 +00:00
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb 230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb 630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb 331c7b756b Merge branch '2.3.x' into 2.4.x 2021-02-01 19:46:49 -08:00
Phillip Webb c404a50a2e Allow test to use snapshot/milestone repo
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.

See gh-23936
2021-02-01 19:45:11 -08:00
Phillip Webb 003f2f9521 Merge branch '2.3.x' into 2.4.x 2021-02-01 17:07:07 -08:00
Phillip Webb faaa5e4186 Fix BOM attached sourceSet
See gh-23936
2021-02-01 16:51:53 -08:00
Phillip Webb db52bf3d7a Merge branch '2.3.x' into 2.4.x
Closes gh-25078
2021-02-01 16:35:46 -08:00
Phillip Webb 40c1748e3c Remove hardcoded versions from MavenBuild
Use the dependencies BOM to ensure versions used in the `MavenBuild`
test class are always aligned.

Closes gh-23936
2021-02-01 16:20:55 -08:00
Phillip Webb 257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb 939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
2021-02-01 15:31:28 -08:00
Andy Wilkinson 79c0597aa2 Merge branch '2.3.x' into 2.4.x
Closes gh-25072
2021-02-01 15:39:19 +00:00
Andy Wilkinson 3585d20453 Include IDialect beans in WebFluxTest and WebMvcTest
Fixes gh-24149
2021-02-01 15:03:08 +00:00
Phillip Webb 57f1f17320 Merge branch '2.3.x' into 2.4.x
Closes gh-25066
2021-01-30 17:57:53 -08:00
Phillip Webb 187258aa6a Fix classpath.idx format documentation
Since 2.3.8 and 2.4.2 the format includes the directory.

Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb 9ac5151932 Merge branch '2.3.x' into 2.4.x
Closes gh-25064
2021-01-30 17:46:10 -08:00
Phillip Webb 19c5864d2c Clarify square bracket map binding notation
Update reference docs to make it clearer when the square bracket map
binding notation should be used.

Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb d7c44e4503 Merge branch '2.3.x' into 2.4.x
Closes gh-25061
2021-01-30 17:04:10 -08:00
Phillip Webb 549d4f7fbe Document that Spring MVC has own ConversionService
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.

Closes gh-22718
2021-01-30 17:03:55 -08:00
Phillip Webb 77478d9f34 Refine CharSequenceToObjectConverter logic
Update `CharSequenceToObjectConverter` so that conversion that would
apply using an `ObjectTo...` converter now favors `toString()` based
conversion.

Prior to this commit, when converting a `CharSequence` to a `Collection`
the `ObjectToCollectionConveter` would be picked instead of the
`StringToCollectionConverter`. This resulted in a `Collection`
containing a single `String` value, rather than the expected list
of values split around ",".

Fixes gh-25057
2021-01-30 12:35:36 -08:00
Phillip Webb dd997cda9c Remove sysout from test 2021-01-30 10:38:02 -08:00
Andy Wilkinson a3058200cb Merge branch '2.3.x' into 2.4.x
Closes gh-25050
2021-01-29 09:06:42 +00:00
dreis2211 4940694db2 Fix duplicate anchor id
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb 2d056525d8 Merge branch '2.3.x' into 2.4.x
Closes gh-25044
2021-01-28 19:28:56 -08:00
Phillip Webb c03d8773e7 Improve logging.register-shutdown-hook docs
Update the "Logging" reference documentation with a section about
shutting down the logging system.

Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb ca9b612e27 Merge branch '2.3.x' into 2.4.x
Closes gh-25042
2021-01-28 18:56:59 -08:00
jongmin92 23ecb86089 Document missing code to run Gradle bootRun task
See gh-25012
2021-01-28 18:56:21 -08:00
Phillip Webb c86ee4c851 Merge branch '2.3.x' into 2.4.x
Closes gh-25040
2021-01-28 18:48:51 -08:00
Phillip Webb 5b2d1f19a0 Polish 'Add note about exploded jars and banner properties'
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith 33c038199d Add note about exploded jars and banner properties
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb 53f1aab833 Merge branch '2.3.x' into 2.4.x
Closes gh-25038
2021-01-28 18:00:42 -08:00
Phillip Webb 60bb33f231 Polish 'Add a tip about actuator endpoints'
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang 6ced1d7f4e Add a tip about actuator endpoints
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
2021-01-28 17:53:04 -08:00
Phillip Webb 0fcc52ccaf Protect against NPE with Option.IGNORE_IMPORTS
Update `ConfigDataEnvironmentContributor` to deal with the fact that
the `properties` instance can be `null`.

Fixes gh-25029
2021-01-27 14:17:41 -08:00
Phillip Webb 7f32fa6723 Allow 'on-profile' in profile specific files
Restore the ability to use `spring.config.activate.on-profile` or
`spring.profiles` in profile specific files.

Closes gh-24990
2021-01-27 14:07:02 -08:00
Phillip Webb d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb 99f7bc1aba Build against Spring Data 2020.0.4-SNAPSHOT
See gh-25002
2021-01-26 17:35:54 -08:00
Phillip Webb d95d7a0245 Update code for Spring Framework 5.3.4
See gh-24998
2021-01-26 17:35:54 -08:00
Phillip Webb b7ae5558f6 Build against Spring Framework 5.3.4-SNAPSHOT
See gh-24998
2021-01-26 17:31:27 -08:00
Phillip Webb 1def245a2c Support DeferredLogFactory injection
Update `ConfigDataLoader` and `ConfigDataLocationResolver` to support
`DeferredLogFactory` injection.

Closes gh-24988
2021-01-25 23:13:01 -08:00
Phillip Webb 522f68cb40 Merge branch '2.3.x' into 2.4.x
Closes gh-24994
2021-01-25 21:36:12 -08:00
Phillip Webb 464b302655 Set withTestKitDir per Gradle version
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
2021-01-25 21:35:25 -08:00
Andy Wilkinson 9c8645dec2 Merge branch '2.3.x' into 2.4.x
Closes gh-24975
2021-01-22 14:59:23 +00:00
Andy Wilkinson 46d908f632 Upgrade to Gradle 6.8.1
Closes gh-24737
2021-01-22 14:20:57 +00:00
Andy Wilkinson 5362633014 Merge branch '2.3.x' into 2.4.x
Closes gh-24973
2021-01-22 13:32:30 +00:00
Andy Wilkinson 0b06ac9938 Use AssertJ's doesNotContainKey
Closes gh-24970
2021-01-22 13:28:41 +00:00
Phillip Webb 69fbd2f8aa Delegate `usesPathPatterns()` call to mappings
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method
returns `true` if any of the delegate mappings return `true`.

Closes gh-24877
2021-01-20 13:49:18 -08:00
Stephane Nicoll 3e376b955d Fix build failure
See gh-24943
2021-01-20 14:41:12 +01:00
Stephane Nicoll 56ce5bdf44 Merge branch '2.3.x' into 2.4.x
See gh-24943
2021-01-20 14:06:39 +01:00
Stephane Nicoll 244a6ac7e5 Polish "Deprecate Spring Data Solr"
See gh-24942
2021-01-20 14:02:59 +01:00
Stephane Nicoll 85729d2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-24943
2021-01-20 13:57:18 +01:00
Stephane Nicoll 10b4cb8cb5 Deprecate Spring Data Solr support
Closes gh-24942
2021-01-20 13:56:50 +01:00
Phillip Webb 80dbbaf012 Add ConfigData IGNORE_PROFILES support
Add a new `ConfigData.Option` that allows profile properties to be
ignored. This update will allow Spring Cloud Config Server to provide
`ConfigData` that only has profile properties processed on the
server-side.

Closes gh-24890
2021-01-19 18:13:24 -08:00
Andy Wilkinson 7b4fbd2c85 Document WebMvcProperties.MatchingStrategt as being since 2.4.0
Closes gh-24875
2021-01-19 13:22:00 +00:00
Andy Wilkinson 3ad2832cb2 Fix pattern extraction when MVC is using a PathPatternParser
Fixes gh-24874
2021-01-19 10:34:11 +00:00
Stephane Nicoll 59b01324ae Merge branch '2.3.x' into 2.4.x
Closes gh-24872
2021-01-18 17:08:36 +01:00
Stephane Nicoll 1ad5a3fe2e Update copyright of changed file
See gh-24753
2021-01-18 17:01:31 +01:00
izeye ddfa1e632b Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures
See gh-24753
2021-01-18 17:00:26 +01:00
izeye 21db14227c Fix property name for spring.dao.exceptiontranslation.enabled
See gh-24867
2021-01-18 14:41:41 +01:00
dreis2211 b8b5e4cebf Fix configuration metadata for logging.charset.* properties
See gh-24851
2021-01-17 17:02:24 +01:00
Stephane Nicoll 7ec7569939 Merge branch '2.3.x' into 2.4.x
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll 9343633582 Merge branch '2.3.x' into 2.4.x 2021-01-15 08:25:27 +01:00
Stephane Nicoll 9a53865c8f Polish 2021-01-15 08:24:57 +01:00
Phillip Webb 26f2caca22 Update copyright year of changed files 2021-01-14 17:25:09 -08:00
Phillip Webb c0aef4c35f Apply SystemProperties to LoggerContext
Update `LoggingSystemProperties` so that system environment properties
are also applied to the `LoggerContext`. This is required when multiple
applications are deployed to the same Servlet container. In such setups
there's only a single JVM and the System Environment can be changed
when multiple applications start at the same time.

Fixes gh-24835
2021-01-14 17:22:37 -08:00
Madhura Bhave 68fc2329c8 Revert "Remove unnecessary code"
Fixes gh-24835
2021-01-14 16:13:30 -08:00
Brian Clozel 6f51831001 Fix docs on probe state during graceful shutdown
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.

Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll dda8b5d287 Revert "Upgrade to Kafka 2.6.1"
See gh-24247
2021-01-14 18:03:09 +01:00
Stephane Nicoll 2072e7242a Merge branch '2.3.x' into 2.4.x
Closes gh-24841
2021-01-14 18:02:28 +01:00
Stephane Nicoll 283ed48d63 Unwrap Datasource against an actual interface
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.

Closes gh-24697
2021-01-14 18:00:35 +01:00
Stephane Nicoll 5d85ac6838 Complete configuration metadata for spring.config.*
Closes gh-24816
2021-01-14 10:54:51 +01:00
Stephane Nicoll 3aa960a060 Upgrade to Spring Kafka 2.6.5
Closes gh-24703
2021-01-14 08:54:02 +01:00
Stephane Nicoll d6d0abcfd5 Upgrade to Spring AMQP 2.3.4
Closes gh-24702
2021-01-14 08:53:30 +01:00
Stephane Nicoll da8a8b9712 Upgrade to Spring Integration 5.4.3
Closes gh-24701
2021-01-14 08:52:51 +01:00
Stephane Nicoll bb33574ad4 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24829
2021-01-14 08:52:16 +01:00
Stephane Nicoll e73c124b2d Upgrade to Netty 4.1.58.Final
Closes gh-24828
2021-01-14 08:52:15 +01:00
Stephane Nicoll 27162bc3b9 Upgrade to Dependency Management Plugin 1.0.11.RELEASE
Closes gh-24827
2021-01-14 08:52:14 +01:00
Stephane Nicoll 3ecd1001a1 Upgrade to Spring Kafka 2.5.11.RELEASE
Closes gh-24826
2021-01-14 08:38:29 +01:00
Stephane Nicoll 696539c68f Upgrade to Spring Integration 5.3.5.RELEASE
Closes gh-24825
2021-01-14 08:38:27 +01:00
Stephane Nicoll 8908969a6c Upgrade to Spring AMQP 2.2.14.RELEASE
Closes gh-24824
2021-01-14 08:38:26 +01:00
Stephane Nicoll 92f132ae35 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24823
2021-01-14 08:38:25 +01:00
Stephane Nicoll 6f9e3a6e94 Upgrade to Netty 4.1.58.Final
Closes gh-24822
2021-01-14 08:38:24 +01:00
Stephane Nicoll 1dd445b6ca Upgrade to Dependency Management Plugin 1.0.11.RELEASE
Closes gh-24821
2021-01-14 08:38:23 +01:00
Madhura Bhave ceff47afba Fix ordering of properties and yaml files
Fixes gh-24719
2021-01-13 15:17:12 -08:00
Stephane Nicoll 9a48423a1d Upgrade to Spring Data 2020.0.3
Closes gh-24700
2021-01-13 17:50:18 +01:00
Stephane Nicoll e01fdf91bd Upgrade to Spring HATEOAS 1.2.3
Closes gh-24803
2021-01-13 14:05:40 +01:00
Stephane Nicoll f9e59abe8b Upgrade to Lettuce 6.0.2.RELEASE
Closes gh-24802
2021-01-13 14:05:39 +01:00
Stephane Nicoll beec43cda5 Upgrade to Micrometer 1.6.3
Closes gh-24786
2021-01-13 14:04:33 +01:00
Stephane Nicoll 6d5d8cbc2c Upgrade to Lettuce 5.3.6.RELEASE
Closes gh-24801
2021-01-13 14:02:36 +01:00
Stephane Nicoll 6b353aee8d Upgrade to Micrometer 1.5.10
Closes gh-24785
2021-01-13 14:01:19 +01:00
Andy Wilkinson a95a7e3d40 Allow restart to be enabled when CL not named AppClassLoader
Previously, the restart initializer that enables restart when
-Dspring.devtools.restart.enabled=true is set had no effect when the
ClassLoader's name did not contain AppClassLoader. This commit updates
RestartApplicationListener to use the correct RestartInitializer when
the system property has forcibly enabled restart.

When restart is enabled a SilentExitException is thrown and it should be
caught and handled by the SilentExitExceptionHandler. When the
application is invoked via one of the loader's LauncherClasses
reflection is used and this exception becomes wrapped in an
InvocationTargetEception. Previously, this wrapping prevented
SilentExitExceptionHandler from handling the exception. This commit
updates the handler to look for an InvocationTargetException with a
SilentExitException target in addition to continuing to look for a
SilentExitException directly.

Fixes gh-24797
2021-01-13 10:12:12 +00:00
Phillip Webb 26f143b8d3 Support @Name annotation on /actuator/configprops
Update `ConfigurationPropertiesReportEndpoint` so that supports
constructor parameters annotated with `@Name`.

Fixes gh-24713
2021-01-12 17:38:17 -08:00
Phillip Webb 6c2ff56fba Fix tests to also work in IDE 2021-01-12 17:31:53 -08:00
Scott Frederick a9e711e503 Enforce builder and run images in the same registry
Previously, when an authenticated Docker builder registry was
configured in the Maven or Gradle plugin and the builder and run
images specified different registries, the authentication credentials
would be sent to both registries. This could cause confusion if both
registries don't recognize the same credentials. This commit enforces
that both images are in the same registry when authentication
is configured.

Fixes gh-24552
2021-01-12 17:50:28 -06:00
Phillip Webb a6a7c06e55 Merge branch '2.3.x' into 2.4.x 2021-01-12 12:04:11 -08:00
Phillip Webb 9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Phillip Webb b6cb9c016f Detect bad properties in profile specific files
Throw an `InvalidConfigDataPropertyException` if bad properties are
detected in profile specific files. The following properties will now
trigger an exception if used in a profile specific file:

	`spring.profiles.include`
	`spring.profiles.active`
	`spring.profiles.default`
	`spring.config.activate.on-profile`
	`spring.profiles`

Prior to this commit, profile based properties in a profile specific
file would be silently ignored, making them hard to find.

Fixes gh-24733
2021-01-12 11:48:19 -08:00
Madhura Bhave 5ed2b11e34 Fix typo 2021-01-12 10:59:59 -08:00
Andy Wilkinson 5cae1a2842 Merge branch '2.3.x' into 2.4.x
Closes gh-24790
2021-01-12 16:03:48 +00:00
Andy Wilkinson 7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available
Fixes gh-24624
2021-01-12 15:47:33 +00:00
Stephane Nicoll c5d4ca933b Upgrade to Reactor Dysprosium-SR16
Closes gh-24765
2021-01-12 15:00:11 +01:00
Andy Wilkinson c3dfb9bd29 Merge branch '2.3.x' into 2.4.x
Closes gh-24768
2021-01-12 13:12:10 +00:00
Andy Wilkinson 997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
Fixes gh-24618
2021-01-12 13:11:46 +00:00
Stephane Nicoll f02951fb17 Upgrade to Netty 4.1.56.Final
Closes gh-24764
2021-01-12 09:55:44 +01:00
Stephane Nicoll 2e69198f97 Upgrade to Neo4j OGM 3.2.19
Closes gh-24763
2021-01-12 09:55:43 +01:00
Stephane Nicoll 5fb1ca6043 Upgrade to Johnzon 1.2.9
Closes gh-24762
2021-01-12 09:55:41 +01:00
Stephane Nicoll 37f653121f Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24761
2021-01-12 09:55:40 +01:00
Stephane Nicoll 3ae9639cbb Upgrade to Jackson Bom 2.11.4
Closes gh-24760
2021-01-12 09:55:38 +01:00
Stephane Nicoll 371e59cd80 Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24759
2021-01-12 09:55:37 +01:00
Stephane Nicoll e48e48988a Upgrade to Hibernate 5.4.27.Final
Closes gh-24758
2021-01-12 09:55:35 +01:00
Stephane Nicoll 66daeab221 Upgrade to Hazelcast 3.12.11
Closes gh-24757
2021-01-12 09:55:34 +01:00
Stephane Nicoll 682c952306 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24756
2021-01-12 09:55:32 +01:00
Stephane Nicoll 7ab9fad062 Upgrade to Byte Buddy 1.10.19
Closes gh-24755
2021-01-12 09:55:31 +01:00
Stephane Nicoll b3bc79b10f Upgrade to AppEngine SDK 1.9.84
Closes gh-24754
2021-01-12 09:55:29 +01:00
Stephane Nicoll 8058370f3e Upgrade to Spring Framework 5.3.3
Closes gh-24699
2021-01-12 08:28:33 +01:00
Phillip Webb bd21c43d71 Simplify resource registration
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
2021-01-11 16:40:42 -08:00
Phillip Webb f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x
Closes gh-24748
2021-01-11 14:53:57 -08:00
Phillip Webb 72dd3b5628 Merge branch '2.2.x' into 2.3.x
Closes gh-24747
2021-01-11 14:21:56 -08:00
Phillip Webb f9e3e0d532 Register default resource path using a Resource
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
2021-01-11 14:20:46 -08:00
Phillip Webb 53a6fa2fed Respect spring.dao.exceptiontranslation setting
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.

Fixes gh-24321
2021-01-11 13:57:47 -08:00
Phillip Webb cff3e4c831 Fix tests following upstream framework changes 2021-01-11 13:39:21 -08:00
Phillip Webb 039df1d96d Test spring.profiles.include in profile file
Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.

See gh-24733
2021-01-11 12:04:14 -08:00
Phillip Webb 26a68ca2cf Polish 2021-01-11 12:04:07 -08:00
Stephane Nicoll 31de36565f Upgrade to Reactor 2020.0.3
Closes gh-24698
2021-01-11 16:29:13 +01:00
Andy Wilkinson 5ae9fbedcd Merge branch '2.3.x' into 2.4.x
Closes gh-24738
2021-01-11 11:33:30 +00:00
Andy Wilkinson 7625a979db Configure bootRun to use project's Java toolchain by default
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
2021-01-11 11:21:53 +00:00
Andy Wilkinson 3c3aa9e486 Merge branch '2.3.x' into 2.4.x
Closes gh-24735
2021-01-11 11:03:35 +00:00
Andy Wilkinson 064de4e073 Check configured JavaLauncher when determining version of the JVM
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.

This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.

Fixes gh-24512
2021-01-11 10:36:16 +00:00
Stephane Nicoll 097f878981 Upgrade to Kafka 2.6.1
Closes gh-24247
2021-01-11 09:20:59 +01:00
Stephane Nicoll 50019a7f44 Upgrade to Thymeleaf Layout Dialect 2.5.2
Closes gh-24731
2021-01-11 09:20:24 +01:00
Stephane Nicoll aad3de2ba7 Upgrade to Spring Retry 1.3.1
Closes gh-24730
2021-01-11 09:20:22 +01:00
Stephane Nicoll d7e6f963ab Upgrade to Netty 4.1.56.Final
Closes gh-24729
2021-01-11 09:20:20 +01:00
Stephane Nicoll 5f63b22286 Upgrade to Johnzon 1.2.9
Closes gh-24728
2021-01-11 09:20:19 +01:00
Stephane Nicoll 8867544d0d Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24727
2021-01-11 09:20:17 +01:00
Stephane Nicoll fc6fa74691 Upgrade to Jackson Bom 2.11.4
Closes gh-24726
2021-01-11 09:20:16 +01:00
Stephane Nicoll d691d63b1e Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24725
2021-01-11 09:20:14 +01:00
Stephane Nicoll bc0a1ff852 Upgrade to Hibernate 5.4.27.Final
Closes gh-24724
2021-01-11 09:20:13 +01:00
Stephane Nicoll 487f694872 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24723
2021-01-11 09:20:11 +01:00
Stephane Nicoll a60b5e0f70 Upgrade to Byte Buddy 1.10.19
Closes gh-24722
2021-01-11 09:20:10 +01:00
Stephane Nicoll 180493422d Upgrade to AppEngine SDK 1.9.84
Closes gh-24721
2021-01-11 09:20:08 +01:00
Andy Wilkinson 9e389c8376 Merge branch '2.3.x' into 2.4.x
Closes gh-24710
2021-01-08 17:07:45 +00:00
Andy Wilkinson 5ad4d627fd Fix classpath index so entries match those expected by the launcher
This reverts commit ad164269e9 and adds
some additional tests.

Fixes gh-24192
2021-01-08 15:32:19 +00:00
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x
Closes gh-24707
2021-01-08 15:53:53 +01:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
2021-01-08 15:50:16 +01:00
Stephane Nicoll 40f1f9a25c Start building against Spring Kafka 2.6.5 snapshots
See gh-24703
2021-01-08 09:24:42 +01:00
Stephane Nicoll a27b87a118 Start building against Spring AMQP 2.3.3 snapshots
See gh-24702
2021-01-08 09:23:34 +01:00
Stephane Nicoll 0bfb072467 Start building against Spring Integration 5.4.3 snapshots
See gh-24701
2021-01-08 09:22:59 +01:00
Stephane Nicoll 5bfc0285c6 Start building against Spring Data 2020.0.3 snapshots
See gh-24700
2021-01-08 09:22:03 +01:00
Stephane Nicoll 11d20eba82 Start building against Spring Framework 5.3.3 snapshots
See gh-24699
2021-01-08 08:36:21 +01:00
Stephane Nicoll 9f70b71036 Start building against Reactor 2020.0.3 snapshots
See gh-24698
2021-01-08 08:35:34 +01:00
Scott Frederick 210438ee5b Merge branch '2.3.x' into 2.4.x
Closes gh-24689
2021-01-07 15:59:37 -06:00
Scott Frederick a302238e21 Remove layout parameters from build-image Maven goal
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
2021-01-07 15:59:02 -06:00
Scott Frederick ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
2021-01-07 10:29:13 -06:00
asheCarry 17c0c7d9d6 Fix javadoc typo in ConfigDataLocation
See gh-24660
2021-01-06 17:39:39 -08:00
Phillip Webb 48661e79f5 Merge branch '2.3.x' into 2.4.x
Closes gh-24683
2021-01-06 17:30:55 -08:00
Phillip Webb 7cbd57b635 Log FailureAnalyzer errors at trace level
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
2021-01-06 17:29:24 -08:00
Phillip Webb 76aa33b65a Merge branch '2.3.x' into 2.4.x 2021-01-06 17:01:53 -08:00
Phillip Webb a24ec9d372 Merge branch '2.2.x' into 2.3.x 2021-01-06 17:01:22 -08:00
Phillip Webb 46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
2021-01-06 16:58:05 -08:00
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x
Closes gh-24681
2021-01-06 16:47:24 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
2021-01-06 16:45:10 -08:00
Madhura Bhave 920136d908 Merge branch '2.3.x' into 2.4.x
Closes gh-24678
2021-01-06 16:44:32 -08:00
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl
Fixes gh-24168
2021-01-06 16:42:09 -08:00
Phillip Webb 5b126b01c0 Replace binder as contributors are processed
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.

Closes gh-24669
2021-01-06 13:31:29 -08:00
Phillip Webb ac4243d615 Merge branch '2.3.x' into 2.4.x
Closes gh-24672
2021-01-06 12:33:53 -08:00
Phillip Webb 52e47c4275 Fix test for JSR-350 @Nonnull
Closes gh-24647
2021-01-06 12:33:25 -08:00
Phillip Webb 2b497b6aff Merge branch '2.3.x' into 2.4.x
Closes gh-24670
2021-01-06 12:23:45 -08:00
Phillip Webb 848ed65f5b Add test for JSR-350 @Nonnull
Closes gh-24647
2021-01-06 12:04:58 -08:00
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 14:24:13 +01:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference
See gh-24647
2021-01-06 14:23:38 +01:00
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 08:58:48 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide
See gh-24647
2021-01-06 08:58:13 +01:00
Phillip Webb c9f9246c59 Merge branch '2.3.x' into 2.4.x
Closes gh-24657
2021-01-05 16:03:01 -08:00
Phillip Webb 9b9c3edfcd Polish "Return -1 port for non-listening WebServers"
See gh-24606
2021-01-05 16:02:26 -08:00
Stefan Partusch 5c61df3131 Return -1 port for non-listening WebServers
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
2021-01-05 15:56:25 -08:00
Phillip Webb ab8080353e Merge branch '2.3.x' into 2.4.x
Closes gh-24654
2021-01-05 14:08:41 -08:00
Phillip Webb 2ad9a47d08 Support JSR-305 annotations on endpoint methods
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
2021-01-05 14:07:22 -08:00
Scott Frederick 505340909a Support symlinks in configtree property paths
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.

Fixes gh-24530
2021-01-05 14:04:59 -06:00
Madhura Bhave 615a8ae56e Ignore documents that do not apply when checking mandatory locations
Closes gh-24584
2021-01-05 10:47:06 -08:00
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x
Closes gh-24649
2021-01-05 17:13:30 +00:00
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll e1ec70ac36 Merge branch '2.3.x' into 2.4.x
Closes gh-24643
2021-01-05 08:28:13 +01:00
Stephane Nicoll f33c7bc27c Polish "Remove unnecessary semicolon"
See gh-24628
2021-01-05 08:24:03 +01:00
Andrey Kolchanov 097104584c Remove unnecessary semicolon
See gh-24628
2021-01-05 08:15:32 +01:00
Madhura Bhave 86e94b95c3 Merge branch '2.3.x' into 2.4.x 2021-01-04 13:36:36 -08:00
Madhura Bhave 9928d74a9e Revert fix to enable cors for actuator endpoints
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.

See gh-11987
2021-01-04 12:25:43 -08:00
Stephane Nicoll c19f7e696e Polish
See gh-24597
2021-01-04 16:39:27 +01:00
Stephane Nicoll 1bc1258341 Polish "Make a field final"
See gh-24629
2021-01-03 17:58:46 +01:00
Andrey Kolchanov 0e3990931e Make a field final
See gh-24629
2021-01-03 17:58:14 +01:00
Stephane Nicoll 052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211 261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
izeye 5e3f618f9d Polish
See gh-24604
2020-12-23 16:08:21 +01:00
Stephane Nicoll e3d7ab0e3b Merge branch '2.3.x' into 2.4.x 2020-12-23 16:08:08 +01:00
Stephane Nicoll d0a1c49873 Polish
See gh-24604
2020-12-23 16:07:27 +01:00
Stephane Nicoll 1261e08371 Merge branch '2.3.x' into 2.4.x
Closes gh-24602
2020-12-23 11:14:37 +01:00
Stephane Nicoll d86eba3b6b Upgrade to Thymeleaf 3.0.12
Closes gh-24599
2020-12-23 10:57:36 +01:00
Stephane Nicoll ff59bb3abf Configure resources filtering encoding
Closes gh-24576
2020-12-23 10:44:06 +01:00
Stephane Nicoll 4cdfd6f13d Polish "Handle missing manifest files in JarTypeFilter"
See gh-24597
2020-12-23 09:12:58 +01:00
Rob Edwards 86eecb01b3 Handle missing manifest files in JarTypeFilter
This commit makes sure that a jar file without a manifest is handled
properly (i.e. included in the repackaged archive).

See gh-24597
2020-12-23 09:11:24 +01:00
Madhura Bhave b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24596
2020-12-22 12:18:47 -08:00
Madhura Bhave a0afec120d Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24313
2020-12-22 12:13:17 -08:00
Madhura Bhave a714ba44ea Update documentation containing examples of WebSecurityConfigurerAdapter
Closes gh-24551
2020-12-22 11:17:30 -08:00
Stephane Nicoll 0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j"
See gh-24239
2020-12-22 12:30:48 +01:00
Gerrit Meier ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j
See gh-24239
2020-12-22 12:15:03 +01:00
Stephane Nicoll 1f71927a9f Merge branch '2.3.x' into 2.4.x
Closes gh-24587
2020-12-22 09:45:42 +01:00
Stephane Nicoll 9e5a6c5228 Harmonize references to ActiveMQ Artemis
Closes gh-24586
2020-12-22 09:44:49 +01:00
dreis2211 f9fbadb8d9 Add JavaVersion entry for JDK 16
See gh-24453
2020-12-21 09:59:52 +01:00
Stephane Nicoll 09fa16c58c Merge branch '2.3.x' into 2.4.x 2020-12-21 09:59:33 +01:00
Stephane Nicoll 306b964ce3 Fix multi-release JAR test on JDK 16
See gh-24453
2020-12-21 09:59:01 +01:00
dreis2211 fb207f73e7 Remove deprecated SpringBootContextLoader#getArgs()
See gh-24550
2020-12-21 09:44:28 +01:00
Stephane Nicoll 2c0bfb7674 Merge branch '2.3.x' into 2.4.x
Closes gh-24578
2020-12-21 09:38:37 +01:00
izeye 97dd4c0871 Polish
See gh-24558
2020-12-21 09:35:41 +01:00
Madhura Bhave af67e6fa54 Merge branch '2.3.x' into 2.4.x 2020-12-18 18:03:22 -08:00
Madhura Bhave b82f5a408a Add a note about disabling git info
See gh-24205
2020-12-18 18:02:27 -08:00
Madhura Bhave f9d1a4526c Merge branch '2.3.x' into 2.4.x
Closes gh-24572
2020-12-18 17:26:44 -08:00
Madhura Bhave a5c8b84511 Update version of git-properties plugin in the docs
Closes gh-24567
2020-12-18 17:25:26 -08:00
Madhura Bhave c231f3da10 Merge branch '2.3.x' into 2.4.x
Closes gh-24570
2020-12-18 17:15:01 -08:00
Madhura Bhave 302ba77812 Improve documentation regarding git commit info
Closes gh-24205
2020-12-18 17:13:30 -08:00