Commit Graph

10262 Commits (68af8310593f3cc1a82c4bc9884bd9e343a3f948)
 

Author SHA1 Message Date
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
Andy Wilkinson 50bc321621 Upgrade to Spring Kafka 1.1.3.RELEASE
Closes gh-8374
8 years ago
Andy Wilkinson cbffc51b48 Upgrade to Mongodb 3.4.2
Closes gh-8373
8 years ago
Andy Wilkinson 73b7b3d7be Upgrade to Mariadb 1.5.8
Closes gh-8372
8 years ago
Andy Wilkinson e211602f4a Upgrade to Narayana 5.5.2.Final
Closes gh-8371
8 years ago
Andy Wilkinson e5c05b3193 Upgrade to Artemis 1.5.3
Closes gh-8370
8 years ago
Andy Wilkinson 789257b76b Upgrade to Undertow 1.4.10.Final
Closes gh-8369
8 years ago
Andy Wilkinson 1f6c52022d Upgrade to Cassandra Driver 3.1.4
Closes gh-8368
8 years ago
Andy Wilkinson b034a505a5 Polish 0f42c5dd
- Apply standard code formatting
- Add class javadoc to MultipleResourceServerConfigurationTests
- Add missing @Override annotations
- Remove unused ExpectedException field
- Remove use of SpringApplicationBuilder from the tests
- Use @ImportAutoConfiguration to import auto-configuration
- Add assertions to verify that the orders haven't been changed
- Remove unnecessary mocking of EmbeddedServletContainerFactory

See gh-8347
8 years ago
Andy Wilkinson f4eb45ac6d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 99683dff6f Upgrade to Logback 1.1.10
In Logback 1.1.10, the logback-classic module contains a
META-INF/services/javax.servlet.ServletContainerInitializer file that
contains a comment. This triggers a bug in Wildfly 8 [1] that has been
fixed [2] in Wildfly 9 and later. As a result, this commit also
updates our Wildfly deployment test to use 9.0.2 rather than 8.2.0.

Closes gh-8354

[1] https://issues.jboss.org/browse/WFLY-4089
[2] fef57ebdc7
8 years ago
Dave Syer 0f42c5dd94 Check there is only one ResourceServerConfiguration before modifying
Fixes gh-8347
8 years ago
Andy Wilkinson f952b2492a Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6af4b10b9d Revert "Upgrade to Logback 1.1.10"
This reverts commit 05113d059d.

See gh-8354
8 years ago
Andy Wilkinson 1e4830e713 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson b3d0b3330b Upgrade to Slf4j 1.7.23
Closes gh-8364
8 years ago
Andy Wilkinson 357667e97d Upgrade to Lombok 1.16.14
Closes gh-8363
8 years ago
Andy Wilkinson 3bf7bf86fb Upgrade to Infinispan 8.2.6.Final
Closes gh-8362
8 years ago
Andy Wilkinson 6ed5204874 Upgrade to Hibernate 5.0.12.Final
Closes gh-8361
8 years ago
Andy Wilkinson bdf4181e35 Upgrade to Solr 5.5.4
Closes gh-8360
8 years ago
Andy Wilkinson 0a2ef8331a Upgrade to Httpclient 4.5.3
Closes gh-8359
8 years ago
Andy Wilkinson 686047f39e Upgrade to Httpasyncclient 4.1.3
Closes gh-8358
8 years ago