Stephane Nicoll
0f0fc9ec62
Adapt assertion to logging change in Spring Framework
2018-07-20 17:12:56 +02: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
14a0064c53
Merge branch '2.0.x'
2018-07-19 16:32:59 -07:00
Madhura Bhave
660d284f45
Document when and how to use brackets when binding to maps
...
Closes gh-13506
2018-07-19 16:31:59 -07: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
Andy Wilkinson
1852ecc444
Merge branch '2.0.x'
2018-07-19 19:59:08 +01:00
Andy Wilkinson
de7899fba4
Improve reliability by give Cassandra more time and attempts to start
2018-07-19 19:57:54 +01:00
Andy Wilkinson
d11ee29fa1
Merge branch '2.0.x'
2018-07-19 18:32:49 +01:00
Andy Wilkinson
bfc4cad692
Upgrade to Spring REST Docs 2.0.2.RELEASE
...
Closes gh-13505
2018-07-19 18:32:38 +01:00
Stephane Nicoll
5be84dd32b
Merge branch '2.0.x'
2018-07-19 17:58:14 +02:00
Stephane Nicoll
cdbe6fa122
Document properties migrator usage
...
Closes gh-13600
2018-07-19 17:57:42 +02:00
Andy Wilkinson
13835c5dc7
Upgrade to Spring Batch 4.1.0.M2
...
Closes gh-13820
2018-07-19 16:56:38 +01:00
Stephane Nicoll
1c0eb8de36
Merge branch '2.0.x'
2018-07-19 16:42:51 +02:00
Stephane Nicoll
a1ef3f070a
Improve documentation for using a mock environment with @SpringBootTest
...
Closes gh-13827
2018-07-19 16:40:24 +02:00
Stephane Nicoll
237f2fb494
Merge branch '2.0.x'
2018-07-19 14:55:21 +02:00
Stephane Nicoll
592754d806
Polish "Make sure exception tag values are not empty in web metrics"
...
Closes gh-13187
2018-07-19 14:53:29 +02:00
Jon Schneider
ee37dc1c31
Make sure exception tag values are not empty in web metrics
...
See gh-13187
2018-07-19 14:40:58 +02: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
6333edbe16
Merge branch '2.0.x'
2018-07-18 11:01:38 -07:00
Madhura Bhave
66156cc24f
Polish
2018-07-18 10:29:43 -07:00
Andy Wilkinson
b58314f214
Merge branch '2.0.x'
2018-07-18 14:17:35 +01:00
Andy Wilkinson
681717d07a
Merge branch '1.5.x' into 2.0.x
2018-07-18 14:17:15 +01:00
Andy Wilkinson
147a08eb4c
Merge branch '2.0.x'
2018-07-18 13:47:31 +01:00
Andy Wilkinson
b9ad0d9992
Test the Gradle plugin against Gradle 4.8.1 instead of 4.8
...
Closes gh-13809
2018-07-18 13:34:27 +01:00
Andy Wilkinson
8deea933b9
Test the Gradle plugin against Gradle 4.9
...
Closes gh-13808
2018-07-18 13:33:39 +01:00
Andy Wilkinson
93daac7ba8
Merge branch '2.0.x'
2018-07-18 11:22:15 +01:00
Andy Wilkinson
53400b1d81
Merge branch '1.5.x' into 2.0.x
2018-07-18 11:15:40 +01:00
Madhura Bhave
dcb172fe2a
Merge branch '2.0.x'
2018-07-17 17:09:25 -07:00
Madhura Bhave
e907ae605d
Fix tests
...
See gh-13783
2018-07-17 17:08:53 -07:00
Madhura Bhave
9bd723ddad
Fix exception message
...
Fixes gh-13783
2018-07-17 17:05:29 -07:00
Madhura Bhave
9b6a069903
Merge branch '2.0.x'
2018-07-17 16:54:43 -07:00
Johnny Lim
86ccb26c58
Polish EndpointRequest.RequestMatcherFactory.antPath()
...
Closes gh-13775
2018-07-17 16:53:33 -07:00
Madhura Bhave
ddce819e6f
Merge branch '2.0.x'
2018-07-17 16:44:23 -07:00
Madhura Bhave
c36804908c
Merge branch '1.5.x' into 2.0.x
2018-07-17 16:43:02 -07:00
Madhura Bhave
f88ebc06ff
Add support for OIDC Configuration Provider
...
Closes gh-13210
2018-07-17 16:02:03 -07:00
Madhura Bhave
4fee54cf24
Expose a TestDispatcherServlet bean in the MockMvcAutoConfiguration
...
This commit also contains changes to `ServletContextInitializerBeans`.
`ServletContextInitializerBeans` can now be configured to only look
for specific ServletContextInitializer subclasses, defaulting to
ServletContextIntializer.class. `SpringBootMockMvcBuilderCustomizer`
only cares about filters so it was unnecessary to look for all
`ServletContextInitializer`s. Additionally, adapting `Servlet` beans
caused a cycle once the `DispatcherServlet` bean was added and the
customizer only needs to adapt `Filter` beans.
Closes gh-13241
2018-07-17 13:00:54 -07:00
Andy Wilkinson
6a189cee06
Merge branch '2.0.x'
2018-07-17 19:26:08 +01:00
Andy Wilkinson
a57d0f0853
Reinstate order of WebMvcMetricsFilter
...
Closes gh-13781
2018-07-17 19:14:17 +01:00
Stephane Nicoll
a98b020ee4
Merge branch '2.0.x'
2018-07-17 17:04:49 +02:00
Stephane Nicoll
944ed767ac
Add dependency management for elasticsearch integration tests distro
...
Closes gh-13547
2018-07-17 17:03:45 +02: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