spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-26 20:09:02 +00:00
Code Issues Projects Releases Wiki Activity
23,481 Commits 28 Branches 395 Tags
94de7ee97ede09d6860dc9c19c22c4d04b2f7f9e
Commit Graph
23481 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephane Nicoll a2c5a79883 Merge pull request #16325 from izeye 
* pr/16325:
  Restore setExtractBareNamePropertyMethods() for AssertJ
 2019-03-27 07:04:01 +01:00
Johnny Lim 038e213343 Restore setExtractBareNamePropertyMethods() for AssertJ 
Closes gh-16325
 2019-03-27 07:03:07 +01:00
Andy Wilkinson a2d37dc0b9 Merge branch '2.1.x' 2019-03-26 13:59:56 +00:00
Andy Wilkinson 4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Andy Wilkinson 507b00d623 Merge pull request #16314 from Spring Operator 
* gh-16314:
  Use HTTPS for external links from XML files where possible

Closes gh-16314
 2019-03-26 13:52:50 +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
Andy Wilkinson 46065e2f99 Merge pull request #16313 from Spring Operator 
* gh-16313:
  Use HTTPS for external links from XML files where possible
 2019-03-26 13:46:09 +00:00
Spring Operator b6fdfa8f0f Use HTTPS for external links from XML files where possible 
See gh-16313
 2019-03-26 13:45:37 +00:00
Andy Wilkinson 79c53de30c Merge branch '1.4.x' into 1.5.x 2019-03-26 13:44:03 +00:00
Andy Wilkinson 61602c0851 Merge pull request #16312 from Spring Operator 
* gh-16312:
  Use HTTPS for external links from XML files where possible

Closes gh-16312
 2019-03-26 13:43:29 +00:00
Spring Operator 4e2739eceb Use HTTPS for external links from XML files where possible 
See gh-16312
 2019-03-26 13:43:05 +00:00
Andy Wilkinson 46d6fb0e1c Merge branch '1.3.x' into 1.4.x 2019-03-26 13:40:26 +00:00
Andy Wilkinson a732acaebf Merge pull request #16311 from Spring Operator 
* gh-16311:
  Polish "Use HTTPS for external links from XML files where possible"
  Use HTTPS for external links from XML files where possible
 2019-03-26 13:38:57 +00:00
Andy Wilkinson 24afa5951b Polish "Use HTTPS for external links from XML files where possible" 
See gh-16311
 2019-03-26 13:38:31 +00:00
Spring Operator adc2462689 Use HTTPS for external links from XML files where possible 
See gh-16311
 2019-03-26 13:37:30 +00:00
Andy Wilkinson 2f1020a1a6 Merge branch '2.1.x' 2019-03-26 13:32:02 +00:00
Andy Wilkinson 2c1bd6fa4a Merge branch '2.0.x' into 2.1.x 2019-03-26 13:31:54 +00:00
Andy Wilkinson 870c3de7f3 Merge branch '1.5.x' into 2.0.x 2019-03-26 13:31:45 +00:00
Andy Wilkinson c19669dc6d Merge branch '1.4.x' into 1.5.x 2019-03-26 13:31:23 +00:00
Andy Wilkinson f65018433f Use stable archive location for TomEE zip download 2019-03-26 13:29:37 +00:00
Andy Wilkinson 4a01cec81c Merge branch '2.1.x' 2019-03-26 12:46:38 +00:00
Andy Wilkinson 26fc047836 Merge branch '2.0.x' into 2.1.x 2019-03-26 12:46:24 +00:00
Andy Wilkinson 139739ccd9 Merge branch '1.5.x' into 2.0.x 2019-03-26 12:46:07 +00:00
Andy Wilkinson 23d9998269 Merge branch '1.4.x' into 1.5.x 2019-03-26 12:45:52 +00:00
Andy Wilkinson 1fd6d1a60c Merge branch '1.3.x' into 1.4.x 2019-03-26 12:43:01 +00:00
Andy Wilkinson 7b044b2e3e Merge pull request #16283 from Spring Operator 
* gh-16283:
  Use HTTPS to link to Apache License

Closes gh-16283
 2019-03-26 12:42:46 +00:00
Spring Operator 08dce4f3ea Use HTTPS to link to Apache License 
See gh-16283
 2019-03-26 12:41:56 +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 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