dc8a34f324
Fix warnings caused by CLI's assembly configuration
...
Closes gh-9080
2017-05-03 16:47:38 +01:00
2f4a1f9531
Merge branch '1.4.x' into 1.5.x
2017-05-03 13:21:59 +02:00
93bd1108bf
Fix maven warning
...
Closes gh-9075
2017-05-03 13:21:10 +02:00
ea33cc2f7d
Deprecated MustacheCompilerFactoryBean
...
Closes gh-8999
2017-05-03 13:09:52 +02:00
61f88d0c90
Provide dependency management for missing jersey dependencies
...
Closes gh-9009
2017-05-03 12:19:32 +02:00
5121b848e1
Making sure to stop embedded web servers in tests
...
Closes gh-9012
2017-05-03 11:33:42 +02:00
7b1fc01733
Fix checkstyle violations
2017-05-03 10:19:00 +02:00
b4d55a2223
Merge pull request #9007 from Dichotomia:patch-6
...
* pr/9007:
Add dependency section for jersey multipart
2017-05-03 09:18:28 +02:00
45e0912ecd
Add dependency section for jersey multipart
...
Closes gh-9007
2017-05-03 09:18:09 +02:00
063d301fd3
Make LayoutType public
...
Closes gh-9067
2017-05-03 09:15:34 +02:00
54a8dc5b33
Merge branch '1.4.x' into 1.5.x
2017-05-03 09:11:37 +02:00
625a7668c9
Merge pull request #9065 from dsyer:cachedocs
...
* pr/9065:
Polish "Clarify and re-organize docs on caching"
Clarify and re-organize docs on caching
2017-05-03 09:11:05 +02:00
e2b209e409
Polish "Clarify and re-organize docs on caching"
...
Closes gh-9065
2017-05-03 09:10:47 +02:00
11feb75752
Clarify and re-organize docs on caching
...
See gh-9065
2017-05-03 09:01:45 +02:00
4d4d03ab2c
Merge branch '1.4.x' into 1.5.x
2017-05-02 21:33:33 -07:00
4a95b2f174
Polish
2017-05-02 20:39:45 -07:00
035e27b1d1
Merge branch '1.4.x' into 1.5.x
2017-05-02 13:21:03 +02:00
8e5bf4b22a
Polish CachePublicMetrics
...
CachePublicMetrics wasn't explicitly tested and was still using field
injection. This commit improves the situation in preparation of the fix
for gh-8984
2017-05-02 13:15:31 +02:00
652a5e7baa
Merge branch '1.4.x' into 1.5.x
2017-05-02 12:13:44 +02:00
f060922350
Fix cache example in the doc
...
Closes gh-8983
2017-05-02 11:58:50 +02:00
76ee2f401c
Polish
2017-04-28 09:48:13 -07:00
4db4c81b9b
Polish
2017-04-28 09:38:56 -07:00
df05aa4701
Merge branch '1.4.x' into 1.5.x
2017-04-28 15:41:53 +01:00
bd95ad6430
Upgrade to Spring Restdocs 1.1.3.RELEASE
...
Closes gh-9040
2017-04-28 15:33:43 +01:00
5291fb5ff7
Upgrade to Hsqldb 2.3.5
...
Closes gh-9039
2017-04-28 15:33:43 +01:00
344255807b
Upgrade to Jaybird 2.2.13
...
Closes gh-9038
2017-04-28 15:33:42 +01:00
59d04d0679
Upgrade to Elasticsearch 2.4.5
...
Closes gh-9037
2017-04-28 15:33:42 +01:00
c3c2a91916
Upgrade to Groovy 2.4.11
...
Closes gh-9036
2017-04-28 15:33:41 +01:00
bc464adba3
Upgrade to Tomcat 8.5.14
...
Closes gh-9035
2017-04-28 15:33:41 +01:00
b5811986b0
Upgrade to Ehcache 2.10.4
...
Closes gh-9034
2017-04-28 15:33:41 +01:00
d0a85550d7
Upgrade to H2 1.4.195
...
Closes gh-9033
2017-04-28 15:33:40 +01:00
1de2316a0b
Refine validator and MVC validator configuration
...
This commit ensures that a primary JSR 303 and Spring Validator will be
exposed if the auto-configuration kicks in. As `LocalValidatorFactoryBean`
exposes 3 contracts (JSR-303 `Validator` and `ValidatorFactory` as well as
the `Spring` validator one), this makes sure that those types can be
injected by type.
`LocalValidatorFactoryBean` exposes 3 contracts and we're only checking
for the absence of a `javax.validation.Validator` to auto-configure a
`LocalValidatorFactoryBean`. If no standard JSR validator exists but a
Spring's `Validator` exists and is primary, we shouldn't flag the
auto-configured one as `@Primary`. Previous iterations on this feature
have made sure that we'll auto-configure at most one
`javax.validation.Validator` so not flagging it `@Primary` is no problem.
This commit also restores and adds tests that validates
`ValidationAutoConfiguration` will configure a JSR validator even if a
Spring Validator is present.
This effectively fixes gh-8495 in a different way.
Closes gh-8979
Closes gh-8976
2017-04-28 11:41:42 +02:00
f42998f5ca
Revert "Refine validator and MVC validator configuration"
...
This commit reverts c9561f069a8c0d
2017-04-28 11:12:09 +02:00
4d8584eba8
Merge branch '1.4.x' into 1.5.x
2017-04-27 10:15:54 -07:00
df82060cad
Formatting
2017-04-27 10:12:31 -07:00
3dc9b125d7
Merge branch '1.4.x' into 1.5.x
2017-04-27 14:30:40 +02:00
703a6dc056
Prevents BasicErrorControllerIntegrationTest to start another server
...
`BasicErrorControllerIntegrationTest` is handling the context in each test
and yet it starts a useless test via `@SpringBootTest`. This commit
removes the useless runner and associated annotations.
2017-04-27 14:26:50 +02:00
293ba6d522
Merge pull request #8758 from candrews:patch-4
...
* pr/8758:
Add Log4jdbc Starter reference
2017-04-24 10:59:06 +02:00
a1452f674f
Add Log4jdbc Starter reference
...
Clsoes gh-8758
2017-04-24 10:58:46 +02:00
9327b58304
Fixup version numbers following release
2017-04-21 11:26:45 +02:00
9768b0a8c2
Next Development Version
2017-04-21 08:32:01 +00:00
5f3d5fbec1
Remove public "skip path extension" constant
...
Remove the public constant to make it clearer that skipping path
extensions is really an internal Spring Boot concern.
See gh-8765
2017-04-20 13:31:04 -07:00
69a8c0d871
Fix MVC validator configuration warning
...
Replace the MVC validator post processor with an `@Import` so
that a "cannot enhance @Configuration bean definition"
warning does not occur.
Fixes gh-8951
See gh-8495
2017-04-20 11:57:18 -07:00
6dd6897361
Upgrade to Narayana 5.5.7.Final
...
Closes gh-8961
2017-04-20 17:16:39 +01:00
a7830a8669
Upgrade to Jaybird 2.2.13
...
Closes gh-8960
2017-04-20 17:16:39 +01:00
efdd9d9b01
Upgrade to Jetty 9.4.4.v20170414
...
Closes gh-8959
2017-04-20 17:16:38 +01:00
0ff6b705d6
Upgrade to Tomcat 8.5.14
...
Closes gh-8958
2017-04-20 17:16:38 +01:00
edf6759e2d
Upgrade to Activemq 5.14.5
...
Closes gh-8957
2017-04-20 17:16:37 +01:00
6b167f1f12
Upgrade to Ehcache 2.10.4
...
Closes gh-8956
2017-04-20 17:16:37 +01:00
3442a24f8a
Upgrade to Undertow 1.4.13.Final
...
Closes gh-8955
2017-04-20 17:16:37 +01:00
Andy Wilkinson
Stephane Nicoll
Quentin Caillard
Dave Syer
Phillip Webb
Craig Andrews
Spring Buildmaster