Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,481 Commits 23 Branches 0 Tags
94de7ee97ede09d6860dc9c19c22c4d04b2f7f9e
Commit Graph

6962 Commits

Author SHA1 Message Date
Andy Wilkinson
6507d1723d Merge branch '1.5.x' into 2.0.x 2019-03-29 11:02:56 +00:00
Stephane Nicoll
270554d3cd Merge branch '2.1.x' 2019-03-29 11:40:15 +01:00
Stephane Nicoll
090f5f5397 Polish "Add error rendering support with @WebFluxTest" 
Closes gh-16266
 2019-03-29 11:36:27 +01:00
Ali Dehghani
53e7484d87 Add error rendering support with @WebFluxTest 
See gh-16266
 2019-03-29 11:07:26 +01:00
Stephane Nicoll
17a800b577 Merge branch '2.1.x' 2019-03-29 10:51:44 +01:00
Stephane Nicoll
62d9c0a8b3 Test against Gradle 5.3.1 2019-03-29 10:51:31 +01:00
Stephane Nicoll
680e2b223b Remove deprecated finalName attribute 
See gh-16202
 2019-03-29 10:46:28 +01:00
Stephane Nicoll
cba1e8ada0 Merge branch '2.1.x' 2019-03-29 10:41:30 +01:00
Stephane Nicoll
04aadcdf2e Make sure custom finalName is ignored 
A read-only plugin parameter can still be set by the user which leads
to an invalid repackaged archive. This commit actually ignores the field
and uses the standard attribute instead.

Closes gh-16202
 2019-03-29 10:40:41 +01:00
Stephane Nicoll
6ab942f295 Polish 2019-03-29 10:19:43 +01:00
Stephane Nicoll
554dec1a3e Document finalName alternative for repackage goal 
Closes gh-16334
 2019-03-29 10:19:14 +01:00
Stephane Nicoll
465053c11e Merge branch '2.1.x' 2019-03-28 18:09:22 +01:00
Stephane Nicoll
6c3d64a2eb Test Thymeleaf auto-configuration backs off without spring integration 
See gh-16341
 2019-03-28 17:59:22 +01:00
Stephane Nicoll
29b1b38cc6 Migrate Thymeleaf tests to application runner 2019-03-28 17:58:18 +01:00
Andy Wilkinson
ea2eaa1737 Merge branch '2.1.x' 2019-03-28 15:56:43 +00:00
Andy Wilkinson
cf0811b0db Merge branch '2.0.x' into 2.1.x 2019-03-28 15:56:22 +00:00
Andy Wilkinson
be32421b86 Merge branch '1.5.x' into 2.0.x 2019-03-28 15:55:32 +00:00
Johnny Lim
40d0d6b113 Polish 
Closes gh-16299
 2019-03-28 16:42:27 +01:00
Stephane Nicoll
89f93b28d7 Merge branch '2.1.x' 2019-03-28 16:37:33 +01:00
Krzysztof Koziol
17c0214cc6 Add missing class condition on thymeleaf-spring5 
This commit adds an extra check for the presence of thymeleaf-spring5
library on the classpath. ThymeleafAutoConfiguration is now only
considered if both thymeleaf-spring5 and thymeleaf jars are present.

Closes gh-16341
 2019-03-28 16:37:09 +01:00
Andy Wilkinson
24593f39f8 Polish "Use HTTPS for external links wherever possible" 
See gh-16276
 2019-03-28 13:55:55 +00:00
Spring Operator
fb242c27d2 Use HTTPS for external links wherever possible 
See gh-16276
 2019-03-28 12:07:01 +00:00
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