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
23,824 Commits 23 Branches 348 Tags 276 MiB
Commit Graph

7226 Commits

Author SHA1 Message Date
Stephane Nicoll 5f4ddd98d8 Upgrade to Spring Security 5.2.0.RELEASE 
Closes gh-18256
 2019-10-01 18:33:11 +02:00
Johnny Lim 3a63179d81 Fix a broken Asciidoctor syntax 
Along the way, this commit also fixes a typo.

Closes gh-18325
 2019-10-01 18:32:01 +02:00
Andy Wilkinson ed29eea365 Align Spring Asciidoctor Extension dependency with new module names 2019-10-01 14:54:03 +01:00
Stephane Nicoll b0d6169285 Upgrade to Spring Session Bom Bean-SR8 
Closes gh-18466
 2019-10-01 15:29:45 +02:00
Stephane Nicoll 9d40d192a0 Upgrade to Micrometer 1.1.7 
Closes gh-18465
 2019-10-01 15:29:44 +02:00
Stephane Nicoll 852b369ce1 Revert to fixed version 2019-10-01 15:20:23 +02:00
Stephane Nicoll 4237d9fc1a Merge branch '2.1.x' 
See gh-18316
 2019-10-01 15:04:50 +02:00
Stephane Nicoll 47365dc260 Revert to Spring Web Services 3.0.7.RELEASE 
See gh-18315
 2019-10-01 15:03:11 +02:00
Stephane Nicoll 91afd289bf Upgrade to Download Maven Plugin 1.4.2 
Closes gh-18459
 2019-10-01 15:00:11 +02:00
Stephane Nicoll fc7c0ba32e Upgrade to Commons FileUpload 1.4 
Closes gh-18450
 2019-10-01 14:27:43 +02:00
Stephane Nicoll b2334dd871 Upgrade to gmavenplus-plugin 1.8.0 
Closes gh-18462
 2019-10-01 14:24:16 +02:00
Stephane Nicoll 94de7ee97e Upgrade to Cargo Maven Plugin 1.7.7 
Closes gh-18461
 2019-10-01 14:18:33 +02:00
Stephane Nicoll 9f2201c5e5 Upgrade to Maven Maven Plugin 3.6.0 
Closes gh-18460
 2019-10-01 14:09:58 +02:00
Stephane Nicoll 9133d52416 Upgrade to plexus-archiver to 3.7.0 
Closes gh-18457
 2019-10-01 14:02:51 +02:00
Stephane Nicoll 67bb90ee5a Upgrade to maven-plugin-annotations 3.6.0 
Closes gh-18456
 2019-10-01 14:02:51 +02:00
Stephane Nicoll 4008d70248 Upgrade to maven-common-artifact-filters 3.1.0 
Closes gh-18455
 2019-10-01 14:02:51 +02:00
Stephane Nicoll a1e83558c2 Upgrade to maven-archiver 3.4.0 
Closes gh-18453
 2019-10-01 14:02:51 +02:00
Stephane Nicoll b66288219a Upgrade to Spock 1.3-groovy-2.5 
Closes gh-18458
 2019-10-01 14:02:43 +02:00
Stephane Nicoll 9330760e22 Upgrade to MockK 1.9.3 
Closes gh-18452
 2019-10-01 13:58:49 +02:00
Stephane Nicoll 112cbd216b Remove plugin dependency management for the Sonar plugin 2019-10-01 13:58:49 +02:00
Stephane Nicoll 6cf1b158f8 Remove duplicate maven-resources-plugin dependency management 2019-10-01 13:58:49 +02:00
Andy Wilkinson a6f1619971 Use Asciidoctor extension to verify documented configuration properties 
Closes gh-18451
 2019-10-01 10:39:06 +01:00
Stephane Nicoll a36d2cd159 Upgrade to micrometer 1.3.0 
Closes gh-18389
 2019-10-01 11:15:07 +02:00
Stephane Nicoll 1357f1b46c Upgrade to Spring AMQP 2.1.11.RELEASE 
Closes gh-18312
 2019-10-01 09:50:27 +02:00
Stephane Nicoll 00a9eeaaff Upgrade to Spring AMQP 2.1.11.RELEASE 
Closes gh-18312
 2019-10-01 09:49:42 +02:00
Stephane Nicoll a22046697e Upgrade to Spring Integration 5.1.8.RELEASE 
Closes gh-18313
 2019-10-01 09:49:01 +02:00
Stephane Nicoll b4ba667ef1 Update to Spring Data Moore-RELEASE 
Closes gh-18253
 2019-10-01 09:40:22 +02:00
dreis2211 3ae3439054 Upgrade to Testcontainers 1.12.2 
See gh-18446
 2019-10-01 08:23:22 +02:00
Stephane Nicoll e0d6d90683 Merge branch '2.1.x' 
Closes gh-18447
 2019-10-01 08:06:23 +02:00
dreis2211 417bfc4c87 Fix comment position in ZipHeaderPeekInputStreamTests 
See gh-18445
 2019-10-01 08:05:08 +02:00
Stephane Nicoll 04ac38fbe8 Upgrade to Spring HATEOAS 1.0.0.RELEASE 
Closes gh-18258
 2019-09-30 15:59:51 +02:00
Stephane Nicoll 2fffa5675d Upgrade to Spring Data Lovelace-SR11 
Closes gh-18414
 2019-09-30 13:06:28 +02:00
Stephane Nicoll d2273bd68e Remove endpoint ID hints from metadata 
Closes gh-18381
 2019-09-30 12:56:34 +02:00
Andy Wilkinson 3e92cd36fa Merge branch '2.1.x' 
Closes gh-18439
 2019-09-30 11:31:57 +01:00
Stephane Nicoll 58ec780b5d Upgrade to Spring Framework 5.2.0.RELEASE 
Closes gh-18232
 2019-09-30 12:23:05 +02:00
Andy Wilkinson 0c8bb394f7 Upgrade to Spring REST Docs 2.0.4.RELEASE 
Closes gh-18271
 2019-09-30 10:33:23 +01:00
Stephane Nicoll 0791f56eb7 Upgrade to RSocket 1.0.0-RC5 
Closes gh-18364
 2019-09-30 08:54:59 +02:00
Stephane Nicoll 1066b97113 Merge branch '2.1.x' 
Closes gh-18437
 2019-09-29 16:22:58 +02:00
dreis2211 208fb8f1ef Add Mustache to 'Customize ViewResolvers' docs section 
See gh-18378
 2019-09-29 16:21:49 +02:00
dreis2211 bafc10f2c4 Fix default values in metadata for HiddenHttpMethodFilter 
See gh-18435
 2019-09-29 16:18:41 +02:00
Stephane Nicoll c9838f2509 Upgrade to Maven Invoker Plugin 3.2.1 
Closes gh-18429
 2019-09-29 12:39:00 +02:00
Stephane Nicoll 167207e98c Upgrade to Lombok 1.18.10 
Closes gh-18428
 2019-09-29 12:39:00 +02:00
Stephane Nicoll fc5e28f038 Upgrade to Postgresql 42.2.8 
Closes gh-18427
 2019-09-29 12:38:50 +02:00
Stephane Nicoll 9e2b231435 Upgrade to Neo4j Ogm 3.2.1 
Closes gh-18426
 2019-09-29 12:38:27 +02:00
Stephane Nicoll 8291a00985 Upgrade to Mariadb 2.4.4 
Closes gh-18425
 2019-09-29 12:38:27 +02:00
Stephane Nicoll 4f7deb998c Upgrade to Kotlin Coroutines 1.3.2 
Closes gh-18424
 2019-09-29 12:38:27 +02:00
Stephane Nicoll 686afd444c Upgrade to Hibernate 5.4.5.Final 
Closes gh-18423
 2019-09-29 12:38:27 +02:00
Stephane Nicoll 67de7b694d Upgrade to Flyway 6.0.4 
Closes gh-18422
 2019-09-29 12:38:27 +02:00
Stephane Nicoll 4a2bad3c4c Upgrade to Artemis 2.10.1 
Closes gh-18421
 2019-09-29 12:38:26 +02:00
Stephane Nicoll 2f25780b66 Upgrade to Jakarta Jms 2.0.3 
Closes gh-18420
 2019-09-29 12:38:26 +02:00
Stephane Nicoll 02eea3c915 Upgrade to Lettuce 5.2.0.RELEASE 
Closes gh-18418
 2019-09-29 12:19:32 +02:00
Stephane Nicoll 5317895e70 Upgrade to Hikaricp 3.4.1 
Closes gh-18417
 2019-09-29 12:19:31 +02:00
Stephane Nicoll f6bce8be42 Upgrade to Okhttp3 3.14.3 
Closes gh-18416
 2019-09-29 12:19:29 +02:00
Stephane Nicoll 17df6ab044 Start building against Spring Data Lovelace-SR11 snapshots 
See gh-18414
 2019-09-29 10:30:03 +02:00
Phillip Webb 869a8c2691 Merge branch '2.1.x' 
Closes gh-18411
 2019-09-28 22:45:56 -07:00
Stephane Nicoll fab80d6974 Avoid duplicate activation-api with Jersey starter 
Closes gh-18398
 2019-09-28 22:31:42 -07:00
Phillip Webb 1f9c9fedb4 Merge branch '2.1.x' 
Closes gh-18409
 2019-09-28 22:31:17 -07:00
Phillip Webb 1528b6c2f8 Polish 2019-09-28 22:28:23 -07:00
Phillip Webb 9568777d7d Fix devtools package tangle 
Fix package tangle in devtools by relocating `DevToolsEnablementDeducer`
to a new `system` package.

Closes gh-18393
 2019-09-28 22:05:07 -07:00
Phillip Webb 062163b52f Fix package tangle with configuration properties 
Fix a package tangle that was introduced when we added cache bypass to
`SpringIterableConfigurationPropertySource`. Ideally we should have
been able to depend on `env` from `context` but unfortunately the
`EnvironmentPostProcessor` interface references `SpringApplication`
which needs to use the Binder.

The `isImmutable` method has now been moved to `OriginLookup` which
removes the immediate tangle.

Closes gh-18393
 2019-09-28 22:04:44 -07:00
Phillip Webb 615c6d4e86 Restructure RSocket packages and polish 
Polish code and relocate `RSocketServerBootstrap` from `server` to
`context` since it's really an `ApplicationContext` concern.

Closes gh-18391
 2019-09-28 22:04:30 -07:00
Phillip Webb 4b0fb8ff24 Polish 'Add @LocalRSocketServerPort support' 
See gh-18287
 2019-09-28 22:03:36 -07:00
Verónica Vásquez 3c8fa3bbd0 Add @LocalRSocketServerPort support 
Add an appication context initializer to detect and store the
active RSocket port in the Environment under
`local.rsocket.server.port`.

Additionally add a `@LocalServerPort` that provides a convenient
alternative to `@Value`.

See gh-18287

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
 2019-09-28 22:03:36 -07:00
dreis2211 370998e91e Simplify pipe escaping for reference doc tables 
Replace `{vbar}` with an escaped pipe character. Unfortunately
`{vbar}` does not render correctly with PDF generation.

See gh-18374
 2019-09-28 22:02:27 -07:00
dreis2211 8a6e254465 Avoid need to escape pipe character in reference tables 2019-09-28 22:02:27 -07:00
dreis2211 37dbe647f2 Polish some external documentation links 
See gh-18384
 2019-09-28 22:01:05 -07:00
dreis2211 edefbfde42 Mention Java 13 in system requirements docs 
See gh-18383
 2019-09-28 21:59:50 -07:00
Phillip Webb 228901a5ca Polish 2019-09-28 21:59:20 -07:00
Phillip Webb 68f410b7dc Upgrade to Jackson 2.10.0 
Closes gh-17999
 2019-09-28 21:56:19 -07:00
Phillip Webb 38968d2fff Polish 'Apply TTL invocation caching on reactor types' 
Extract reactor specific code to an inner class to protect
against ClassNotFound exceptions if reactor is not in use.

Also add support for `Flux`.

See gh-18339
 2019-09-28 21:46:36 -07:00
dreis2211 33d8bfa99d Apply TTL invocation caching on reactor types 
Update `CachingOperationInvoker` so that TTL caching is applied directly
to reactive types. Prior to this commit, a `Mono` would be cached, but
the values that it emitted would not.

See gh-18339
 2019-09-28 21:43:38 -07:00
Tadaya Tsuyukubo bccdf04358 Use ordered TaskExecutorCustomizers 
Use an ordered stream in `TaskExecutionAutoConfiguration` when
obtaining the TaskExecutor customizers.

See gh-18333
 2019-09-28 18:44:57 -07:00
Stephane Nicoll 865a1cd994 Upgrade to Spring Framework 5.1.10.RELEASE 
Closes gh-18238
 2019-09-28 14:50:22 +02:00
Stephane Nicoll d83e3f9070 Upgrade to Lombok 1.18.10 
Closes gh-18407
 2019-09-28 14:17:50 +02:00
Stephane Nicoll 526f2516e0 Upgrade to Postgresql 42.2.8 
Closes gh-18406
 2019-09-28 14:17:49 +02:00
Stephane Nicoll ed04be78f4 Upgrade to Neo4j Ogm 3.1.14 
Closes gh-18405
 2019-09-28 14:17:48 +02:00
Stephane Nicoll 278cffffc5 Upgrade to Hibernate 5.3.12.Final 
Closes gh-18404
 2019-09-28 14:17:47 +02:00
Stephane Nicoll b0a48c6303 Upgrade to Tomcat 9.0.26 
Closes gh-18403
 2019-09-28 14:17:45 +02:00
Stephane Nicoll d8f17d318d Upgrade to Httpclient 4.5.10 
Closes gh-18402
 2019-09-28 14:17:44 +02:00
Stephane Nicoll 82e00d1b2d Upgrade to Joda Time 2.10.4 
Closes gh-18401
 2019-09-28 14:17:43 +02:00
Stephane Nicoll 94402f4d77 Upgrade to Netty Tcnative 2.0.26.Final 
Closes gh-18400
 2019-09-28 14:17:40 +02:00
Stephane Nicoll 3ed1713915 Polish 2019-09-28 09:17:51 +02:00
Madhura Bhave 39ed15728f Configure oauth2client in Reactive OAuth2 client auto-config 
Closes gh-18385
 2019-09-27 11:42:43 -07:00
Stephane Nicoll 15eeedb59a Merge branch '2.1.x' 
Closes gh-18380
 2019-09-27 17:00:23 +02:00
Johnny Lim 7319908b40 Polish 
See gh-18347
 2019-09-27 16:57:09 +02:00
dreis2211 14d7777138 Add missing appendices to PDF reference documentation 
See gh-18371
 2019-09-27 16:37:38 +02:00
Stephane Nicoll c605419f19 Merge branch '2.1.x' 
Closes gh-18379
 2019-09-27 16:34:59 +02:00
Roland Weisleder 92ae7b21a1 Fix typo in ApplicationContextAssert 
See gh-18372
 2019-09-27 16:32:32 +02:00
Stephane Nicoll f78c9574d8 Start building against Spring Session Corn snapshots 
See gh-18257
 2019-09-27 16:20:50 +02:00
Phillip Webb 3ffc5f2a30 Polish 'Support programmatic lazy-int exclusion' 
See gh-16615
 2019-09-26 21:24:51 -07:00
Tyler Van Gorder 0f26f4d6e2 Support programmatic lazy-int exclusion 
Allow the `LazyInitializationBeanFactoryPostProcessor` to skip setting
lazy-init based on a programmatic callback. This feature allows
downstream projects to deal with edge-cases in which it is not easy to
support lazy-loading (such as in DSLs that dynamically create additional
beans).

See gh-16615
 2019-09-26 21:22:36 -07:00
Phillip Webb a13666d696 Polish "Simplify code" 
See gh-18342
 2019-09-26 19:12:18 -07:00
Yuyan 4d0da4b700 Simplify code 
See gh-18342
 2019-09-26 19:09:28 -07:00
dreis2211 4f7f8ff0c7 Add micrometer cloudwatch2 managed dependency 
See gh-18367
 2019-09-26 19:05:35 -07:00
Phillip Webb 8f9fd97095 Don't reset defaults if source collection is empty 
Update `LegacyHealthEndpointCompatibilityConfiguration` to ensure that
the default configuration is only overwritten when the user has
explicitly set new values.

Fixes gh-18354
 2019-09-26 18:20:59 -07:00
Phillip Webb a94ab673a3 Add health endpoint 'show-components' support 
Add a `show-components` property under `management.endpoint.health` and
`management.endpoint.health.group.<name>` that can be used to change
when components are displayed.

Prior to this commit it was only possible to set `show-details` which
offered an "all or nothing" approach to the resulting JSON. The new
switch allows component information to be displayed whilst still hiding
potentially sensitive details returned from the actual `HealthIndicator`.

Closes gh-15076
 2019-09-26 16:17:28 -07:00
Phillip Webb 69c561a69a Rename health JSON 'details' to 'components' in v3 
Update the health endpoint so the nested components are now exposed
under `components` rather than `details` when v3 of the actuator
REST API is being used.

This distinction helps to clarify the difference between composite
health (health composed of other health components) and health
details (technology specific information gathered by the indicator).

Since this is a breaking change for the REST API, it is only returned
for v3 payloads. Requests made accepting only a v2 response will have
JSON provided in the original form.

Closes gh-17929
 2019-09-26 16:16:23 -07:00
Phillip Webb cd1b7c1a9c Test v3 actuator API with loggers endpoint 
Update `LoggersEndpointWebIntegrationTests` to ensure that the new
v3 media type can be used.

See gh-17929
 2019-09-26 16:16:19 -07:00
Phillip Webb deb9d67cef Add Actuator ApiVersion support and bump version 
Add `ApiVersion` enum that can be injected into actuator endpoints if
they need to support more than one API revision.

Spring MVC, WebFlux and Jersey integrations now detect the API version
based on the HTTP accept header. If the request explicitly accepts a
`application/vnd.spring-boot.actuator.v` media type then the version
is set from the header. If no explicit Spring Boot media type is
accepted then the latest `ApiVersion` is assumed.

A new v3 API revision has also been introduced to allow upcoming health
endpoint format changes. By default all endpoints now consume and
can produce v3, v2 and `application/json` media types.

See gh-17929
 2019-09-26 16:16:15 -07:00
Phillip Webb d83238aaab Merge branch '2.1.x' 
Closes gh-18369
 2019-09-26 12:14:35 -07:00
Phillip Webb 050460f635 Check factory bean for EntityManager datasource 
Update `DataSourceInitializedPublisher` to fallback to the
`LocalContainerEntityManagerFactoryBean` if the
`javax.persistence.nonJtaDataSource` property is not defined.

As of Hibernate 4.3 the property is no longer set if the `EntityManager`
is created from a `PersistenceUnitInfo` instance rather than actual
properties.

Although this is being addressed in Hibernate issue HHH-13432, it's
not strictly a requirement of the JPA spec that the property is set.

Fixes gh-17061
 2019-09-26 12:14:13 -07:00
Brian Clozel b15e26662a Upgrade to Spring Doc Resources 0.1.3 
Closes gh-18293
 2019-09-26 15:04:57 +02:00
dreis2211 4262aab446 Fix deprecation warnings caused by BodyInserters.fromObject 
See gh-18349
 2019-09-25 13:57:17 +01:00
Stephane Nicoll 48bf9a58c6 Upgrade to Reactor Dysprosium-RELEASE 
Closes gh-18276
 2019-09-25 09:01:03 +02:00
Stephane Nicoll 56623bd57b Upgrade to Reactor Californium-SR12 
Closes gh-18348
 2019-09-25 09:00:13 +02:00
Phillip Webb 323a78c4b9 Add property to migrate deprecated endoint IDs 
Allow legacy actuator endpoint IDs that contain dots to be transparently
migrated to the new format. This update will allow Spring Cloud users
to proactively migrate from endpoints such as `hystrix.stream` to
`hystrixstream`.

Closes gh-18148
 2019-09-24 19:53:50 -07:00
Madhura Bhave 0a70e33009 Merge branch '2.1.x' 
Closes gh-18345
 2019-09-24 10:28:54 -07:00
Madhura Bhave 342a0535d7 Explicitly configure SecurityWebFilterChain bean for reactive oauth2 client 
This will ensure that ReactiveManagementWebSecurityAutoConfiguration backs
off and that the actuator endpoints are also secured via OAuth2.

Fixes gh-17949
 2019-09-24 09:50:45 -07:00
Andy Wilkinson a354657ace Merge branch '2.1.x' 
Closes gh-18343
 2019-09-24 16:17:36 +01:00
Andy Wilkinson c613418451 Suppress body when handling a no content (204) "error" 
Fixes gh-18136
 2019-09-24 16:01:18 +01:00
Andy Wilkinson 4ab53dc8ce Fix broken and redirected links in the reference documentation 
Fixes gh-18332
 2019-09-24 15:19:04 +01:00
Andy Wilkinson b483e78f55 Revert "Workaround Spring Data Rest enforcer issue" 
This reverts commit 90defac71c.

Closes gh-18335
 2019-09-24 12:40:41 +01:00
Andy Wilkinson 35ad5cd011 Fix intermittent failure of inMemoryDerbyIsShutdown 2019-09-24 11:45:50 +01:00
Andy Wilkinson 419f92d381 Tune @ConditionalOnMissingBean for interface-based back off 
Previously, a number of usages of @ConditionalOnMissingBean prevented
a bean that implements an auto-configured bean's "main" interface from
causing the auto-configuration of the bean to back off. This would
happen when @ConditionalOnMissingBean did not specify a type, the
@Bean method returned the bean's concrete type, and that concreate
type implements a "main" interface.

This commit updates such usages of @ConditionalOnMissingBean to
specify the "main" interface as the type of the bean that must be
missing. This will allow, for example, the auto-configured
MongoTemplate bean to back off when a MongoOperations bean is defined.

Fixes gh-18101
 2019-09-24 11:13:35 +01:00
Brian Clozel eeaa9bc6c1 Fix ref docs code snippet theme 
This commit also fixes a link in the reference documentation.

See gh-18293
 2019-09-24 11:25:57 +02:00
dreis2211 d89adfac91 Test compression with invalid content type for all webservers 
Closes gh-18338
 2019-09-24 10:03:38 +01:00
Andy Wilkinson 3fa9e037fa Merge pull request #18337 from dreis2211 
* gh-18337:
  Test compression with invalid content type for all webservers

Closes gh-18337
 2019-09-24 09:57:49 +01:00
dreis2211 7bc28fc646 Test compression with invalid content type for all webservers 
See gh-18337
 2019-09-24 09:57:28 +01:00
Eddú Meléndez 82bf819c49 Add dependency management for io.rest-assured:spring-web-test-client 
See gh-18330
 2019-09-24 09:46:17 +01:00
Stephane Nicoll 3c8402f6af Polish 
See gh-18194
 2019-09-24 09:35:39 +02:00
Stephane Nicoll ddc96c1a62 Merge branch '2.1.x' 
Closes gh-18336
 2019-09-24 09:19:04 +02:00
leoli 09cf1e6791 Fix property name in "Task Execution and Scheduling" example 
See gh-18331
 2019-09-24 09:16:17 +02:00
Phillip Webb d7a472b8a6 Restore HealthIndicatorRegistry beans 
Restore `HealthIndicatorRegistry` and `ReactiveHealthIndicatorRegistry`
auto-configured beans with a version that adapts to the new contributor
interfaces.

Closes gh-16903
 2019-09-23 23:43:43 -07:00
Phillip Webb 5076d8562a Fix Artemis EmbeddedJMS initialization 
Update `ArtemisConnectionFactoryFactory` to reference the new
embedded Artemis classes.

See gh-16646
 2019-09-23 23:42:30 -07:00
Phillip Webb 90defac71c Workaround Spring Data Rest enforcer issue 
Temporarily update `spring-boot-starter-data-rest` to declare
the correct spring-plugin version.
 2019-09-23 23:41:36 -07:00
Andy Wilkinson 42e0dc14b5 Migrate from deprecated Artemis EmbeddedJMS 
Closes gh-16646
 2019-09-23 18:27:32 +01:00
Brian Clozel 60b1bbb8b2 Polish "Reference Spring Framework RSocket section + polish" 
See gh-18321
 2019-09-23 18:07:31 +02:00
Rossen Stoyanchev 9a70b5d1f5 Reference Spring Framework RSocket section + polish 2019-09-23 17:51:11 +02:00
Andy Wilkinson b9cfbf7c8b Merge branch '2.1.x' 
Closes gh-18323
 2019-09-23 16:46:53 +01:00
Andy Wilkinson 9df356ec4c Fix destination checking in Artemis auto-configuration tests 
Closes gh-18319
 2019-09-23 16:45:36 +01:00
Stephane Nicoll 98ad5e53ef Start building against Spring Web Services 3.0.8 snapshots 
See gh-18316
 2019-09-23 15:42:41 +02:00
Stephane Nicoll ba2c8b333f Start building against Spring HATEOAS 1.0.0 snapshots 
See gh-18258
 2019-09-23 15:42:41 +02:00
Stephane Nicoll 71e39c7847 Start building against Spring Security 5.2.0 snapshots 
See gh-18256
 2019-09-23 15:42:41 +02:00
Stephane Nicoll 06f5f73362 Start building against Spring Kafka 2.3.0 snapshots 
See gh-18255
 2019-09-23 15:42:41 +02:00
Stephane Nicoll c2df1afff0 Start building against Spring Integration 5.2.0 snapshots 
See gh-18254
 2019-09-23 15:42:41 +02:00
Stephane Nicoll c8dc76c5bf Start building against Spring Data Moore snapshots 
See gh-18253
 2019-09-23 15:42:41 +02:00
Stephane Nicoll 8d131c4fcd Start building against Spring Batch 4.2.0 snapshots 
See gh-18252
 2019-09-23 15:42:41 +02:00
Stephane Nicoll e70da5edb0 Start building against Spring AMQP 2.2.0 snapshots 
See gh-18251
 2019-09-23 15:42:41 +02:00
Andy Wilkinson f027139743 Upgrade to Commons Compress 1.19 
Closes gh-18311
 2019-09-23 14:18:01 +01:00
Andy Wilkinson 5cd7c727d4 Drop dependency management for Spring Plugin 
Closes gh-18318
 2019-09-23 14:11:03 +01:00
Andy Wilkinson 79d8089cd0 Remove redundant spring-plugin-core dependencies 
Closes gh-18317
 2019-09-23 14:11:03 +01:00
Stephane Nicoll 7533bfd0d3 Start building against Spring Web Services 3.0.8 snapshots 
See gh-18315
 2019-09-23 13:57:31 +02:00
Stephane Nicoll f6589e66c2 Start building against Spring Kafka 2.2.9 snapshots 
See gh-18314
 2019-09-23 13:56:26 +02:00
Stephane Nicoll d38d3ea940 Start building against Spring Integration 5.1.8 snapshots 
See gh-18313
 2019-09-23 13:55:14 +02:00
Stephane Nicoll 05f857d1f1 Start building against Spring AMQP 2.1.11 snapshots 
See gh-18312
 2019-09-23 13:53:54 +02:00
Andy Wilkinson e6d60d937e Ensure the use of UTF-8 encoding in ImageBannerTests 
Closes gh-18301
 2019-09-22 20:31:51 +01:00
Andy Wilkinson ec2483e897 Polish assertions in ImageBannerTests 2019-09-22 19:44:50 +01:00
Phillip Webb b3141d8887 Use hexadecimal for string compare failure 
Update `ImageBannerTests` to use `inHexacecimal()` to help with
failure logs.

See gh-18301
 2019-09-22 09:46:58 -07:00
Andy Wilkinson 2de7b3af4a Merge branch '2.1.x' 2019-09-22 11:30:51 +01:00
Andy Wilkinson e5f26a4f1a Rename test resource to be Windows-friendly 2019-09-22 11:29:45 +01:00
Andy Wilkinson 30c05b2b49 Support X-Forwarded-Host header when auto-configuring RemoteIpValve 
Closes gh-18233
 2019-09-22 08:30:27 +01:00
Phillip Webb 303974fde9 Add block pixel mode support for image banners 
Add support for a `spring.banner.image.pixelmode` property which can
be set to `block` to use unicode block characters when rendering image
banners.

Closes gh-18301
 2019-09-22 00:18:54 -07:00
Phillip Webb 4ef1e18216 Add ANSI 8-bit color image banner support 
Update `ImageBanner` and `AnsiColors` to optionally support 8-bit
color output.

See gh-18264
 2019-09-21 23:30:05 -07:00
Phillip Webb 7f79c26b6b Polish 'Add ANSI 8-bit color support' 
See gh-18264
 2019-09-21 23:30:05 -07:00
Toshiaki Maki 65a27ef6d6 Add ANSI 8-bit color support 
Update ANSI property support to include an 8-bit (256 color) option.

See gh-18264
 2019-09-21 23:15:58 -07:00
Phillip Webb 5ca5ec8395 Merge branch '2.1.x' 
Closes gh-18299
 2019-09-21 12:46:13 -07:00
Phillip Webb 1ceb96f9f2 Ensure matches is not called before initialization 
Update `ApplicationContextRequestMatcher` to ensure that the `matches`
method is never called before `initialized`. This fixes an issue
accidentally introduced in commit 5938ca78 where concurrent calls
to `matches` could trigger unexpected errors due to the fact that the
second call proceeded before the `initialized` method had returned.

Fixes gh-18211
 2019-09-21 12:29:46 -07:00
Phillip Webb 5427526bcc Fix ApplicationContextRequestMatcher javadoc 
Fix an error in the `ApplicationContextRequestMatcher` javadoc.
 2019-09-21 12:28:58 -07:00
Andy Wilkinson 4cc7fef728 Deprecate support for Spring Cloud Connectors in favor of Java CFEnv 
Closes gh-17877
 2019-09-21 20:23:56 +01:00
Andy Wilkinson 79b5fd9d73 Polish "Allow the user that runs the app to be specified via an env var" 
See gh-16973
 2019-09-21 20:14:49 +01:00
Wagner Macedo b57f35893c Allow the user that runs the app to be specified via an env var 
See gh-16973
 2019-09-21 17:57:20 +01:00
Andy Wilkinson ea6d9f3328 Merge branch '2.1.x' 
Closes gh-18298
 2019-09-21 13:42:54 +01:00
aohana 51a8c73b7b Test custom comment prefix with one that does not work by default 
See gh-18285
 2019-09-21 13:33:20 +01:00
Andy Wilkinson 451703f321 Merge branch '2.1.x' 
Closes gh-18297
 2019-09-21 13:29:21 +01:00
Alessandro Falappa b1750defde Fix typo in configuration metadata appendix 
See gh-18289

Closes gh-18289
 2019-09-21 13:28:43 +01:00
Phillip Webb 838e7eb605 Extract spring-doc-resources URL property 
Update the build to use a shared spring-doc-resources URL
rather than repeating it multiple times.

See gh-18293
 2019-09-20 21:38:56 -07:00
Madhura Bhave 7978c3d75c Polish 2019-09-20 15:04:29 -07:00
Madhura Bhave 48960c54d1 Drop . prefix from files in .config directory for devtools 
Closes gh-18006
 2019-09-20 15:01:12 -07:00
Madhura Bhave d092df43b7 Merge branch '2.1.x' 
Closes gh-18296
 2019-09-20 14:41:55 -07:00
Madhura Bhave 3c4449bf0e Polish "Fix typo in logback example" 
See gh-18295
 2019-09-20 14:38:57 -07:00
Harald Brabenetz 0091c04720 Fix typo in logback example 
See gh-18295
 2019-09-20 14:36:01 -07:00
Brian Clozel 73ed96893f
Polish spring-doc-resources update 
See gh-18293
 2019-09-20 23:10:17 +02:00
Phillip Webb 221ff0ff6d Polish configuration property bean classes 
Refactor the `org.springframework.boot.actuate.context` package
with the following changes:

- Deprecate several classes which would ideally be internal

- Replace `ConfigurationBeanFactoryMetadata` with a new
  `ConfigurationPropertiesBean` class to better reflect that we no
  longer maintain meta-data directly.

- Use constructor injection and final fields whenever possible

- Rename `ConfiguraionPropertiesBeanDefinition` to
  `ConfigurationPropertiesValueObjectBeanDefinition` to align
  with the binder changes made in commit 0b3015e4ff

- Add additional tests

Closes gh-16903
 2019-09-20 13:42:33 -07:00
Brian Clozel 3b0c4b1837 Upgrade Spring Doc Resources and switch to light theme 
See gh-18293
 2019-09-20 20:52:13 +02:00
Brian Clozel 79e4d1354d Warn about RSocket web server compatibility 
This commit warns developers about the fact that plugging RSocket into
an existing web server is only possible with Reactor Netty web servers.
RSocket itself is using Reactor Netty, so this is why we can plug an
RSocket over websocket handler in an existing Reactor Netty handler.

This feature is not possible with other web servers, as existing APIs do
not make that possible.

Fixes gh-17494
 2019-09-20 19:20:32 +02:00
Andy Wilkinson 8791b696f8 Add auto-configuration support for TransactionalOperator 
Closes gh-18265
 2019-09-20 17:37:41 +01:00
Andy Wilkinson 3b01bc0366 Switch TransactionAutoConfigurationTests to ApplicationContextRunner 2019-09-20 17:37:08 +01:00
Brian Clozel 070eedaa19 Configure RouteMatcher at the RSocketStrategies level 
After a change in Spring Framework (see
spring-projects/spring-framework#23314), the `RouteMatcher` to be used
with the RSocket infrastructure is configured on the `RSocketStrategies`
directly.

This commit moves the auto-configuration of the
`PathPatternRouteMatcher` from the message handling parts to the RSocket
strategy one.

Closes gh-17571
 2019-09-20 18:32:21 +02:00
Andy Wilkinson 02ac089767 Polish "Support zip64 jars" 
See gh-16091
 2019-09-20 14:35:19 +01:00
Camille Vienot 1917e1eac5 Support zip64 jars 
See gh-16091
 2019-09-20 12:44:04 +01:00
Andy Wilkinson d5fc324537 Upgrade to Asciidoctor Maven Plugin 1.6.0 
Closes gh-17234
 2019-09-20 11:59:16 +01:00
Johnny Lim 0243cfa23e Fix a broken Asciidoctor syntax 
Along the way, this commit also fixes a typo.

See gh-18288
 2019-09-20 08:50:53 +02:00
Madhura Bhave 02759d65bf Merge branch '2.1.x' 2019-09-19 16:32:11 -07:00
Madhura Bhave f9d94c6ed0 Remove duplicate word in docs 2019-09-19 16:30:25 -07:00
Andy Wilkinson 39c1e47eb7 Use 3 decimal places at most for logged startup time 
Fixes gh-18278
 2019-09-19 10:18:23 +01:00
Andy Wilkinson 7d3e53c94c Fix test expectations for run-fork JVM args on Java 13+ 
Closes gh-17008
 2019-09-19 10:07:03 +01:00
Stephane Nicoll 19115d19f0 Merge branch '2.1.x' 
Closes gh-18283
 2019-09-19 09:24:14 +02:00
Alessandro Falappa 6dab9bb224 Fix pre-defined logging group documentation 
See gh-18270
 2019-09-19 09:19:24 +02:00
Johnny Lim b70be97cbf Polish 
See gh-18281
 2019-09-19 09:03:38 +02:00
Andy Wilkinson d2b28ceba5 Don't add -Xverify:none to JVM args when running on Java 13 
Closes gh-17008
 2019-09-18 21:51:41 +01:00
Brian Clozel ce2c26e934 Use Reactor's new Schedulers.boundedElastic() 
Prior to this commit, Spring Boot would use `Schedulers.elastic()` when
required to process blocking tasks in a reactive environment.
reactor/reactor-core#1804 introduced a new scheduler,
`Schedulers.boundedElastic()` that behaves quite similarly but:

* will limit the number of workers thread
* will queue tasks if no worker thread is available and reject them is
the queue is exceeds a limit

This allows Spring Boot to schedule blocking tasks as before and allows
greater flexibility.

Fixes gh-18269
See gh-18276
 2019-09-18 22:17:07 +02:00
Andy Wilkinson 9377b9a9e4 Support -- and # by default as Quartz datasource init comment prefixes 
Closes gh-17435
 2019-09-18 20:38:16 +01:00
rajadilipkolli abcff3a3b3 Use try-with-resources in HttpTunnelPayload 
See gh-11779
 2019-09-18 17:49:24 +01:00
Andy Wilkinson 9d3586d0b8 Test DatabaseDriver.ORACLE now it's available from Maven Central 
Closes gh-18274
 2019-09-18 17:08:18 +01:00
Andy Wilkinson dce9d3da82 Add dependency management for Oracle's JDBC driver 
Closes gh-18242
 2019-09-18 17:06:42 +01:00
Andy Clement 4fecefe149 Add Graal checks ahead of some interactions with ClassLoader methods 
See gh-18262
 2019-09-18 09:58:33 +01:00
Andy Wilkinson b15e427a3e Improve handling of non-standard status codes in WebFluxTags 
Closes gh-18267
 2019-09-18 09:52:39 +01:00
Andy Wilkinson 6534047fcf Rework test slice annotation javadoc to reflect JUnit 5 default 
Closes gh-18178
 2019-09-17 17:32:29 +01:00
Alessandro Falappa 38fb16a79d Fix typos in HealthContributors definition 
See gh-18249
 2019-09-17 12:38:33 +01:00
Andy Wilkinson 5ea994d955 Merge pull request #18248 from AlexFalappa 
* gh-18248:
  Remove duplicated row from HealthIndicators table

Closes gh-18248
 2019-09-17 12:37:23 +01:00
Alessandro Falappa 4aa186d6e5 Remove duplicated row from HealthIndicators table 
See gh-18248
 2019-09-17 12:36:51 +01:00
Andy Wilkinson c662c404c5 Do not enable H2C by default when using Reactor Netty 
Previously, Reactor Netty was the only embedded server that enabled
H2C by default. This commit updates the factory to only enable HTTP/2
when SSL has also been configured, aligning it with Jetty, Tomcat,
and Undertow.

If H2C is required, it can be enabled using a NettyServerCustomizer:

@Bean
NettyServerCustomizer h2cCustomizer() {
    return (httpServer) ->
           httpServer.protocol(HttpProtocol.HTTP11, HttpProtocol.H2C);
}

Closes gh-17867
 2019-09-17 10:57:24 +01:00
Andy Wilkinson d5adbbb626 Split appendices into multiple pages and include a ToC in each 
Closes gh-16289
 2019-09-17 09:44:40 +01:00
Stephane Nicoll 81ddebbc27 Merge branch '2.1.x' 
Closes gh-18239
 2019-09-16 15:12:38 +02:00
Stephane Nicoll 9434cb0e22 Keep a live reference of protocol resolvers rather than copying them 
This commit makes sure that any subsequent call on addProtocolResolver
on the context will impact the ResourceLoader implementation that
DevTools sets on the context.

This makes sure that any custom ProtocolResolver that is set later in
the lifecycle is taken into account.

Closes gh-17214
 2019-09-16 15:08:40 +02:00
Stephane Nicoll b3b6605713 Merge branch '2.1.x' 
Closes gh-18236
 2019-09-16 14:23:26 +02:00
Stephane Nicoll a642421661 Force creation of sources jar 
Closes gh-18212
 2019-09-16 14:22:26 +02:00
Andy Wilkinson 448f5b8650 Simplify error page config by dropping redundant support for Tomcat 7 
Closes gh-17937
 2019-09-16 11:48:02 +01:00
Andy Wilkinson 84b2438c4c Upgrade to Jersey 2.29.1 
Closes gh-17430
 2019-09-16 11:32:02 +01:00
Andy Wilkinson cc67213b1f Correct capitalization of GemFire in the reference docs 
Closes gh-18001
 2019-09-16 11:28:50 +01:00
Andy Wilkinson 6f20ba9550 Remove mention of Spring IO Platform from reference docs 
Closes gh-17986
 2019-09-16 11:22:36 +01:00
Phillip Webb ad32603635 Restore compatibility with MockRestServiceServer 
Closes gh-17885
 2019-09-16 10:17:41 +02:00
Stephane Nicoll 3d5530d15d Merge branch '2.1.x' 
Closes gh-18234
 2019-09-16 10:03:19 +02:00
leoli a0d2721e33 Use custom port for RSocket server over websocket 
Prior to this change, the custom port configured for the RSocket
server would not be used if the server factory is using the
websocket transport and is provided with a custom
`ReactorResourceFactory`.

Fixes gh-18200
 2019-09-16 09:53:10 +02:00
Stephane Nicoll 9065c4997d Fix rebase from master 2019-09-16 09:52:55 +02:00
Stephane Nicoll e05f42f0f3 Polish Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter" 
See gh-18214
 2019-09-16 09:44:01 +02:00
Leonard Brünings b9c8d7dd60 Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter 
See gh-18214
 2019-09-16 09:42:55 +02:00
Stephane Nicoll a0d7d52106 Polish "Add ROLLING_FILE_NAME_PATTERN for File Appender" 
See gh-18151
 2019-09-16 09:28:15 +02:00
Eddú Meléndez 4a3810a0f1 Add ROLLING_FILE_NAME_PATTERN for File Appender 
This new property allows to customize `fileNamePattern` if it is set.
Otherwise, a default pattern remains. Also, new property is supported
`logging.pattern.rolling-file-name`.

See gh-18151
 2019-09-16 09:15:59 +02:00
Phillip Webb 06f46baa9d Build against Spring Framework 5.2.0 snapshots 
See gh-18232
 2019-09-13 16:22:13 -07:00
Andy Wilkinson 2e6f15b6f3 Fix intermittent failure of inMemoryDerbyIsShutdown 2019-09-13 20:50:24 +01:00
Andy Wilkinson 1b237de5f5 Use Awaitility in our own tests 
Closes gh-18227
 2019-09-13 20:50:14 +01:00
Andy Wilkinson 568caa1206 Add dependency management for Awaitility 
Closes gh-18205
 2019-09-13 18:02:50 +01:00
Andy Wilkinson 47eee7bec8 Merge branch '2.1.x' 
Closes gh-18226
 2019-09-13 18:00:25 +01:00
Andy Wilkinson b1ca1ae6e9 Add missing dependency management for Janino modules 
Closes gh-18225
 2019-09-13 17:59:59 +01:00
Andy Wilkinson b9bb84236b Restore compatibility with Flyway 5.2 
Previously, the upgrade to Flyway 6 broke compatibility with Flyway
5.2 due to the use of method references that refer to two methods
that do not exist in Flyway 5.2.

This commit replaces the method references with lambdas that are only
called if the user sets the related property. Unless a new-in-Flyway-6
property is set, the auto-configuration will work as before. When such
a property is set the auto-configuration will fail with a
NoSuchMethodError. This approach was chosen to make the
incompatibility clear.

We have also introduced support for passing any JavaMigration beans
in the context into Flyway. This too relies on API that is new in
Flyway 6. It is possible (although unlikely) that users had
JavaMigration beans in Spring Boot 2.1 that were being ignored. This
commit restores this behaviour when using Flyway 5.2.

Closes gh-18193
 2019-09-13 10:26:59 +01:00
Stephane Nicoll b5589f8abe Merge branch '2.1.x' 
Closes gh-18222
 2019-09-13 09:06:50 +02:00
Peter Sauer dba18ce778 Fix minor typo 
The phrase `We have you covered.` is a sentence and so it should start
with a capital `W`.

See gh-18216
 2019-09-13 09:05:54 +02:00
Phillip Webb 8e398e164c Fix checkstyle violations 2019-09-12 15:23:32 -07:00
Phillip Webb eea5d15412 Merge branch '2.1.x' 
Closes gh-18219
 2019-09-12 15:11:13 -07:00
Phillip Webb 23174eb484 Remember annotations when using withExistingValue 
Update `Bindable` builder methods so that existing annotations are
retained.

Closes gh-18218
 2019-09-12 15:09:47 -07:00
Stephane Nicoll 70f7e47002 Polish "Use Duration for ServerProperties.Jetty.idleTimeout" 
See gh-18206
 2019-09-12 15:13:31 +02:00
Johnny Lim 96019362f7 Use Duration for ServerProperties.Jetty.idleTimeout 
See gh-18206
 2019-09-12 14:59:54 +02:00
Johnny Lim 5b41c3b608 Polish 
See gh-18192
 2019-09-12 14:55:47 +02:00
Brian Clozel 219bafaba1 Apply RSocket server customizers to netty web server 
This commit applies `ServerRSocketFactoryCustomizer` beans to RSocket
setups when the RSocket server is being plugged into an existing Reactor
Netty web server.

Fixes gh-18208
 2019-09-11 21:09:43 +02:00
Andy Wilkinson f033016364 Allow @Component on mutable @ConfigurationProperties 
Update configuration properties support to allow the `@Component`
annotation to be used on `@ConfigurationProperties` beans as long
as they are mutable.

This restores the behavior of Spring Boot 2.1 for mutable beans whilst
still allowing us to enforce the stricter rules for immutable value
object configuration properties.

Closes gh-18138
 2019-09-09 23:04:50 -07:00
wonwoo b321dacc1c Fix typo in javadoc 
See gh-18187
 2019-09-09 15:22:21 +02:00
Andy Wilkinson 0074a7c662 Merge branch '2.1.x' 2019-09-09 14:03:55 +01:00
Andy Wilkinson 4f21b51a2b Polish one sentence per line in the reference docs 2019-09-09 14:00:12 +01:00
Stephane Nicoll a56eb4b974 Fix typo 2019-09-09 14:23:24 +02:00
Stephane Nicoll ae34ae78dc Polish "Remove management.health.status.order from docs" 
See gh-18170
 2019-09-09 14:13:46 +02:00
dreis2211 0975b5b220 Fix link formatting in custom HealthIndicator section 
See gh-18170
 2019-09-09 14:13:23 +02:00
dreis2211 7a49651e09 Remove management.health.status.order from docs 
See gh-18170
 2019-09-09 14:13:04 +02:00
Stephane Nicoll 14a676052f Polish 
This commit moves `@ConfigurationProperties` to the `@Bean` factory
method as this is unusual to put it at class level if it's exposed
that way.

As HealthIndicatorProperties has a constructor, this makes sure that
the annotation processor enables JavaBean binding mode.
 2019-09-09 13:37:54 +02:00
Stephane Nicoll 39fed4a9d9 Fix binding detection of ConfigurationProperties contributed by @Bean 
This commit makes sure that a ConfigurationProperties type contributed
by a `@Bean` factory method uses properties binding regardless of the
presence of a matching constructor.

`@Bean` method makes sure the user is in control and will be responsible
of creating the instance. As a result, binding of properties will not
happen there and therefore can only happen with regular JavaBean
accessors.

Closes gh-18184
 2019-09-09 13:29:31 +02:00
Andy Wilkinson 0c0e2dd54b Merge branch '2.1.x' 
Closes gh-18186
 2019-09-09 11:16:30 +01:00
Andy Wilkinson 674d3dd262 Polish health endpoint documentation for groups and nesting 
Closes gh-14022
 2019-09-09 11:02:39 +01:00
Andy Wilkinson 7b1e10ed00 Use one sentence per line in Actuator and Gradle plugin doc source 
Closes gh-18185
 2019-09-09 10:59:49 +01:00
gaohanghang 74d2fe472a Simplify code 
See gh-18175
 2019-09-09 09:51:55 +02:00
Andy Wilkinson 41111ac96f Upgrade to Junit Jupiter 5.5.2 
Closes gh-18182
 2019-09-09 07:00:53 +01:00
Andy Wilkinson ba6bd12898 Upgrade to Glassfish El 3.0.3 
Closes gh-18181
 2019-09-09 07:00:52 +01:00
Andy Wilkinson 35c01e3f08 Upgrade to Micrometer 1.2.1 
Closes gh-18180
 2019-09-09 07:00:51 +01:00
dreis2211 09e991ca1c Fix broken links for master snapshot builds 
See gh-18172
 2019-09-08 08:36:28 +02:00
Andy Wilkinson 2472836c48 Upgrade to Spring Session Bom Corn-M4 
Closes gh-17903
 2019-09-07 10:54:54 +01:00
Andy Wilkinson 9b6a425f91 Upgrade to Spring Batch 4.2.0.RC1 
Closes gh-17899
 2019-09-07 07:56:35 +01:00
Andy Wilkinson 9262a55892 Upgrade to Spring Kafka 2.3.0.RC1 
Closes gh-17902
 2019-09-06 20:28:00 +01:00
Andy Wilkinson 57d2c38dee Upgrade to Spring AMQP 2.2.0.RC1 
Closes gh-17898
 2019-09-06 20:27:24 +01:00
Andy Wilkinson c4e2784ac2 Upgrade to Spring Integration 5.2.0.RC1 
Closes gh-17901
 2019-09-06 20:26:46 +01:00
Andy Wilkinson 87c7307d28 Upgrade to Spring Security 5.2.0.RC1 
Closes gh-17897
 2019-09-06 20:25:48 +01:00
Andy Wilkinson 80b8f19961 Tune @ConditionalOnMissingBean for interface-based back off 
Previously, a number of usages of @ConditionalOnMissingBean prevented
a bean that implements an auto-configured bean's "main" interface from
causing the auto-configuration of the bean to back off. This would
happen when @ConditionalOnMissingBean did not specify a type, the
@Bean method returned the bean's concrete type, and that concreate
type implements a "main" interface.

This commit updates such usages of @ConditionalOnMissingBean to
specify the "main" interface as the type of the bean that must be
missing. This will allow, for example, the auto-configured
MongoTemplate bean to back off when a MongoOperations bean is defined.
 2019-09-06 17:55:06 +01:00
Andy Wilkinson ff1983c9ae Merge branch '2.1.x' 
Closes gh-18168
 2019-09-06 14:38:45 +01:00
Andy Wilkinson 795c2f225f Support getComment() on a nested JarFile 
Previously, calling getComment() on a nested jar file would result
in the outer jar file's comment being returned.

This commit updates the loader's JarFile to read the file's comment
from the central directory end record and return it from getComment().

Fixes gh-18128
 2019-09-06 14:29:48 +01:00
Andy Wilkinson fc1889ee72 Merge branch '2.1.x' 
Closes gh-18167
 2019-09-06 14:04:54 +01:00
dreis2211 ae30515e5e Test the Gradle Plugin against Gradle 5.6.2 
See gh-18164
 2019-09-06 13:19:08 +01:00
Andy Wilkinson 71d5d481ad Merge branch '2.1.x' 
Closes gh-18165
 2019-09-06 13:07:58 +01:00
Andy Wilkinson 19ccfaea86 Fix QuartzAutoConfiguration when Liquibase is not on the class path 
Fixes gh-18153
 2019-09-06 13:05:53 +01:00
Andy Wilkinson 715e90437f Merge branch '2.1.x' 2019-09-06 12:47:06 +01:00
Andy Wilkinson 8882c532cd Correct attribute references in reference documentation 
Fixes gh-18163
 2019-09-06 12:45:35 +01:00
Andy Wilkinson 07eb1815b2 Upgrade to Spring Data Moore-RC3 
Closes gh-17900
 2019-09-06 11:14:01 +01:00
Andy Wilkinson 628854c53d Upgrade to Neo4j Ogm 3.2.0-RC2 
Closes gh-18162
 2019-09-06 11:12:18 +01:00
Andy Wilkinson 6de723e225 Upgrade to Jooq 3.12.1 
Closes gh-18161
 2019-09-06 11:12:17 +01:00
Andy Wilkinson 283c67713a Upgrade to Kotlin Coroutines 1.3.1 
Closes gh-18160
 2019-09-06 11:12:16 +01:00
Andy Wilkinson a0a214de24 Upgrade to Elasticsearch 6.8.3 
Closes gh-18159
 2019-09-06 11:12:15 +01:00
Andy Wilkinson f799e1dcd9 Upgrade to Ehcache3 3.8.1 
Closes gh-18158
 2019-09-06 11:12:13 +01:00
Andy Wilkinson 9554bf5eff Upgrade to Jakarta Ws Rs 2.1.6 
Closes gh-18157
 2019-09-06 11:12:12 +01:00
Andy Wilkinson e922e2ab66 Upgrade to Jakarta Websocket 1.1.2 
Closes gh-18156
 2019-09-06 11:12:11 +01:00
Andy Wilkinson 03314a752e Upgrade to Jakarta Servlet Jsp Jstl 1.2.7 
Closes gh-18155
 2019-09-06 11:12:11 +01:00
Andy Wilkinson 61cbb1cade Upgrade to Jakarta Servlet 4.0.3 
Closes gh-18154
 2019-09-06 11:12:09 +01:00
Andy Wilkinson 1f875d552a Polish "Add a config property for JMS listener container's receive timeout" 
See gh-17332
 2019-09-05 21:42:13 +01:00
ibmmqmet 1cde657861 Add a config property for JMS listener container's receive timeout 
See gh-17332
 2019-09-05 21:30:53 +01:00
Andy Wilkinson 6328f2e8a8 Polish "Make logError() in AbstractErrorWebExceptionHandler overrideable" 
See gh-17863
 2019-09-05 21:18:21 +01:00
Peter Jurkovic 7ea612beaf Make logError() in AbstractErrorWebExceptionHandler overrideable 
See gh-17863
 2019-09-05 21:04:45 +01:00
Andy Wilkinson e8de5a6d95 Provide a public API for determining a request's outcome 
Closes gh-18150
 2019-09-05 20:54:35 +01:00
dreis2211 a2a672de0e Improve handling of non-standard status codes in WebMvcTags 
See gh-17998
 2019-09-05 20:34:25 +01:00
Andy Wilkinson 4069d855e8 Upgrade to Spring HATEOAS 1.0.0.RC2 
Closes gh-17904
 2019-09-05 17:16:30 +01:00
Andy Wilkinson 58eddb8fa4 Become compatible with Jackson 2.10 while remaining 2.9 compatible 
See gh-17999
 2019-09-05 17:13:45 +01:00
Stephane Nicoll 743351e067 Upgrade to Httpcore 4.4.12 
Closes gh-18147
 2019-09-05 14:44:45 +02:00
Stephane Nicoll 798fe069ce Upgrade to Activemq 5.15.10 
Closes gh-18146
 2019-09-05 14:44:44 +02:00
Stephane Nicoll a4582307da Upgrade to Undertow 2.0.26.Final 
Closes gh-18145
 2019-09-05 14:44:43 +02:00
Stephane Nicoll 9cd93ac98f Upgrade to Httpcore 4.4.12 
Closes gh-18144
 2019-09-05 14:41:40 +02:00
Stephane Nicoll 5fe4f3b25a Upgrade to Activemq 5.15.10 
Closes gh-18143
 2019-09-05 14:41:39 +02:00
Stephane Nicoll fd77fd4f05 Upgrade to Undertow 2.0.26.Final 
Closes gh-18142
 2019-09-05 14:41:38 +02:00
Stephane Nicoll e978f9ac8e Upgrade to Reactor Bom Californium-SR11 
Closes gh-18141
 2019-09-05 14:41:37 +02:00
Stephane Nicoll e7474b55de Upgrade to Reactor Dysprosium-RC1 
Closes gh-17895
 2019-09-05 13:10:20 +02:00
Stephane Nicoll 359279b1fb Upgrade to Spring Framework 5.2.0.RC2 
Closes gh-17896
 2019-09-05 13:08:59 +02:00
Stephane Nicoll 7cb2eb1850 Polish "Polish test" 
See gh-18130
 2019-09-05 08:54:35 +02:00
Eddú Meléndez 16a0188666 Polish test 
See gh-18130
 2019-09-05 08:54:06 +02:00
Stephane Nicoll 85a44dff64 Upgrade to Micrometer 1.1.6 
Closes gh-18133
 2019-09-05 08:28:06 +02:00
Phillip Webb f70c0b8fbb Merge branch '2.1.x' 2019-09-04 22:20:27 -07:00
Phillip Webb a3cde7fd8d Fix typo 2019-09-04 22:20:14 -07:00