Commit Graph

12201 Commits

Author SHA1 Message Date
Phillip Webb c76a0f7a81 Merge branch '2.4.x'
Closes gh-25043
2021-01-28 18:57:10 -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 479180fdf9 Merge branch '2.4.x'
Closes gh-25041
2021-01-28 18:49:04 -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 802da9dc87 Merge branch '2.4.x'
Closes gh-25039
2021-01-28 18:01:06 -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
Madhura Bhave 82ac7eef91 Update tests following code changes
See gh-22821
2021-01-28 14:24:18 -08:00
Madhura Bhave 9a32f67802 Fix formatting 2021-01-28 13:38:30 -08:00
Madhura Bhave 152698f2b2 Add support for creating layered war files with Maven
See gh-22821
2021-01-28 12:39:19 -08:00
Phillip Webb 5054765fc8 Merge branch '2.4.x'
Closes gh-25031
2021-01-27 14:19:25 -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 d702793ba7 Merge branch '2.4.x'
Closes gh-25030
2021-01-27 14:10:49 -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 61502bde9a Replace deprecated constructor with mutate builder
Update `ControllerEndpointHandlerMapping` to use the new `mutate()`
builder rather than deprecated constructors.

Closes gh-24999
2021-01-26 22:42:18 -08:00
Phillip Webb c9a2c4e326 Merge branch '2.4.x' 2021-01-26 19:06:48 -08:00
Phillip Webb d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb 4b0ef67e8e Update code for Spring Data 2021.0.0-M3
See gh-25004
2021-01-26 18:57:50 -08:00
Phillip Webb ab0a628d81 Merge branch '2.4.x' 2021-01-26 17:38:11 -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 439344fdd8 Merge branch '2.4.x'
Closes gh-24996
2021-01-25 23:13:38 -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 b1f27b7604 Merge branch '2.4.x'
Closes gh-24995
2021-01-25 21:36:36 -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
Phillip Webb c268f5d418 Skip direct @ConfugurationProperties binding
Add a `BindRestriction` option to `Bindable` which allows direct
property binding to be bypassed. The option is automatically applied
by the `ConfigurationPropertiesBinder`.

Prior to this commit, `@ConfugurationProperties` binding could silently
fail if a direct property existed that could be converted to the
properties class. This can be the case if a single-argument constructor
is available as the `ObjectToObject` converter would kick in.

Closes gh-16038

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
2021-01-22 16:57:59 -08:00
Andy Wilkinson 5fc49aa485 Remove dependency management for spring-boot-starter-data-solr
Closes gh-24977
2021-01-22 15:09:12 +00:00
Andy Wilkinson f3fd55dac6 Merge branch '2.4.x'
Closes gh-24976
2021-01-22 14:59:35 +00: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 5a56f8864f Remove error message attribute instead of blanking it when not included
Closes gh-24712
2021-01-22 14:10:02 +00:00
Andy Wilkinson 1370e8ca97 Merge branch '2.4.x'
Closes gh-24974
2021-01-22 13:32:47 +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
Andy Wilkinson ebca1af3fd Polish "Add reference to Ogham Spring Boot starters"
See gh-24964
2021-01-22 11:06:33 +00:00
Aurélien Baudet 0e436a2ccf Add reference to Ogham Spring Boot starters
See gh-24964
2021-01-22 10:56:36 +00:00
Madhura Bhave d07e351eff Polish " Change info endpoint to be secure and unexposed by default"
See gh-24715
2021-01-21 15:13:53 -08:00
Hatef Palizgar 53c1e79810 Change info endpoint to be secure and unexposed by default
See gh-24715
2021-01-21 13:54:59 -08:00
Andy Wilkinson 0fc33b020d Remove metadata for Data Solr property
Data Solr support was removed in 012a1997 so the property is no longer
supported.

See gh-24939
2021-01-21 16:45:25 +00:00
Andy Wilkinson 3e4abd0471 Upgrade to Solr 8.7.0
Closes gh-24963
2021-01-21 15:41:22 +00:00
Andy Wilkinson a0166e53c1 Upgrade to REST Assured 4.3.3
Closes gh-24962
2021-01-21 15:28:19 +00:00
Andy Wilkinson 977b938977 Upgrade to Flyway 7.5.1
Closes gh-24961
2021-01-21 15:28:19 +00:00
Andy Wilkinson 60ce922a5b Prohibit major upgrades that are not of interest
Closes gh-24960
2021-01-21 15:11:29 +00:00
dreis2211 d4eccb7715 Upgrade to Groovy 3.0.7
See gh-24946
2021-01-21 14:32:42 +00:00
Andy Wilkinson a4919a047e Upgrade to Spring Integration 5.5.0-M1
Closes gh-24932
2021-01-21 14:32:42 +00:00
Andy Wilkinson bb9a674dfb Upgrade to Spring Session Bom 2021.0.0-M1
Closes gh-24933
2021-01-21 14:32:42 +00:00
Andy Wilkinson c125e0ee35 Upgrade to Spring Kafka 2.7.0-M1
Closes gh-24592
2021-01-21 14:32:41 +00:00
Andy Wilkinson dff64302b5 Upgrade to Kafka 2.7.0
Closes gh-24934
2021-01-21 13:24:40 +00:00
Andy Wilkinson f5328d59e4 Upgrade to Oracle Database 21.1.0.0
Closes gh-24959
2021-01-21 12:38:51 +00:00
Andy Wilkinson eccafc1303 Upgrade to Jetty EL 9.0.29
Closes gh-24957
2021-01-21 12:38:50 +00:00
Andy Wilkinson a29ba202ae Upgrade to Jaybird 4.0.2.java8
Closes gh-24956
2021-01-21 12:38:50 +00:00
Andy Wilkinson 48b9e5ab29 Upgrade to Git Commit ID Plugin 4.0.3
Closes gh-24955
2021-01-21 12:30:39 +00:00
Andy Wilkinson fb087d7f7d Upgrade to ActiveMQ 5.16.1
Closes gh-24954
2021-01-21 12:30:38 +00:00
Andy Wilkinson 4135e3c061 Upgrade to Flyway 7.5
Closes gh-24953
2021-01-21 12:11:31 +00:00
Andy Wilkinson d15ec4cdb4 Upgrade to Liquibase 4.2.2
Closes gh-24952
2021-01-21 09:47:58 +00:00
Madhura Bhave cf8e667795 Fix formatting 2021-01-20 15:49:08 -08:00
Madhura Bhave 06263c46ce Upgrade to Spring Security 5.5.0-M1
Closes gh-24937
2021-01-20 15:42:25 -08:00
Phillip Webb a196a9bd8f Merge branch '2.4.x'
Closes gh-24949
2021-01-20 13:49:37 -08: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 4c2a7db4f8 Upgrade to Spring Data 2021.0.0-M2
Closes gh-24931
2021-01-20 16:18:38 +01:00
Stephane Nicoll 20b7016a92 Upgrade to Spring HATEOAS 1.3.0-M1
Closes gh-24935
2021-01-20 15:16:10 +01:00
Stephane Nicoll 012a199773 Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.

Closes gh-24939
2021-01-20 15:03:42 +01:00
Stephane Nicoll 3e376b955d Fix build failure
See gh-24943
2021-01-20 14:41:12 +01:00
Stephane Nicoll 2f4d4c7b5d Merge branch '2.4.x' 2021-01-20 14:07:07 +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
Stephane Nicoll bf9c67b793 Polish 2021-01-20 10:27:32 +01:00
Stephane Nicoll ebf8175cc2 Upgrade to XmlUnit2 2.8.2
Closes gh-24930
2021-01-20 10:22:48 +01:00
Stephane Nicoll b3fd1446f5 Upgrade to Thymeleaf Layout Dialect 2.5.2
Closes gh-24929
2021-01-20 10:22:48 +01:00
Stephane Nicoll ab883a7fd7 Upgrade to SQLite JDBC 3.34.0
Closes gh-24928
2021-01-20 10:22:48 +01:00
Stephane Nicoll 90e50a2967 Upgrade to Spring Retry 1.3.1
Closes gh-24927
2021-01-20 10:22:48 +01:00
Stephane Nicoll dc28bb9a5c Upgrade to Spring AMQP 2.3.4
Closes gh-24926
2021-01-20 10:22:48 +01:00
Stephane Nicoll 88825923b6 Upgrade to SendGrid 4.7.1
Closes gh-24925
2021-01-20 10:22:47 +01:00
Stephane Nicoll eefd5a1d9a Upgrade to Selenium HtmlUnit 2.46.0
Closes gh-24924
2021-01-20 09:15:16 +01:00
Stephane Nicoll 2e7c4d8d91 Upgrade to Oracle Database 19.9.0.0
Closes gh-24923
2021-01-20 09:15:14 +01:00
Stephane Nicoll f2c1a7c957 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24922
2021-01-20 09:15:13 +01:00
Stephane Nicoll 54f0f881de Upgrade to Netty 4.1.58.Final
Closes gh-24921
2021-01-20 09:15:11 +01:00
Stephane Nicoll 33bf4d2b42 Upgrade to MySQL 8.0.23
Closes gh-24920
2021-01-20 09:15:09 +01:00
Stephane Nicoll 10b9448e1e Upgrade to Mockito 3.7.7
Closes gh-24919
2021-01-20 09:15:08 +01:00
Stephane Nicoll 10a692edcd Upgrade to Micrometer 1.6.3
Closes gh-24918
2021-01-20 09:15:06 +01:00
Stephane Nicoll c57ca65eb8 Upgrade to Log4j2 2.14.0
Closes gh-24917
2021-01-20 09:15:05 +01:00
Stephane Nicoll 4407d00664 Upgrade to Lettuce 6.0.2.RELEASE
Closes gh-24916
2021-01-20 09:15:04 +01:00
Stephane Nicoll 78a15dc8c9 Upgrade to Json Path 2.5.0
Closes gh-24915
2021-01-20 09:15:03 +01:00
Stephane Nicoll 0399b65904 Upgrade to Johnzon 1.2.9
Closes gh-24914
2021-01-20 09:15:01 +01:00
Stephane Nicoll 9e12bd088e Upgrade to Jetty 9.4.36.v20210114
Closes gh-24913
2021-01-20 09:15:00 +01:00
Stephane Nicoll 02b434460d Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24912
2021-01-20 09:14:59 +01:00
Stephane Nicoll 6d8043aae7 Upgrade to Jersey 2.33
Closes gh-24911
2021-01-20 09:14:57 +01:00
Stephane Nicoll 8d5dd8d4b2 Upgrade to Jaybird 3.0.10
Closes gh-24910
2021-01-20 09:14:56 +01:00
Stephane Nicoll 7b39cfb061 Upgrade to Jackson Bom 2.12.1
Closes gh-24909
2021-01-20 09:14:54 +01:00
Stephane Nicoll 7b22d69857 Upgrade to InfluxDB Java 2.21
Closes gh-24908
2021-01-20 09:14:52 +01:00
Stephane Nicoll 346bc4730b Upgrade to Infinispan 11.0.9.Final
Closes gh-24907
2021-01-20 09:14:50 +01:00
Stephane Nicoll 09b3363dae Upgrade to HtmlUnit 2.46.0
Closes gh-24906
2021-01-20 09:14:49 +01:00
Stephane Nicoll d5d100eb11 Upgrade to Hibernate Validator 6.2.0.Final
Closes gh-24905
2021-01-20 09:14:47 +01:00
Stephane Nicoll 62ad346765 Upgrade to Hibernate 5.4.27.Final
Closes gh-24904
2021-01-20 09:14:46 +01:00
Stephane Nicoll ee6c8425e2 Upgrade to Hazelcast Hibernate5 2.2.0
Closes gh-24903
2021-01-20 09:14:45 +01:00
Stephane Nicoll 9ed2e722fd Upgrade to Hazelcast 4.1.1
Closes gh-24902
2021-01-20 09:14:44 +01:00
Stephane Nicoll b3221f4fc5 Upgrade to Elasticsearch 7.10.2
Closes gh-24901
2021-01-20 09:14:42 +01:00
Stephane Nicoll 1c42d22e1c Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24900
2021-01-20 09:14:40 +01:00
Stephane Nicoll 5cea9e74ab Upgrade to Couchbase Client 3.1.1
Closes gh-24899
2021-01-20 09:14:39 +01:00
Stephane Nicoll 644c03124a Upgrade to Cassandra Driver 4.10.0
Closes gh-24898
2021-01-20 09:14:38 +01:00
Stephane Nicoll aa29d950a9 Upgrade to Byte Buddy 1.10.19
Closes gh-24897
2021-01-20 09:14:36 +01:00
Stephane Nicoll 4ab3b5c0d4 Upgrade to Artemis 2.16.0
Closes gh-24896
2021-01-20 09:14:35 +01:00
Stephane Nicoll 95cf9d91e9 Upgrade to AppEngine SDK 1.9.84
Closes gh-24895
2021-01-20 09:14:34 +01:00
Phillip Webb b5674173f8 Merge branch '2.4.x'
Closes gh-24893
2021-01-19 18:15:26 -08: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 452fbf3a3e Prohibit upgrades to REST Assured 4.3
REST Assured 4.3.x requires Groovy 3 that we can't yet upgrade to as
there is no compatibile GA of Spock.

This commit prohibits upgrades to 4.3 so that Bomr ignores the possible
upgrade.

See gh-22303
2021-01-19 16:53:53 +00:00
Andy Wilkinson b095c7761a Polish "Add config prop for endpoints' CORS allowed origin patterns"
See gh-24680
2021-01-19 15:51:14 +00:00
Pedro Ivo Machado d7f891be39 Add config prop for endpoints' CORS allowed origin patterns
See gh-24680
2021-01-19 15:50:31 +00:00
Andy Wilkinson 743343cf18 Avoid compiler warning that only occurs with Java 8 2021-01-19 13:58:34 +00:00
Andy Wilkinson 294231efe7 Merge branch '2.4.x'
Closes gh-24883
2021-01-19 13:22:32 +00: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 535050ad48 Automatically register HttpSessionIdListener's with the servlet context
Closes gh-24879
2021-01-19 11:28:34 +00:00
Andy Wilkinson 48002e969f Merge branch '2.4.x'
Closes gh-24882
2021-01-19 10:53:41 +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
Andy Wilkinson 4e918b141b Polish 2021-01-18 16:30:14 +00:00
Stephane Nicoll 0669f5604d Merge branch '2.4.x'
Closes gh-24873
2021-01-18 17:09:01 +01: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
Andy Wilkinson c6ce97b8a9 Disable all mappings endpoint infra when endpoint is unavailable
Previously, when the mappings endpoint was not available, the beans
that provide mapping descriptions were still created. This resulted
in unnecessary CPU and memory usage collecting and storing
information that would never by used.

This commit updates the auto-configuration for the mappings endpoint
so that all the beans that it creates are conditional on the endpoint
being available, rather than only the endpoint bean itself.

Closes gh-23977
2021-01-18 15:43:48 +00:00
Stephane Nicoll 7592c98d5c Merge branch '2.4.x'
Closes gh-24871
2021-01-18 14:45:02 +01:00
izeye 21db14227c Fix property name for spring.dao.exceptiontranslation.enabled
See gh-24867
2021-01-18 14:41:41 +01:00
Stephane Nicoll 742983fc5e Update copyright of changed file
See gh-24866
2021-01-18 14:38:58 +01:00
izeye 41fcc427c6 Restore persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation()
See gh-24866
2021-01-18 14:37:34 +01:00
Stephane Nicoll dcc0ca0df9 Polish contribution
See gh-24862
2021-01-18 11:03:27 +01:00
izeye 3aea8b37a0 Polish
See gh-24862
2021-01-18 10:58:27 +01:00
Stephane Nicoll bcc1331f85 Restore missing deprecated metadata for Bitronix
See gh-24806
2021-01-18 10:29:21 +01:00
Stephane Nicoll dcae55a8bc Merge branch '2.4.x'
Closes gh-24861
2021-01-17 17:04:22 +01:00
dreis2211 b8b5e4cebf Fix configuration metadata for logging.charset.* properties
See gh-24851
2021-01-17 17:02:24 +01:00
Stephane Nicoll 600be08225 Merge branch '2.4.x'
Closes gh-24855
2021-01-15 16:51:27 +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
izeye e7350503b8 Polish
See gh-24837
2021-01-15 14:37:33 +01:00
Stephane Nicoll 1a2a3d6598 Merge branch '2.4.x' 2021-01-15 14:37:25 +01:00
Stephane Nicoll e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll 2c2c160579 Remove deprecated code
See gh-24806
2021-01-15 14:14:33 +01:00
Stephane Nicoll a18f01addf Remove bitronix support
See gh-24806
2021-01-15 14:14:27 +01:00
Andy Wilkinson 4b0d5c31de Switch to the Apache Tomcat EL implementation by default
Previously we used org.glassfish:jakarta.el as our default EL
implementation. Since adopting it we have learned that it can be
significantly slower than Apache Tomcat's EL implementation in some
scenarios. This commit switches to using
org.apache.tomcat.embed:tomcat-embed-el by default instead of the
Glassfish implementation.

Closes gh-24744
2021-01-15 09:30:54 +00:00
Stephane Nicoll e2033992c7 Merge branch '2.4.x' 2021-01-15 08:25:41 +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 0fd3cd5ed5 Merge branch '2.4.x' 2021-01-14 17:25:22 -08:00