Commit Graph

10475 Commits

Author SHA1 Message Date
Andy Wilkinson
973b7a118c Merge branch '1.5.x' 2017-01-19 11:03:38 +00:00
Andy Wilkinson
c31a2d8101 Merge branch '1.4.x' into 1.5.x 2017-01-19 11:03:33 +00:00
Andy Wilkinson
80a1e1ae64 Polishing 2017-01-19 11:03:18 +00:00
Andy Wilkinson
84583d2b8f Merge branch '1.5.x' 2017-01-19 10:58:43 +00:00
Andy Wilkinson
4e70cd2934 Merge branch '1.4.x' into 1.5.x 2017-01-19 10:58:34 +00:00
Andy Wilkinson
b7a02e7237 Update TestRestTemplate to apply template handler to URIs
Previously, TestRestTemplate would only apply the UriTemplateHandler
to Strings and not to URIs. When using the auto-configured
TestRestTemplate, this prevented relative URIs from being
made absolute using LocalHostUriTemplateHandler.

The commit updates TestRestTemplate to turn URIs into Strings before
passing them to the delegate RestTemplate. Turning them into Strings
ensures that the delegate calls the UriTemplateHandler.

Closes gh-7891
2017-01-19 10:39:02 +00:00
Andy Wilkinson
4548af2966 Merge branch '1.5.x' 2017-01-19 09:28:21 +00:00
Andy Wilkinson
531cf5d4f6 Merge branch '1.4.x' into 1.5.x 2017-01-19 09:28:14 +00:00
Andy Wilkinson
6a0fb8e44c Update DevTools' ResourceLoader to delegate to user's custom loader
Previously, when DevTools' was used it would set the application
context's ResourceLoader and overwrite any custom ResourceLoader that
had been configured. On the rare occasion when the user had customized
the ResourceLoader this meant that the customization was lost and
certain resources would become unavailable.

This commit updates DevTools' ResourceLoader to delegate a custom
ResourceLoader if one has been configured. If one has not been
configured it delegates as before, i.e. to
WebApplicationContextResourceLoader for web applications and to
DefaultResourceLoader for all others apps.

Closes gh-8010
2017-01-19 09:28:09 +00:00
Phillip Webb
5502fa2936 Merge branch '1.5.x' 2017-01-18 21:05:22 -08:00
Phillip Webb
1d55f5f6cd Merge branch 'gh-7579' into 1.5.x 2017-01-18 21:01:38 -08:00
Phillip Webb
10dbf3c571 Use @Validated as trigger for JSR-330 validation
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.

Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.

Closes gh-7579
2017-01-18 21:01:07 -08:00
Phillip Webb
f42ebe428c Remove JSR-330 configuration annotations
Replace JSR-330 validation annotations from all internal
`@ConfigurationProperties` classes with standard Asserts.

Prior to this commit validation of our own configuration properties
would only occur when the user happens to have compliant JSR-330
implementation on their classpath.

See gh-7579
2017-01-18 20:51:35 -08:00
Phillip Webb
0a6456a748 Always use prefix config annotation attribute
Update use of `@ConfigurationProperties` to prefer the more explicit
`prefix` attribute, rather than `value`.

See gh-7579
2017-01-18 20:49:53 -08:00
Phillip Webb
43d432a527 Polish 2017-01-18 20:35:41 -08:00
Phillip Webb
d1a8d136a7 Merge branch '1.4.x' into 1.5.x 2017-01-18 13:56:42 -08:00
Phillip Webb
b28d537c78 Disable unwanted m2e activations
Add m2e activation properties to disable unwanted Eclipse facets.
2017-01-18 13:48:49 -08:00
Stephane Nicoll
58740d7f30 Merge branch '1.5.x' 2017-01-18 16:36:57 +01:00
Stephane Nicoll
158ce3c376 Merge branch '1.4.x' into 1.5.x 2017-01-18 16:36:23 +01:00
Stephane Nicoll
b242543545 Backport missing 3rd party starter reference 2017-01-18 16:34:11 +01:00
Stephane Nicoll
b3c610c13e Merge branch '1.5.x' 2017-01-18 16:26:43 +01:00
Stephane Nicoll
3cf4d75aaa Merge branch '1.4.x' into 1.5.x 2017-01-18 16:25:46 +01:00
Stephane Nicoll
b7d3e91e38 Merge pull request #8014 from larsgrefer:patch-1
* pr/8014:
  Add OkHttp starter reference
2017-01-18 16:25:20 +01:00
Lars Grefer
f5d1b7807c Add OkHttp starter reference
Closes gh-8014
2017-01-18 16:24:23 +01:00
Andy Wilkinson
aba09cce73 Merge branch '1.5.x' 2017-01-18 14:25:09 +00:00
Andy Wilkinson
baeb9c3495 Merge pull request #7902 from Alessandro Falappa
* gh-7902:
  Make start/stop run-levels configurable in INIT-INFO of launch.script
2017-01-18 14:25:05 +00:00
Alessandro Falappa
ec537b307e Make start/stop run-levels configurable in INIT-INFO of launch.script
See gh-7008
Closes gh-7902
2017-01-18 14:24:29 +00:00
Andy Wilkinson
81f5bbb17b Merge branch '1.5.x' 2017-01-18 14:19:28 +00:00
Andy Wilkinson
353829c4e5 Merge pull request #8009 from Quentin Caillard
* gh-8009:
  Correct typo in comment in spring-boot-dependencies
2017-01-18 14:19:16 +00:00
Quentin Caillard
0a46bff4b2 Correct typo in comment in spring-boot-dependencies
Closes gh-8009
2017-01-18 14:18:41 +00:00
Andy Wilkinson
490871c774 Merge branch '1.5.x' 2017-01-18 14:16:36 +00:00
Andy Wilkinson
0ae297299b Merge pull request #8002 from Christoph Dreis
* gh-8002:
  Improve performance of RelaxedNames
2017-01-18 14:16:11 +00:00
dreis
93f97719f0 Improve performance of RelaxedNames
Closes gh-8002
2017-01-18 14:07:19 +00:00
Brian Clozel
8193124ef4 Use Reactor BOM in Boot dependency management
This commit replaces the manual management of reactor dependencies by
the new Reactor BOM, version "Aluminium-RELEASE".

Overriding the reactor dependency versions in a Boot application now
requires to use the `reactor-bom.version` property.

Fixes gh-7028
2017-01-18 14:45:35 +01:00
Andy Wilkinson
9685b84523 Merge branch '1.5.x' 2017-01-18 13:39:57 +00:00
Andy Wilkinson
ba8f7214d8 Merge branch '1.4.x' into 1.5.x 2017-01-18 13:39:48 +00:00
Andy Wilkinson
0e72ef1a10 Improve diagnostics for in StarterDependenciesIntegrationTests
The root cause of the build failure something has a null message which
means there's no information available about why the build failed.
Instead of calling fail when a BuildException occurs, this commit
wraps it in a RuntimeException and rethrows it. This should make the
entire chain of exceptions available when a failure occurs.
2017-01-18 13:38:10 +00:00
Andy Wilkinson
5036fc50fc Merge branch '1.5.x' 2017-01-17 21:17:03 +00:00
Andy Wilkinson
29adf2d85e Ensure that test closes InputStream that reads contents of output files 2017-01-17 21:16:20 +00:00
Andy Wilkinson
357b9d6671 Correct the version of parent pom in new WLP deployment test module 2017-01-17 20:48:01 +00:00
Andy Wilkinson
f7f764ffe1 Merge branch '1.5.x' 2017-01-17 17:15:59 +00:00
Andy Wilkinson
5c9aa41c07 Update InMemoryRichGaugeRepository to support increments
Closes gh-2902
2017-01-17 17:15:26 +00:00
Andy Wilkinson
70a8836909 Merge branch '1.5.x' 2017-01-17 17:03:57 +00:00
Andy Wilkinson
cb7ae2e60a Add a deployment test for WebSphere Liberty Profile
Closes gh-7419
2017-01-17 17:03:41 +00:00
Andy Wilkinson
8eeeb73015 Merge branch '1.5.x' 2017-01-17 16:46:12 +00:00
Andy Wilkinson
69f362baca Use properties for versions of plugins managed in spring-boot-dependencies
Closes gh-4952
2017-01-17 16:43:36 +00:00
Andy Wilkinson
a608e09990 Merge branch '1.5.x' 2017-01-17 16:14:30 +00:00
Andy Wilkinson
e19400ba4c Merge pull request #7973 from Kazuki Shimizu
* gh-7973:
  Use constructor injection in DataSourceInitializer
2017-01-17 16:14:20 +00:00
Kazuki Shimizu
19e117c9cb Use constructor injection in DataSourceInitializer
Closes gh-7973
2017-01-17 16:13:10 +00:00
Andy Wilkinson
19b2794467 Merge branch '1.5.x' 2017-01-17 16:05:22 +00:00