Commit Graph

9332 Commits

Author SHA1 Message Date
Andy Wilkinson
a2cf0455fd Fix static resource handling when run in IDE or using Maven or Gradle
The changes made for gh-8299 attempted to make static resource
handling consistent across Jetty, Tomcat, and Undertow. They did so
for application's launched using JarLauncher or WarLauncher but did
not consider application's launched in an IDE or using spring-boot:run
in Maven or bootRun in Gradle.

Running in an IDE or via Maven or Gradle introduces two new
resource locations:

 - Jars on the classpath with file protocol URLs (they are always
   jar protocol URLs when using either launcher)
 - Directories on the classpath from a project that is depended upon
   and contains resources in META-INF/resources

This commit updates the factories for all three containers to handle
these new resources locations. The integration tests have also been
updated.
2017-03-09 12:41:32 +00:00
Madhura Bhave
67068fc83d Ignore unresolvable nested placeholders
The NamePatternEnvironmentFilter used to throw an exception if
placeholders in property values could not be resolved.

Fixes gh-8510
2017-03-07 10:20:42 -08:00
Phillip Webb
f5aeac3658 Polish 2017-03-06 11:43:29 -08:00
Stephane Nicoll
9fb9a67c4b Avoid early initializations
This commit flags the two `BeanPostProcessors` registered by the
embedded support as `synthetic` so that they don't trigger an early
initialization of other components.

Closes gh-8467
2017-03-06 08:16:58 +01:00
Stephane Nicoll
dac3810bc1 Fixup version numbers following release 2017-03-03 16:14:56 +01:00
Spring Buildmaster
2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Stephane Nicoll
dda84749ef Upgrade to Spring Security OAuth 2.0.13.RELEASE
Closes gh-8423
2017-03-03 13:33:59 +01:00
Stephane Nicoll
3e570a3ee2 Upgrade to Spring Data Hopper.SR8
Closes gh-8443
2017-03-02 13:49:26 +01:00
Stephane Nicoll
f3537daff4 Merge pull request #8143 from michael-simons:doc-migration
* pr/8143:
  Fix indentation
  Clarify usage of @ImportResource in doc
2017-03-02 09:55:18 +01:00
Stephane Nicoll
09205a8fc8 Fix indentation
Closes gh-8143
2017-03-02 09:54:34 +01:00
Michael J. Simons
f50a0f9707 Clarify usage of @ImportResource in doc
See gh-8143
2017-03-02 09:54:26 +01:00
Stephane Nicoll
3e4ed59fdf Merge pull request #8460 from garyrussell:si
* pr/8460:
  Upgrade to Spring Integration 4.3.8.RELEASE
2017-03-02 09:51:14 +01:00
Gary Russell
ba9853654a Upgrade to Spring Integration 4.3.8.RELEASE
Closes gh-8460
2017-03-02 09:50:56 +01:00
Phillip Webb
fded87225c Merge pull request #8227 from mkw/gh-8224
* pr/8227:
  Refine engine counter logic
  Polish web containers stop contribution
  Ensure web containers are stopped after close
2017-03-01 23:30:40 -08:00
Phillip Webb
5aafbc2a3b Refine engine counter logic
Update counter logic to prevent negative values. Since the stop method
can now be called more than once, it was possible for the counter to
move into negative values.

See gh-8227
2017-03-01 23:07:48 -08:00
Phillip Webb
7fda9c162e Polish web containers stop contribution
See gh-8227
2017-03-01 23:07:41 -08:00
Michael K. Werle
757aa647cf Ensure web containers are stopped after close
Update `EmbeddedServletContainer` implementations to ensure that stop
can be called even if start has not. This allows servers that are
partially started during `initialize()` to still be shut down.

This commit fixes a regression caused by commit 0af53b361f.

See gh-8036
Fixes gh-8224
Closes gh-8227
2017-03-01 22:04:09 -08:00
Phillip Webb
c06a9771c2 Support list based role properties
Update `HealthMvcEndpoint` to respect `ManagementServerProperties`
roles. Prior to this commit the `HealthMvcEndpoint` directly loaded
roles rather than using bound properties. This meant that list values
from yaml were not respected.

Fixes gh-8314
2017-03-01 21:35:50 -08:00
Phillip Webb
987b6c956e Polish 2017-03-01 20:43:04 -08:00
Phillip Webb
57111aba22 Get published DataSource from EntityManager
Update DataSourceInitializedPublisher to always attempt to obtain the
published DataSource directly from the EntityManager. In the case where
the EntityManager doesn't provide a DataSource, the previous logic is
used.

Fixes gh-8296
2017-03-01 20:42:26 -08:00
Andy Wilkinson
055542f2b4 Merge pull request #8458 from Gary Russell
* gh-8458:
  Upgrade to Spring AMQP 1.6.8.RELEASE
2017-03-01 20:34:09 +00:00
Gary Russell
482a5a37c0 Upgrade to Spring AMQP 1.6.8.RELEASE
Closes gh-8458
2017-03-01 20:33:23 +00:00
Andy Wilkinson
ab920f086c Upgrade to Logback 1.1.11
Closes gh-8354
2017-03-01 20:03:58 +00:00
Andy Wilkinson
e0e1a7f31e Upgrade to Slf4j 1.7.24
Closes gh-8450
2017-03-01 18:25:34 +00:00
Andy Wilkinson
d114905449 Upgrade to Ehcache3 3.1.4
Closes gh-8449
2017-03-01 18:25:34 +00:00
Andy Wilkinson
acb02475b5 Upgrade to Groovy 2.4.9
Closes gh-8448
2017-03-01 18:25:33 +00:00
Andy Wilkinson
d7a124449d Upgrade to Mysql 5.1.41
Closes gh-8447
2017-03-01 18:25:30 +00:00
Andy Wilkinson
9240a8cd64 Upgrade to Dropwizard Metrics 3.1.3
Closes gh-8446
2017-03-01 18:25:26 +00:00
Andy Wilkinson
59d3a79c82 Avoid eager initialization when finding beans by annotation
Closes gh-8269
2017-03-01 15:05:54 +00:00
Andy Wilkinson
8a326a8713 Simplify BeanTypeRegistry by requiring a DefaultListableBeanFactory
Closes gh-8439
2017-03-01 14:36:26 +00:00
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
2017-03-01 12:40:26 +00:00
Stephane Nicoll
21ca1af677 Upgrade to Spring Framework 4.3.7.RELEASE
Closes gh-8248
2017-03-01 11:31:07 +01:00
Stephane Nicoll
66e6671dcb Start building against Spring Data Hopper snapshots
See gh-8443
2017-03-01 09:35:38 +01:00
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
2017-02-28 15:57:54 +00:00
Andy Wilkinson
98cf35d48e Polish "Ignore spock.lang annotations when creating test context cache key"
See gh-8252
2017-02-28 15:55:55 +00:00
erlholmq
8f18df8a9c Ignore spock.lang annotations when creating test context cache key
See gh-7524
Closes gh-8252
2017-02-28 15:49:35 +00:00
Andy Wilkinson
47a59a92d1 Start building against Spring Integration 4.3.8 snapshots
See gh-8435
2017-02-28 10:40:30 +00:00
Phillip Webb
47b00c086c Polish 2017-02-27 13:56:17 -08:00
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
2017-02-27 13:41:34 -08:00
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
2017-02-22 11:33:30 +00:00
Andy Wilkinson
6af4b10b9d Revert "Upgrade to Logback 1.1.10"
This reverts commit 05113d059d.

See gh-8354
2017-02-22 10:49:53 +00:00
Andy Wilkinson
b3d0b3330b Upgrade to Slf4j 1.7.23
Closes gh-8364
2017-02-22 09:49:43 +00:00
Andy Wilkinson
357667e97d Upgrade to Lombok 1.16.14
Closes gh-8363
2017-02-22 09:49:42 +00:00
Andy Wilkinson
3bf7bf86fb Upgrade to Infinispan 8.2.6.Final
Closes gh-8362
2017-02-22 09:49:42 +00:00
Andy Wilkinson
6ed5204874 Upgrade to Hibernate 5.0.12.Final
Closes gh-8361
2017-02-22 09:49:41 +00:00
Andy Wilkinson
bdf4181e35 Upgrade to Solr 5.5.4
Closes gh-8360
2017-02-22 09:49:41 +00:00
Andy Wilkinson
0a2ef8331a Upgrade to Httpclient 4.5.3
Closes gh-8359
2017-02-22 09:49:41 +00:00
Andy Wilkinson
686047f39e Upgrade to Httpasyncclient 4.1.3
Closes gh-8358
2017-02-22 09:49:40 +00:00
Andy Wilkinson
637a1a98d9 Upgrade to Undertow 1.3.27.Final
Closes gh-8357
2017-02-22 09:49:40 +00:00
Andy Wilkinson
95db8d2a31 Upgrade to Appengine 1.9.49
Closes gh-8356
2017-02-22 09:49:40 +00:00