Commit Graph

20799 Commits

Author SHA1 Message Date
Madhura Bhave 5bd2b349bc Merge branch '2.1.x' 2019-03-25 16:04:22 -07:00
Madhura Bhave 91c1fc3d97 Ignore unbound collection properties if collection bound
As of Spring Boot 2.0, if Collection properties are specified in
multiple property sources, only the elements from the property source
with the highest precedence are used for binding. This caused an
`UnboundConfigurationPropertiesException` if the size of the collection
from the higher order property source was smaller and `ignoreUnknownFields`
was set to true.

This commit ignores unbound collection properties if the
collection was properly bound.

Fixes gh-16290
2019-03-25 16:03:33 -07:00
Madhura Bhave 95d10388dd Merge branch '2.1.x' 2019-03-25 11:03:10 -07:00
Madhura Bhave 0c2e71cd08 Prevent early initialization of factory beans in text context customizers
Until Spring Framework 5.1.15, a FactoryBean with a non-default constructor
defined via component scanning would cause an error. This behavior has changed
as of https://github.com/spring-projects/spring-framework/issues/22409.
Regardless of this change we want to ensure that we avoid triggering eager
initialisation. `SimpleFactoryBean` has been written this way so that the tests
fail if early initialization is triggered regardless of the Spring Framework version.

Fixes gh-15898
2019-03-25 10:55:41 -07:00
Stephane Nicoll dec5a8cc7e Merge branch '2.1.x' 2019-03-25 16:14:10 +01:00
Stephane Nicoll 274e9ede81 Set up CI for JDK 12
Closes gh-16212
2019-03-25 16:13:44 +01:00
Stephane Nicoll 567a82f4ba Update multi release test jar to include Java 12
See gh-16212
2019-03-25 16:13:24 +01:00
Stephane Nicoll b055410ab4 Fix outdated tests
Closes gh-16298
2019-03-25 11:58:09 +01:00
Stephane Nicoll b604ccce32 Merge pull request #16298 from yalov4uk
* pr/16298:
  Fix LogFile conditions to check for exposure as well
2019-03-25 11:34:57 +01:00
Valery_Yalauchuk c880e10c41 Fix LogFile conditions to check for exposure as well
Closes gh-16298
2019-03-25 11:34:32 +01:00
Stephane Nicoll 76ca467d92 Merge branch '2.1.x' 2019-03-25 11:31:24 +01:00
Stephane Nicoll bd2cc6f48b Add missing condition on LogFile endpoint
See gh-16298
2019-03-25 11:30:45 +01:00
Stephane Nicoll 90160b16aa Merge branch '2.1.x' 2019-03-25 10:20:52 +01:00
Stephane Nicoll 0bd2e40da0 Merge pull request #16294 from dreis2211
* pr/16294:
  Test against Gradle 5.3
2019-03-25 10:20:38 +01:00
dreis2211 c2335e130c Test against Gradle 5.3
Closes gh-16294
2019-03-25 10:19:57 +01:00
Stephane Nicoll 197e1669e2 Polish 2019-03-25 09:01:13 +01:00
Madhura Bhave 2225b36299 Merge branch '2.1.x' 2019-03-22 15:18:23 -07:00
Madhura Bhave 1ad52b651a Document using the same port for the management server on CF
Closes gh-15640
2019-03-22 15:17:34 -07:00
Madhura Bhave 799352a7b8 Merge branch '2.1.x' 2019-03-22 14:25:42 -07:00
Madhura Bhave 10f0bcf992 Merge branch '2.0.x' into 2.1.x 2019-03-22 14:25:00 -07:00
Madhura Bhave 3e82e7aa7e Publish release notes after central sync for releases
Closes gh-15713
2019-03-22 14:23:13 -07:00
Stephane Nicoll 3125f424ce Add metadata support for immutable ConfigurationProperties type
Closes gh-16071
2019-03-22 15:33:35 +01:00
Madhura Bhave 35d7fccb33 Update samples to use configuration properties scanning
Closes gh-12602
2019-03-21 13:30:45 -07:00
Madhura Bhave 8f693a0277 Add support for configuration properties scanning
See gh-12602
2019-03-21 13:30:44 -07:00
Brian Clozel 711169aa8a Adapt tests after Servlet.fn added to Spring Framework
Since Servlet.fn support has been added in Spring Framework, new
infrastructure beans (like `HandlerAdapter` and `HandlerMapping`) have
been added.

This commit adapts the Spring MVC auto-configuration tests to reflect
those changes.
2019-03-21 14:31:38 +01:00
Stephane Nicoll 6e9e5e5a8b Ignore duplicate "about.html" in Jetty HTTP client
Closes gh-16272
2019-03-21 11:36:27 +01:00
Madhura Bhave 0d136f0573 Merge branch '2.1.x' 2019-03-20 18:00:48 -07:00
Madhura Bhave 0a54fb73fa Remove redundant include from WebFluxTypeExcludeFilter
For webflux, security configuration is configured via a bean of type
`SecurityWebFilterChain` and not `ServerHttpSecurity`. We would have changed
the include to be `SecurityWebFilterChain` but the filter only applies to
beans registered via component scanning and not those registered in
`@Configuration` classes, making the includes redundant.

See gh-16088
2019-03-20 17:54:04 -07:00
Madhura Bhave 8f0850a69c Merge branch '2.1.x' 2019-03-20 17:48:57 -07:00
Madhura Bhave 6bd6279eff Document slice test behavior with @Configuration classes
Closes gh-16274
2019-03-20 17:48:14 -07:00
Andy Wilkinson 41967fc629 Correct the URI used for the properties DTD
See gh-16270
2019-03-20 17:48:33 +00:00
Andy Wilkinson 157c285b55 Merge branch '2.1.x' 2019-03-20 17:31:51 +00:00
Andy Wilkinson 10e726ead2 Merge branch '2.0.x' into 2.1.x 2019-03-20 17:31:40 +00:00
Andy Wilkinson 5f4fa9d52a Merge branch '1.5.x' into 2.0.x 2019-03-20 17:31:31 +00:00
Andy Wilkinson 91726f3162 Update the samples to use Spring Java Format 0.0.7 2019-03-20 17:30:25 +00:00
Andy Wilkinson 41bb2ef426 Merge branch '2.1.x' 2019-03-20 17:17:26 +00:00
Andy Wilkinson ce145a833c Merge branch '2.0.x' into 2.1.x 2019-03-20 17:17:13 +00:00
Andy Wilkinson 70d883a8ee Correct the location to which Java 8 is extracted
Closes gh-15813
2019-03-20 17:16:20 +00:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson 4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Stephane Nicoll 1aaab7ecc3 Upgrade to Solr 8.0.0
Closes gh-16272
2019-03-20 17:25:22 +01:00
Stephane Nicoll c2befeaeed Merge branch '2.1.x' 2019-03-20 17:24:21 +01:00
Stephane Nicoll 82c434d581 Upgrade to Solr 7.7.1
Closes gh-16273
2019-03-20 17:23:52 +01:00
Andy Wilkinson 6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Andy Wilkinson 0e009ef047 Use HTTPS to link to the Apache license 2019-03-20 15:00:10 +00:00
Andy Wilkinson 1e62be6ac4 Polish 2019-03-20 14:37:30 +00:00
Andy Wilkinson b8311bd8f5 Merge pull request #16270 from Spring Operator
* gh-16270:
  Use HTTPS for external links in XML files
2019-03-20 14:33:37 +00:00
Spring Operator 00ab30362c Use HTTPS for external links in XML files
See gh-16270
2019-03-20 14:33:25 +00:00