3229 Commits

Author SHA1 Message Date
Madhura Bhave
c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave
6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave
6bd438a737 Document @ConditionalOnProperty limitation with collections
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave
78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave
57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
dreis2211
4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector
Closes gh-13908
2018-07-26 17:06:04 +02:00
Phillip Webb
b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb
9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Stephane Nicoll
bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll
99f33d5070 Start building against Spring Data Kay snapshots
See gh-13890
2018-07-25 15:34:52 +02:00
Andy Wilkinson
1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
2018-07-25 15:21:20 +02:00
Stephane Nicoll
56542ef809 Start building against Spring Integration 2.1.0 snapshots
See gh-13891
2018-07-25 14:50:14 +02:00
Madhura Bhave
eefa0ada9f Allow property overrides for OIDC Configuration Provider
Closes gh-13869
2018-07-24 15:11:05 -07:00
Madhura Bhave
5011bc6451 Merge branch '2.0.x' 2018-07-24 14:28:01 -07:00
Madhura Bhave
6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Madhura Bhave
f5617601aa Polish "Register OAuth2AuthorizedClientRepository bean"
Closes gh-13870
2018-07-24 13:31:03 -07:00
artsiom
2dcf19938d Register OAuth2AuthorizedClientRepository bean 2018-07-24 13:30:36 -07:00
Stephane Nicoll
c98bb40136 Adapt NoSuchBeanDefinitionFailureAnalyzer to framework change
This commit adapts to a Spring Framework change based on SPR-11419 and
SPR-15338. Rather than throwing an exception when injecting a List or
Map of a candidate bean that is not present, an empty collection/map is
injected.
2018-07-24 13:36:38 +02:00
Stephane Nicoll
5fb2060566 Polish "Add configuration for Tomcat's cachingAllowed property"
Closes gh-13614
2018-07-24 11:20:35 +02:00
Rob Tompkins
200ac6db30 Add configuration for Tomcat's cachingAllowed property
See gh-13614
2018-07-24 11:18:33 +02:00
Stephane Nicoll
dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll
7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
dreis2211
d0918f87b2 Fix OAuth2WebSecurityConfigurationTests
Closes gh-13872
2018-07-24 09:57:42 +02:00
Andy Wilkinson
70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson
daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Stephane Nicoll
11d9a7c30d Merge branch '2.0.x' 2018-07-20 15:51:28 +02:00
Stephane Nicoll
fc0a687ee0 Migrate test to ApplicationContextRunner 2018-07-20 15:51:14 +02:00
Madhura Bhave
d958e83799 Merge branch '2.0.x' 2018-07-19 15:48:29 -07:00
Madhura Bhave
56235187d0 Fix typo 2018-07-19 15:47:14 -07:00
Andy Wilkinson
a33dd8b9cb Merge branch '2.0.x' 2018-07-19 20:43:58 +01:00
Andy Wilkinson
10b91602e9 Increase connect and read timeouts when testing against Cassandra 2018-07-19 20:43:39 +01:00
Stephane Nicoll
bc7db86c8c Consistently apply exclude on auto-configuration
Previously, exclude of an import selector was applied only locally. In
other words, if one import selector imports `AcmeAutoConfiguration` and
another one exclude it, it would still be imported because exclude were
applied separately

This commit collects the outcome of all auto-configuration import
selectors and then apply exclusions in a single pass.

Closes gh-12586
2018-07-19 14:08:10 +02:00
Stephane Nicoll
184cd0c708 Avoid CGLIB requirement in MessageSourceAutoConfiguration
Closes gh-13824
2018-07-19 13:58:19 +02:00
Madhura Bhave
ceaac98847 Update docs with OIDC provider configuration
See gh-13210
2018-07-18 12:27:13 -07:00
Madhura Bhave
f88ebc06ff Add support for OIDC Configuration Provider
Closes gh-13210
2018-07-17 16:02:03 -07:00
Stephane Nicoll
526b50645e Merge branch '2.0.x' 2018-07-17 15:48:26 +02:00
dreis2211
e9a8d4c949 Remove unused AbstractCouchbaseAutoConfigurationTests
Closes gh-13797
2018-07-17 15:48:00 +02:00
Stephane Nicoll
8bf22db9c3 Merge branch '2.0.x' 2018-07-17 15:46:20 +02:00
Stephane Nicoll
6e749ef276 Improve NoSuchBeanDefinitionFailureAnalyzer to handle null beans
Previously, if a user defines a `@Bean` with a method that returns
`null`, injection by type will ignore that definition but the report
doesn't mention that candidate.

This commit improves the failure analyzer to look for user-defined beans
as well, detecting beans that are `null` matching the requested type
and including them in the report.

Closes gh-13531
2018-07-17 15:45:49 +02:00
Stephane Nicoll
ada699a9f6 Allow to customize the RabbitMQ RetryTemplate
This commit adds the ability to customize the RetryTemplate used in the
RabbitMQ infrastructure. The customizer is slightly unusual and offer
a `Target` enum that define the component that will use the retry
template: `SENDER` for the auto-configured `RabbitTemplate` and
`LISTENER` for a listener container created by a
`RabbitListenerContainerFactoryConfigurer`.

Closes gh-13793
2018-07-17 11:31:20 +02:00
Stephane Nicoll
43091150d8 Merge branch '2.0.x' 2018-07-17 10:23:12 +02:00
Stephane Nicoll
8095ee4a5b Polish contribution
See gh-13790
2018-07-17 10:12:34 +02:00
Johnny Lim
f363fe7dd1 Polish
See gh-13790
2018-07-17 10:03:41 +02:00
Brian Clozel
624cbe08d5 Merge branch '2.0.x' 2018-07-16 23:37:31 +02:00
Brian Clozel
58e886fddf Remove @Lazy injection for HttpMessageConverters
This commit turns a lazy injection point for `HttpMessageConverters`
into an `ObjectProvider`-backed injection.

This allows to lazily rely on that bean without creating for it; in some
environments, such proxy creation can lead to issues like SPR-16990.

See gh-13785
2018-07-16 23:12:47 +02:00
Stephane Nicoll
3c67edafcd Expose more Quartz properties
Closes gh-13782
2018-07-16 14:07:10 +02:00
Stephane Nicoll
66cb4ce3c7 Polish "Allow to configure Quartz's "overwriteExistingJobs" property"
Closes gh-13582
2018-07-16 14:06:13 +02:00
Taras Danylchuk
910e6dc4cc Allow to configure Quartz's "overwriteExistingJobs" property
See gh-13582
2018-07-16 14:06:13 +02:00
Stephane Nicoll
9c0ce3d20a Merge branch '2.0.x' 2018-07-16 10:51:27 +02:00
Johnny Lim
f2cef87878 Fix since on JdbcOperationsDependsOnPostProcessor
Closes gh-13778
2018-07-16 10:50:55 +02:00