Andy Wilkinson
878a635bfb
Merge branch '2.1.x'
2019-03-28 11:48:47 +00:00
Andy Wilkinson
5a3474c7a8
Polish "Use HTTPS for external links wherever possible"
...
See gh-16320
2019-03-28 10:53:01 +00:00
Spring Operator
9fc3ac7d49
Use HTTPS for external links wherever possible
...
See gh-16320
2019-03-28 09:49:30 +00:00
Andy Wilkinson
864942ad4f
Merge branch '2.0.x' into 2.1.x
2019-03-28 09:35:53 +00:00
Andy Wilkinson
14b21026bf
Polish "Use HTTPS for external links wherever possible"
...
See gh-16319
2019-03-28 09:17:50 +00:00
Spring Operator
1a4c6f2dac
Use HTTPS for external links wherever possible
...
See gh-16319
2019-03-27 20:06:52 +00:00
Andy Wilkinson
ba4671f0ab
Merge branch '1.5.x' into 2.0.x
2019-03-27 19:59:36 +00:00
Stephane Nicoll
3e3353e0e9
Merge branch '2.1.x'
2019-03-27 11:40:49 +01:00
Stephane Nicoll
f417fa5c5b
Add jaxb API to jersey starter
...
Closes gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll
e57c0c0657
Do not attempt to add Jaxb customization if Jaxb is not present
...
See gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll
bece962711
Merge branch '2.1.x'
2019-03-27 10:18:23 +01:00
Stephane Nicoll
c2f9e7dd43
Fix StreamsBuilderFactoryBean injection definition
...
Closes gh-16329
2019-03-27 10:17:49 +01:00
Johnny Lim
038e213343
Restore setExtractBareNamePropertyMethods() for AssertJ
...
Closes gh-16325
2019-03-27 07:03:07 +01:00
Andy Wilkinson
4900505425
Merge branch '2.0.x' into 2.1.x
2019-03-26 13:53:57 +00:00
Spring Operator
a5dba01cb9
Use HTTPS for external links from XML files where possible
...
See gh-16314
2019-03-26 13:52:17 +00:00
Andy Wilkinson
fedb40a2bf
Merge branch '1.5.x' into 2.0.x
2019-03-26 13:48:32 +00:00
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
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
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
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
Stephane Nicoll
3125f424ce
Add metadata support for immutable ConfigurationProperties type
...
Closes gh-16071
2019-03-22 15:33:35 +01: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
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
Stephane Nicoll
1aaab7ecc3
Upgrade to Solr 8.0.0
...
Closes gh-16272
2019-03-20 17:25:22 +01:00
Stephane Nicoll
82c434d581
Upgrade to Solr 7.7.1
...
Closes gh-16273
2019-03-20 17:23:52 +01:00
Spring Operator
00ab30362c
Use HTTPS for external links in XML files
...
See gh-16270
2019-03-20 14:33:25 +00:00
dreis2211
dda0b3e2a1
Remove explicit types
...
Closes gh-16265
2019-03-20 09:44:51 +01:00
Madhura Bhave
dd70c96ead
Merge branch '2.1.x'
2019-03-19 17:29:37 -07:00
Madhura Bhave
0c52c3fc55
Clarify ambiguous documentation in default security section
...
Closes gh-16033
2019-03-19 17:25:47 -07:00
Madhura Bhave
448115609c
Merge branch '2.1.x'
2019-03-19 17:12:04 -07:00