Commit Graph

10283 Commits (30eb9c67565a2dbe34016088719c4f1f4f411eb0)
 

Author SHA1 Message Date
Andy Wilkinson 30eb9c6756 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 055542f2b4 Merge pull request #8458 from Gary Russell
* gh-8458:
  Upgrade to Spring AMQP 1.6.8.RELEASE
8 years ago
Gary Russell 482a5a37c0 Upgrade to Spring AMQP 1.6.8.RELEASE
Closes gh-8458
8 years ago
Andy Wilkinson f9455ba5c5 Start building against Spring Data Ingalls snapshots again
See gh-8444
8 years ago
Andy Wilkinson 272db338f5 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson ab920f086c Upgrade to Logback 1.1.11
Closes gh-8354
8 years ago
Andy Wilkinson 730e374450 Upgrade to Narayana 5.5.3.Final
Closes gh-8455
8 years ago
Andy Wilkinson abd1bad20a Upgrade to Jboss Transaction Spi 7.5.1.Final
Closes gh-8454
8 years ago
Andy Wilkinson dd6d2004ea Upgrade to Ehcache3 3.2.1
Closes gh-8453
8 years ago
Andy Wilkinson f9bd5d8d77 Upgrade to Jetty 9.4.2.v20170220
Closes gh-8452
8 years ago
Andy Wilkinson 0131bfafcf Upgrade to Undertow 1.4.11.Final
Closes gh-8451
8 years ago
Andy Wilkinson 3d3c2d53ba Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson e0e1a7f31e Upgrade to Slf4j 1.7.24
Closes gh-8450
8 years ago
Andy Wilkinson d114905449 Upgrade to Ehcache3 3.1.4
Closes gh-8449
8 years ago
Andy Wilkinson acb02475b5 Upgrade to Groovy 2.4.9
Closes gh-8448
8 years ago
Andy Wilkinson d7a124449d Upgrade to Mysql 5.1.41
Closes gh-8447
8 years ago
Andy Wilkinson 9240a8cd64 Upgrade to Dropwizard Metrics 3.1.3
Closes gh-8446
8 years ago
Andy Wilkinson 70472b36f1 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 59d3a79c82 Avoid eager initialization when finding beans by annotation
Closes gh-8269
8 years ago
Andy Wilkinson 4390c81115 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 8a326a8713 Simplify BeanTypeRegistry by requiring a DefaultListableBeanFactory
Closes gh-8439
8 years ago
Andy Wilkinson 68af831059 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson e36a60dcad Revert "Start building against Spring Data Ingalls snapshots"
This reverts commit 36cb8b9e0c.

See gh-8444
8 years ago
Andy Wilkinson b443b745fb Make static resource handling consistent across embedded containers
Previously, there were a number of inconsistencies in the embedded
containers' handling of static resources. The Servlet spec requires
that static resources can be served from the META-INF/resources/
directory of jars nested inside a war in WEB-INF/lib/. The intention
was also to extend this to cover jar packaging when jars are nested in
BOOT-INF/lib/. This worked when using Tomcat as long as Jasper was on
the classpath. If you didn't have Jasper on the classpath or you
were using Jetty or Undertow it did not work.

This commit updates the configuration of embedded Jetty, Tomcat, and
Undertow so that all three containers handle static resources in the
same way, serving them from jars in WEB-INF/lib/ or /BOOT-INF/lib/.
Numerous intergration tests have been added to verify the behaviour,
including tests for Tomcat 8.0 and 7.0 which is supported in addition
to the default 8.5.x. Note that static resource handling only works
with Jetty 9.3.x and 9.2 and earlier does not support nested jars (
see https://github.com/eclipse/jetty.project/issues/518 for details).

Closes gh-8299
8 years ago
Stephane Nicoll 19b4833c33 Keep order when filtering artifacts
This commit makes sure that the order of dependencies is kept when they
are filtered.

Closes gh-8397
8 years ago
Stephane Nicoll d3fe9821ed Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 21ca1af677 Upgrade to Spring Framework 4.3.7.RELEASE
Closes gh-8248
8 years ago
Stephane Nicoll 36cb8b9e0c Start building against Spring Data Ingalls snapshots
See gh-8444
8 years ago
Stephane Nicoll ebd3a65c9d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 66e6671dcb Start building against Spring Data Hopper snapshots
See gh-8443
8 years ago
Andy Wilkinson 545b29552d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 51e7c2eec9 Merge pull request #8252 from Erling Holmqvist
* gh-8252:
  Polish "Ignore spock.lang annotations when creating test context cache key"
  Ignore spock.lang annotations when creating test context cache key
8 years ago
Andy Wilkinson 98cf35d48e Polish "Ignore spock.lang annotations when creating test context cache key"
See gh-8252
8 years ago
erlholmq 8f18df8a9c Ignore spock.lang annotations when creating test context cache key
See gh-7524
Closes gh-8252
8 years ago
Stephane Nicoll f014be59f7 Merge pull request #8392 from kazuki43zoo:polish-doc
* pr/8392:
  Update doc about constructor injection
8 years ago
Kazuki Shimizu fa4ecff9e0 Update doc about constructor injection
Closes gh-8392
8 years ago
Andy Wilkinson 627edc0f7a Use a different approach to disable HATEOAS Objenesis instance's cache
Previously, reflection was used to set the OBJENESIS field of
DummyInvocationUtils with an Objenesis instance that does not use
caching. This has stopped working as the field is now declared final.

This commit updates the approach take by HateoasObjenesisCacheDisabler
to disable Objenesis's cache. Rather than changing the value of the
OBJENESIS field on DummyInvocationUtils, the cache field on the
ObjenesisStd instance is set to null instead. This has the desired
effect of disabling Objenesis's caching.

See gh-3784
Closes gh-8335
8 years ago
Andy Wilkinson d1184bf180 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 47a59a92d1 Start building against Spring Integration 4.3.8 snapshots
See gh-8435
8 years ago
Phillip Webb ca1540cefe Update header copyright for changed files 8 years ago
Phillip Webb 77f6ed8357 Further rework Spring MVC JSR-303 validation
Rework Spring MVC JSR-303 validation support a little more to move
most of the creation logic to the wrapper class. Also rename
`SpringValidatorAdapterWrapper` -> `WebMvcValidator`.

See gh-8223
8 years ago
Phillip Webb 7ed1a26c2d Fix test failures when running in Eclipse
Update MultipartAutoConfigurationTests to reset the Tomcat URL factory.
8 years ago
Phillip Webb 5867cd6175 Polish 8 years ago
Phillip Webb 47fd5f4fac Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 47b00c086c Polish 8 years ago
Phillip Webb f6db1cbcb2 Extend Microsoft SQL Server detection
Update Microsoft SQL Server detection logic to retain "SQL SERVER"
support (just in case the server string is driver specific).

See gh-8222
8 years ago
Stephane Nicoll 0435f122d4 Rework JSR-303 validation exposure with Spring MVC
This commit improves the initial solution by actually overriding the
`mvcValidator` `@Bean`. This gives us more control as whether a custom
validator has been specified or not. We now wrap it regardless of it
being custom or provided by auto-configuration.

Closes gh-8223
8 years ago
Stephane Nicoll d8f62c46ad Prevent warning due to BPP dependency
`MethodValidationPostProcessor` requires a `Validator` so we need to flag
it as an infrastructure bean to prevent an additional log that indicates
it won't be post-processed.

We obviously don't want to post-process the `Validator` here so adding the
additional meta-data is a good idea anyway.

Closes gh-8422
8 years ago
Stephane Nicoll f032d2fe03 Polish
Closes gh-8412
8 years ago
Stephane Nicoll 4aa99b9531 Avoid exposing several javax.validaton.Validator beans
This commit makes sure that the Spring `Validator` used by the MVC
layer doesn't expose a JSR-303 contract, if any.

The default implementation of the `mvcValidator` is
`LocalValidatorFactoryBean`. While this object is exposed as a Spring
`Validator` only, its runtime capabilities expose that contract as well
as the standard `Validator` and `ValidatorFactory` ones.

Concretely, if an auto-configuration is checking if a
`javax.validation.Validator` bean is missing, the condition will match
since we only know about "advertized types": beans haven't been created
yet so we can't inspect their runtime capabilities. Since the condition
match, we will auto-configure a bean. At runtime though, we're no longer
ale to inject a `javax.validation.Validator` by type since two candidates
are available.

This commit introduces `SpringValidatorAdapterWrapper`, a wrapper class
on any `SpringValidatorAdapter` (`LocalValidatorFactoryBean` being one of
the available implementations) that only exposes the Spring contract.

Also, if a `javax.validation.Validator` bean is available, we will use it
for the MVC layer, rather than creating a new one.

Closes gh-8223
8 years ago