root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
31,259 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

12530 Commits

Author SHA1 Message Date
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry 
Closes gh-25610
 2021-04-21 10:02:57 +02:00
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