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
Andy Wilkinson
8d67a2fabc
Merge pull request #7436 from Eddú Meléndez
...
* gh-7436:
Simplify Jackson dependency management by importing its bom
2017-01-17 16:04:12 +00:00
Eddú Meléndez
7c33125eb0
Simplify Jackson dependency management by importing its bom
...
Closes gh-7436
2017-01-17 15:59:22 +00:00
Andy Wilkinson
803f1444a9
Merge branch '1.5.x'
2017-01-17 15:44:34 +00:00
Andy Wilkinson
bb2058bf66
Merge branch '1.4.x' into 1.5.x
2017-01-17 15:44:28 +00:00
Andy Wilkinson
2a5586fbcf
Ensure that JarResourceManager correctly handles path without leading /
...
Previously, JarResourceManager assumed that the path would begin with
a / but this isn't always the case. For example, it may be an empty
string. This could lead to a malformed jar:file: URL that used ! as
the separator rather than the required !/.
This commit updates JarResourceManager to prepend / to any path that
does not being with one before using it to construct the URL.
Closes gh-7717
2017-01-17 15:40:53 +00:00
Andy Wilkinson
14e24462f2
Merge branch '1.5.x'
2017-01-17 15:00:06 +00:00
Andy Wilkinson
7fa33cddd7
Merge branch '1.4.x' into 1.5.x
2017-01-17 15:00:01 +00:00
Andy Wilkinson
a02c2d4155
Improve the documentation of Health.Status constants
...
Closes gh-7784
2017-01-17 14:59:53 +00:00
Andy Wilkinson
4b35091b3c
Merge branch '1.5.x'
2017-01-17 14:44:49 +00:00
Andy Wilkinson
d76e1ef95e
Merge branch '1.4.x' into 1.5.x
2017-01-17 14:44:43 +00:00
Andy Wilkinson
9695e0a9d1
Document breakpoint config for remote debug tunnel and IntelliJ IDEA
...
Closes gh-7732
See gh-5047
2017-01-17 14:43:38 +00:00
Andy Wilkinson
c2efae06f0
Merge branch '1.5.x'
2017-01-17 14:35:40 +00:00
