Commit Graph
11068 Commits
Author SHA1 Message Date
Stephane Nicoll a8baa30780 Merge branch '1.5.x' 2017-03-02 09:37:49 +01:00
Stephane Nicoll 16fb8088e9 Upgrade to Spring AMQP 1.7.1.RELEASE
Closes gh-8461
2017-03-02 09:35:32 +01:00
Phillip Webb 58ac67eb27 Merge branch '1.5.x' 2017-03-02 00:09:56 -08:00
Phillip Webb 3ee7dae09b Merge branch '1.4.x' into 1.5.x 2017-03-01 23:44:40 -08: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 f1012c104a Polish 2017-03-01 23:29:20 -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
Madhura Bhave 94a14dbcd8 Merge branch '1.5.x' 2017-03-01 20:16:43 -08:00
Madhura Bhave 031c9bf191 Validate authorities in MvcSecurityInterceptor
If Spring Security is on the classpath and `isUserInRole` returns false,
check if user has the authority to access the actuator endpoints.

Fixes gh-8255
2017-03-01 17:55:30 -08:00
Madhura Bhave e5e1f24d1f Revert "Skip MvcSecurityInterceptor if Spring Security present"
Instead of entirely skipping the interceptor, we will be additionally
checking for authorities.
2017-03-01 16:31:36 -08:00
Madhura Bhave ad5cb8a3cd Skip MvcSecurityInterceptor if Spring Security present
If Spring Security is on the classpath, the role check can be done
as part of the ManagementWebSecurityConfigurerAdapter.

Fixes gh-8255
2017-03-01 14:44:06 -08:00
Andy Wilkinson 0cdd92bb06 Merge branch '1.5.x' 2017-03-01 20:35:04 +00:00
Andy Wilkinson 30eb9c6756 Merge branch '1.4.x' into 1.5.x 2017-03-01 20:34:58 +00: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 cc877aae82 Merge branch '1.5.x' 2017-03-01 20:21:48 +00:00
Andy Wilkinson f9455ba5c5 Start building against Spring Data Ingalls snapshots again
See gh-8444
2017-03-01 20:20:40 +00:00
Andy Wilkinson aa439343bd Merge branch '1.5.x' 2017-03-01 20:04:52 +00:00
Andy Wilkinson 272db338f5 Merge branch '1.4.x' into 1.5.x 2017-03-01 20:04:41 +00:00
Andy Wilkinson ab920f086c Upgrade to Logback 1.1.11
Closes gh-8354
2017-03-01 20:03:58 +00:00
Andy Wilkinson a638401cb5 Merge branch '1.5.x' 2017-03-01 18:36:48 +00:00
Andy Wilkinson 730e374450 Upgrade to Narayana 5.5.3.Final
Closes gh-8455
2017-03-01 18:34:32 +00:00
Andy Wilkinson abd1bad20a Upgrade to Jboss Transaction Spi 7.5.1.Final
Closes gh-8454
2017-03-01 18:34:26 +00:00
Andy Wilkinson dd6d2004ea Upgrade to Ehcache3 3.2.1
Closes gh-8453
2017-03-01 18:34:25 +00:00
Andy Wilkinson f9bd5d8d77 Upgrade to Jetty 9.4.2.v20170220
Closes gh-8452
2017-03-01 18:34:25 +00:00
Andy Wilkinson 0131bfafcf Upgrade to Undertow 1.4.11.Final
Closes gh-8451
2017-03-01 18:34:25 +00:00
Andy Wilkinson 833220f830 Merge branch '1.5.x' 2017-03-01 18:31:39 +00:00
Andy Wilkinson 3d3c2d53ba Merge branch '1.4.x' into 1.5.x 2017-03-01 18:31:13 +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 205faa1950 Merge branch '1.5.x' 2017-03-01 15:08:12 +00:00
Andy Wilkinson 70472b36f1 Merge branch '1.4.x' into 1.5.x 2017-03-01 15:07:06 +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 373474f8f6 Merge branch '1.5.x' 2017-03-01 14:37:18 +00:00
Andy Wilkinson 4390c81115 Merge branch '1.4.x' into 1.5.x 2017-03-01 14:37:10 +00:00
Andy Wilkinson 8a326a8713 Simplify BeanTypeRegistry by requiring a DefaultListableBeanFactory
Closes gh-8439
2017-03-01 14:36:26 +00:00
Andy Wilkinson 9fc79692a7 Merge branch '1.5.x' 2017-03-01 14:13:31 +00:00
Andy Wilkinson 68af831059 Merge branch '1.4.x' into 1.5.x 2017-03-01 14:03:38 +00:00
Andy Wilkinson c0cb6c30a3 Merge branch '1.5.x' 2017-03-01 13:53:30 +00:00
Andy Wilkinson e36a60dcad Revert "Start building against Spring Data Ingalls snapshots"
This reverts commit 36cb8b9e0c.

See gh-8444
2017-03-01 13:52:28 +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 36fb0ed383 Merge branch '1.5.x' 2017-03-01 13:19:18 +01:00