Commit Graph

16932 Commits

Author SHA1 Message Date
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 53400b1d81 Merge branch '1.5.x' into 2.0.x 2018-07-18 11:15:40 +01:00
Andy Wilkinson 56cb968b62 Make Jetty Server fail when its WebAppContext fails to start
Closes gh-13803
2018-07-18 11:10:48 +01: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 777fc5e464 Merge pull request #13775 from izeye
* gh-13775:
  Polish EndpointRequest.RequestMatcherFactory.antPath()
2018-07-17 16:53:56 -07:00
Johnny Lim 86ccb26c58 Polish EndpointRequest.RequestMatcherFactory.antPath()
Closes gh-13775
2018-07-17 16:53:33 -07:00
Madhura Bhave c36804908c Merge branch '1.5.x' into 2.0.x 2018-07-17 16:43:02 -07:00
Madhura Bhave 912eb53d7a Clarify configuration class behavior based on bean conditions 2018-07-17 16:37:20 -07:00
Andy Wilkinson a57d0f0853 Reinstate order of WebMvcMetricsFilter
Closes gh-13781
2018-07-17 19:14:17 +01: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 fd03bde769 Merge pull request #13797 from dreis2211:remove-unused-couchbase-test-abstraction
* pr/13797:
  Remove unused AbstractCouchbaseAutoConfigurationTests
2018-07-17 15:48:14 +02:00
dreis2211 e9a8d4c949 Remove unused AbstractCouchbaseAutoConfigurationTests
Closes gh-13797
2018-07-17 15:48:00 +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 e679690a74 Clarify the WebTestClient requires WebFlux on the classpath
Closes gh-13469
2018-07-17 14:06:41 +02:00
Stephane Nicoll d6c7eff8f7 Add check for empty values for lookup
Closes gh-13419
2018-07-17 12:01:26 +02:00
Stephane Nicoll 714f3deaa5 Merge pull request #13790 from izeye:polish-20180717
* pr/13790:
  Polish contribution
  Polish
2018-07-17 10:22:54 +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
Stephane Nicoll ec2ebf52de Merge branch '1.5.x' into 2.0.x 2018-07-17 08:22:15 +02:00
Stephane Nicoll b522199920 Merge pull request #13792 from dreis2211:missing-test-annotation
* pr/13792:
  Add missing @Test in RestarterTests
2018-07-17 08:17:54 +02:00
dreis2211 fba971f47b Add missing @Test in RestarterTests
Closes gh-13792
2018-07-17 08:08:01 +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 ffe994335e Merge branch '1.5.x' into 2.0.x 2018-07-16 14:12:16 +02:00
Stephane Nicoll fec5ecc5b0 Merge pull request #13779 from izeye:type-utils-line-separator
* pr/13779:
  Remove carriage returns in TypeUtils.getJavaDoc()
2018-07-16 14:11:58 +02:00
Johnny Lim 9fba2c4a62 Remove carriage returns in TypeUtils.getJavaDoc()
Closes gh-13779
2018-07-16 14:11:32 +02:00
Stephane Nicoll a18c413767 Merge pull request #13778 from izeye:patch-50
* pr/13778:
  Fix since on JdbcOperationsDependsOnPostProcessor
2018-07-16 10:51:10 +02:00
Johnny Lim f2cef87878 Fix since on JdbcOperationsDependsOnPostProcessor
Closes gh-13778
2018-07-16 10:50:55 +02:00
Stephane Nicoll 1ca8808a97 Merge pull request #13776 from izeye:polish-20180715
* pr/13776:
  Polish
2018-07-16 10:37:24 +02:00
Johnny Lim 068e22d60b Polish
See gh-13776
2018-07-16 10:34:00 +02:00
Stephane Nicoll f325ee9406 Merge pull request #13774 from izeye:composite-property-sources
* pr/13774:
  Remove a List creation in CompositePropertySources.iterator()
2018-07-16 10:26:57 +02:00
Johnny Lim 4314dc2972 Remove a List creation in CompositePropertySources.iterator()
Closes gh-13774
2018-07-16 10:20:49 +02:00
Stephane Nicoll e6ea28dec5 Polish 2018-07-13 09:36:37 +02:00
Stephane Nicoll 2dc0488af7 Merge pull request #13706 from izeye:duplicate-empty-path
* pr/13706:
  Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
2018-07-13 09:36:10 +02:00
Johnny Lim 13202eb278 Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
Closes gh-13706
2018-07-13 09:35:34 +02:00
Stephane Nicoll 174cc2bc4e Merge branch '1.5.x' into 2.0.x 2018-07-13 09:25:42 +02:00
Stephane Nicoll e556c04d83 Remove class file 2018-07-13 09:21:27 +02:00
Stephane Nicoll 6602fa3c90 Clean line breaks in configuration metadata descriptions.
Closes gh-13601
2018-07-13 09:19:17 +02:00
Stephane Nicoll ed609f6395 Merge pull request #13762 from dreis2211:fix-typos-2
* pr/13762:
  Fix typos
2018-07-13 07:55:40 +02:00
dreis2211 ac8eebfbad Fix typos
Closes gh-13762
2018-07-13 07:54:03 +02:00
Stephane Nicoll 19709f7dea Polish 2018-07-12 16:57:52 +02:00
Stephane Nicoll 510c99cc0e Merge branch '1.5.x' into 2.0.x 2018-07-12 08:55:10 +02:00
Stephane Nicoll c23c18dc34 Merge pull request #13755 from izeye:patch-49
* pr/13755:
  Fix typo
2018-07-12 08:51:32 +02:00
Johnny Lim e7cb1c63bb Fix typo
Closes gh-13755
2018-07-12 08:51:11 +02:00
Madhura Bhave d7822ba135 Update copyright header for modified files 2018-07-11 15:25:39 -07:00
Madhura Bhave c8c32cfa33 Migrate tests to ApplicationContextRunner 2018-07-11 15:06:36 -07:00
Andy Wilkinson cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Andy Wilkinson c489c6c5f6 Polish test following forward merge 2018-07-11 17:13:45 +01:00
Andy Wilkinson 67dfa0a720 Merge branch '1.5.x' into 2.0.x 2018-07-11 16:51:43 +01:00