root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
30,666 Commits 23 Branches 345 Tags 270 MiB
Commit Graph

12093 Commits

Author SHA1 Message Date
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