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
31,171 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

12486 Commits

Author SHA1 Message Date
Eddú Meléndez 1f00c27c7e Add support to auto-configure javax.jms.ExceptionListener 
See gh-25278
 2021-02-15 13:56:25 +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 a16a2de3c3 Merge branch '2.4.x' 
Closes gh-25296
 2021-02-15 10:13:16 +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 349d755632 Start building against Spring Kafka 2.7.0-M2 snapshots 
See gh-25295
 2021-02-15 08:14:35 +01:00
Stephane Nicoll 56a2634990 Start building against Spring Integration 5.5.0-M2 snapshots 
See gh-25294
 2021-02-15 07:53:12 +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 ca9b583c7d Merge branch '2.4.x' 
Closes gh-25271
 2021-02-14 09:37:49 +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 0a4c26532d Merge branch '2.4.x' 
Closes gh-25259
 2021-02-12 14:57:18 +00: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 cc4bace12b Upgrade to Undertow 2.2.4.Final 
Closes gh-25254
 2021-02-12 13:39:14 +00:00
Andy Wilkinson 118b55579a Upgrade to Tomcat 9.0.43 
Closes gh-25253
 2021-02-12 13:39:14 +00:00
Andy Wilkinson 627d0b713f Upgrade to Solr 8.8.0 
Closes gh-25252
 2021-02-12 13:39:13 +00:00
Andy Wilkinson 078a7fdd15 Upgrade to Selenium HtmlUnit 2.47.1 
Closes gh-25251
 2021-02-12 13:37:50 +00:00
Andy Wilkinson 387fe4b5bb Upgrade to Prometheus PushGateway 0.10.0 
Closes gh-25250
 2021-02-12 13:37:49 +00:00
Andy Wilkinson 3c0972e7f9 Upgrade to Spring Security 5.5.0-M2 
Closes gh-25255
 2021-02-12 13:37:49 +00:00
Andy Wilkinson dadd6241ac Upgrade to Nimbus JOSE JWT 9.5 
Closes gh-25249
 2021-02-12 13:37:49 +00:00
Andy Wilkinson e8e8a4c16b Upgrade to OAuth2 OIDC SDK 9.1 
Closes gh-25248
 2021-02-12 12:13:16 +00:00
Andy Wilkinson 7e228556c7 Upgrade to Netty 4.1.59.Final 
Closes gh-25247
 2021-02-12 12:10:35 +00:00
Andy Wilkinson a70386b4e3 Upgrade to MSSQL JDBC 9.2.0.jre8 
Closes gh-25246
 2021-02-12 12:10:35 +00:00
Andy Wilkinson f91c6075c8 Upgrade to MariaDB 2.7.2 
Closes gh-25245
 2021-02-12 12:10:35 +00:00
Andy Wilkinson 80b0c384d6 Upgrade to Lombok 1.18.18 
Closes gh-25244
 2021-02-12 12:10:34 +00:00
Andy Wilkinson 07f74593a5 Upgrade to Liquibase 4.3.0 
Closes gh-25243
 2021-02-12 12:10:34 +00:00
Andy Wilkinson 723bdc77a5 Upgrade to JUnit Jupiter 5.7.1 
Closes gh-25241
 2021-02-12 12:02:23 +00:00
Andy Wilkinson 3e8773cda2 Upgrade to jOOQ 3.14.7 
Closes gh-25240
 2021-02-12 12:02:22 +00:00
Andy Wilkinson 454c4fcd0d Upgrade to Johnzon 1.2.10 
Closes gh-25239
 2021-02-12 12:02:21 +00:00
Andy Wilkinson 1bd78eb940 Upgrade to Jedis 3.5.1 
Closes gh-25238
 2021-02-12 12:02:19 +00:00
Andy Wilkinson 1f1f510cec Upgrade to Janino 3.1.3 
Closes gh-25237
 2021-02-12 12:02:18 +00:00
Andy Wilkinson 6fbb67e751 Upgrade to Infinispan 12.0.0.Final 
Closes gh-25236
 2021-02-12 12:02:17 +00:00
Andy Wilkinson 22568d42de Upgrade to HtmlUnit 2.47.1 
Closes gh-25235
 2021-02-12 12:02:15 +00:00
Andy Wilkinson 16ed1a9668 Upgrade to HikariCP 4.0.1 
Closes gh-25234
 2021-02-12 12:02:14 +00:00
Andy Wilkinson a1ff05ec12 Upgrade to Hibernate 5.4.28.Final 
Closes gh-25233
 2021-02-12 12:02:13 +00:00
Andy Wilkinson 5dba00fcac Upgrade to Flyway 7.5.3 
Closes gh-25232
 2021-02-12 12:02:12 +00:00
Andy Wilkinson 0cf846b484 Upgrade to Couchbase Client 3.1.2 
Closes gh-25231
 2021-02-12 12:02:11 +00:00
Andy Wilkinson bfbdc3bfaf Upgrade to Byte Buddy 1.10.20 
Closes gh-25230
 2021-02-12 12:02:09 +00:00
Andy Wilkinson 3200d52b15 Upgrade to AssertJ 3.19.0 
Closes gh-25229
 2021-02-12 12:02:08 +00:00
Andy Wilkinson 6e77c27da5 Upgrade to AppEngine SDK 1.9.86 
Closes gh-25228
 2021-02-12 12:02:07 +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 da3f0dc1c7 Merge branch '2.4.x' 
Closes gh-25186
 2021-02-11 20:12:43 +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 5017d59d56 Merge branch '2.4.x' 
Closes gh-25184
 2021-02-11 13:55:42 +01: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 55c47c8b5d Merge branch '2.4.x' 
Closes gh-25183
 2021-02-11 10:24:11 +00: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 249b38e07d Merge branch '2.4.x' 
Closes gh-25175
 2021-02-10 19:42:20 +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
Stephane Nicoll b92bb9332b Polish "Filter properties with a particular prefix" 
See gh-24718
 2021-02-10 17:32:18 +01: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
bono007 ad7c69a9cd Filter properties with a particular prefix 
This commit improves the configprops endpoint to allow filtering
properties based on a particular prefix

See gh-24718
 2021-02-10 15:30:02 +01:00
Stephane Nicoll 0f9fb13141 Fix formatting 2021-02-10 15:25:41 +01:00
Stephane Nicoll a2118e985a Merge branch '2.4.x' 
Closes gh-25170
 2021-02-10 15:17:26 +01: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 514aede91e Merge branch '2.4.x' 
Closes gh-25168
 2021-02-10 12:20:02 +00: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 d436521472 Merge branch '2.4.x' 
Closes gh-25167
 2021-02-10 10:46:56 +01: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 d28d82d355 Merge branch '2.4.x' 
Closes gh-25164
 2021-02-10 09:41:28 +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
Madhura Bhave 301e80be8c Fix raw types error 2021-02-09 14:15:08 -08:00
Madhura Bhave c05cb21ab7 Add a property to disable the `/actuator` discovery page 
Closes gh-24693
 2021-02-09 11:36:29 -08:00
Andy Wilkinson 3610fe50b7 Always use SimpleDriverDataSource when creating Liquibase DataSource 
Closes gh-24944
 2021-02-09 17:10:03 +00:00
Stephane Nicoll dca643500a Polish "Make Scheduler consistent for Spring Integration" 
See gh-25109
 2021-02-09 17:06:43 +01:00
Artem Bilan c5491cfdd7 Make Scheduler consistent for Spring Integration 
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
 2021-02-09 17:06:43 +01:00
Andy Wilkinson 78e1a812e2 Try to stabilise Cassandra tests by increasing request timeout 
Closes gh-25146
 2021-02-09 15:51:24 +00:00
Andy Wilkinson 6521d39867 Merge branch '2.4.x' 
Closes gh-25143
 2021-02-09 14:12:36 +00: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 c120f789d5 Merge branch '2.4.x' 
Closes gh-25141
 2021-02-09 15:04:58 +01: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
Stephane Nicoll a9a8d3a167 Merge branch '2.4.x' 
Closes gh-25137
 2021-02-09 09:49:59 +01:00
izeye 63ee99bf75 Polish 
See gh-25093
 2021-02-09 09:48:35 +01:00
Stephane Nicoll ee59f644ed Merge branch '2.4.x' 
Closes gh-25136
 2021-02-09 09:45:37 +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
Stephane Nicoll 948f61b4ca Polish contribution 
See gh-25006
 2021-02-09 09:10:56 +01:00
dreis2211 634dd979d1 Migrate from deprecated methods in AbstractWebFluxEndpointHandlerMapping 
See gh-25006
 2021-02-09 09:10:42 +01:00
Phillip Webb 23ebf017c0 Extract code samples from docs 
See gh-6313
 2021-02-04 15:55:35 -08:00
Andy Wilkinson 7a3bd6d44f Merge branch '2.4.x' 
Closes gh-25106
 2021-02-04 11:44:29 +00: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 d30251092b Test the Gradle Plugin against 7.0-milestone-1 
Closes gh-25103
 2021-02-04 10:16:48 +00:00
Phillip Webb 0e326d6b0f Extract some code samples from docs 
See gh-6313
 2021-02-03 18:10:44 -08:00
Phillip Webb e0392c4558 Add additional dependencies for example code 
Add additional dependencies useful for the example code.

See gh-6313
 2021-02-03 17:53:52 -08:00
Phillip Webb 9f6f2d36df Polish documented application logged output 
Update the documented application output based on the latest version.
 2021-02-03 17:53:52 -08:00
Phillip Webb b2a51e4504 Polish asciidoctor formatting 2021-02-03 17:47:36 -08:00
Phillip Webb ae1be76cce Add pending-extract attribute to source 
Add `pending-extract=true` to source blocks to help us identify
those that need to be extracted to a real source file.

See gh-6313
 2021-02-03 17:45:40 -08:00
Phillip Webb 073f8c4b23 Polish spring-boot-docs 
See gh-25089
 2021-02-03 16:25:11 -08:00
Phillip Webb 2a85427324 Refine spring-boot-docs package restructure 
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
 2021-02-03 15:47:05 -08:00
Phillip Webb 91ccc23462 Restructure spring-boot-docs packages 
Restructure the packages in `spring-boot-docs` so that they mirror
the documentation sections. There are now three main packages:
`springbootfeatures`, `productionreadyfeatures` and `howto`. Each
of the main packages has a subpackage named after the section headings.

Example code now uses consistent `// tag::` names and imports are
applied using `[tag=*]` whenever possible.

Test snippets have been moved to `src/main/java` so that only a single
import attribute needs to be defined.

Closes gh-25089
 2021-02-02 17:09:45 -08:00
Andy Wilkinson db781a0d84 Merge branch '2.4.x' 
See gh-25077
 2021-02-02 15:14:18 +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 d9f3e89395 Merge branch '2.4.x' 2021-02-01 22:11:17 -08: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 d8b849e00d Fix test that fails when building against SNAPSHOT 
Update `WarIntegrationTests` do deal with a SNAPSHOT Spring Framwork
dependency.

See gh-23936
 2021-02-01 22:09:04 -08:00
Phillip Webb 1eef2e1b46 Merge branch '2.4.x' 2021-02-01 19:47:11 -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 cff09df3fe Merge branch '2.4.x' 2021-02-01 17:07:28 -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 59b8fb5b49 Merge branch '2.4.x' 
Closes gh-25079
 2021-02-01 16:36:02 -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 d8b6960997 Merge branch '2.4.x' 
Closes gh-25077
 2021-02-01 16:08:57 -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
Madhura Bhave c73e3cc2dc Update documentation for layered wars 
Closes gh-22821
Closes gh-22195
 2021-02-01 14:43:43 -08:00
Madhura Bhave 1245e5eec9 Add support for creating layered war files with Gradle 
See gh-22195
 2021-02-01 14:43:42 -08:00
Andy Wilkinson 7f8ea33359 Merge branch '2.4.x' 
Closes gh-25073
 2021-02-01 15:39:52 +00: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 0104ee677e Merge branch '2.4.x' 
Closes gh-25067
 2021-01-30 17:58:05 -08: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 d6eb1eb5ae Merge branch '2.4.x' 
Closes gh-25065
 2021-01-30 17:46:25 -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 99d400f302 Merge branch '2.4.x' 
Closes gh-25062
 2021-01-30 17:04:24 -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 d8c9b8c329 Merge branch '2.4.x' 
Closes gh-25060
 2021-01-30 12:35:52 -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 01746453f7 Merge branch '2.4.x' 2021-01-30 12:34:28 -08:00
Phillip Webb dd997cda9c Remove sysout from test 2021-01-30 10:38:02 -08:00
Andy Wilkinson 82b90d5749 Merge branch '2.4.x' 
Closes gh-25052
 2021-01-29 09:07:40 +00: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 f6097e7da4 Merge branch '2.4.x' 
Closes gh-25045
 2021-01-28 19:29:14 -08: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 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