Commit Graph

10928 Commits (5a8a86375d22d4e916ce684da3db5e6af980f0ed)
 

Author SHA1 Message Date
Andy Wilkinson ce74047896 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 2f26088800 Unpack CLI for its integration tests as dir is no longer assembled
Closes gh-9080
8 years ago
Andy Wilkinson 51970f81d2 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson dc8a34f324 Fix warnings caused by CLI's assembly configuration
Closes gh-9080
8 years ago
Stephane Nicoll 2f4a1f9531 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 93bd1108bf Fix maven warning
Closes gh-9075
8 years ago
Stephane Nicoll ea33cc2f7d Deprecated MustacheCompilerFactoryBean
Closes gh-8999
8 years ago
Stephane Nicoll 61f88d0c90 Provide dependency management for missing jersey dependencies
Closes gh-9009
8 years ago
Stephane Nicoll 5121b848e1 Making sure to stop embedded web servers in tests
Closes gh-9012
8 years ago
Stephane Nicoll 7b1fc01733 Fix checkstyle violations 8 years ago
Stephane Nicoll b4d55a2223 Merge pull request #9007 from Dichotomia:patch-6
* pr/9007:
  Add dependency section for jersey multipart
8 years ago
Quentin Caillard 45e0912ecd Add dependency section for jersey multipart
Closes gh-9007
8 years ago
Stephane Nicoll 063d301fd3 Make LayoutType public
Closes gh-9067
8 years ago
Stephane Nicoll 54a8dc5b33 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 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
8 years ago
Stephane Nicoll e2b209e409 Polish "Clarify and re-organize docs on caching"
Closes gh-9065
8 years ago
Dave Syer 11feb75752 Clarify and re-organize docs on caching
See gh-9065
8 years ago
Phillip Webb 4d4d03ab2c Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 4a95b2f174 Polish 8 years ago
Stephane Nicoll 035e27b1d1 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 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
8 years ago
Stephane Nicoll 652a5e7baa Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll f060922350 Fix cache example in the doc
Closes gh-8983
8 years ago
Phillip Webb 76ee2f401c Polish 8 years ago
Phillip Webb 4db4c81b9b Polish 8 years ago
Andy Wilkinson df05aa4701 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson bd95ad6430 Upgrade to Spring Restdocs 1.1.3.RELEASE
Closes gh-9040
8 years ago
Andy Wilkinson 5291fb5ff7 Upgrade to Hsqldb 2.3.5
Closes gh-9039
8 years ago
Andy Wilkinson 344255807b Upgrade to Jaybird 2.2.13
Closes gh-9038
8 years ago
Andy Wilkinson 59d04d0679 Upgrade to Elasticsearch 2.4.5
Closes gh-9037
8 years ago
Andy Wilkinson c3c2a91916 Upgrade to Groovy 2.4.11
Closes gh-9036
8 years ago
Andy Wilkinson bc464adba3 Upgrade to Tomcat 8.5.14
Closes gh-9035
8 years ago
Andy Wilkinson b5811986b0 Upgrade to Ehcache 2.10.4
Closes gh-9034
8 years ago
Andy Wilkinson d0a85550d7 Upgrade to H2 1.4.195
Closes gh-9033
8 years ago
Stephane Nicoll 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
8 years ago
Stephane Nicoll f42998f5ca Revert "Refine validator and MVC validator configuration"
This commit reverts c9561f0 and 69a8c0d and effectivly fixes gh-8979 but
reintroduces the issue reported in gh-8495.
8 years ago
Phillip Webb 4d8584eba8 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb df82060cad Formatting 8 years ago
Stephane Nicoll 3dc9b125d7 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 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.
8 years ago
Stephane Nicoll 293ba6d522 Merge pull request #8758 from candrews:patch-4
* pr/8758:
  Add Log4jdbc Starter reference
8 years ago
Craig Andrews a1452f674f Add Log4jdbc Starter reference
Clsoes gh-8758
8 years ago
Stephane Nicoll 9327b58304 Fixup version numbers following release 8 years ago
Spring Buildmaster 9768b0a8c2 Next Development Version 8 years ago
Phillip Webb 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
8 years ago
Phillip Webb 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
8 years ago
Andy Wilkinson 6dd6897361 Upgrade to Narayana 5.5.7.Final
Closes gh-8961
8 years ago
Andy Wilkinson a7830a8669 Upgrade to Jaybird 2.2.13
Closes gh-8960
8 years ago
Andy Wilkinson efdd9d9b01 Upgrade to Jetty 9.4.4.v20170414
Closes gh-8959
8 years ago
Andy Wilkinson 0ff6b705d6 Upgrade to Tomcat 8.5.14
Closes gh-8958
8 years ago