Commit Graph

11077 Commits (ed7c6e2063c40968ec49ed72330a48dcc1b11022)
 

Author SHA1 Message Date
Stephane Nicoll ed7c6e2063 Merge branch '1.5.x' 8 years ago
Stephane Nicoll b5b69cca03 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll f3537daff4 Merge pull request #8143 from michael-simons:doc-migration
* pr/8143:
  Fix indentation
  Clarify usage of @ImportResource in doc
8 years ago
Stephane Nicoll 09205a8fc8 Fix indentation
Closes gh-8143
8 years ago
Michael J. Simons f50a0f9707 Clarify usage of @ImportResource in doc
See gh-8143
8 years ago
Stephane Nicoll f59e96cf9f Merge branch '1.5.x' 8 years ago
Stephane Nicoll ccb0e6b53a Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 3e4ed59fdf Merge pull request #8460 from garyrussell:si
* pr/8460:
  Upgrade to Spring Integration 4.3.8.RELEASE
8 years ago
Gary Russell ba9853654a Upgrade to Spring Integration 4.3.8.RELEASE
Closes gh-8460
8 years ago
Stephane Nicoll a8baa30780 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 16fb8088e9 Upgrade to Spring AMQP 1.7.1.RELEASE
Closes gh-8461
8 years ago
Phillip Webb 58ac67eb27 Merge branch '1.5.x' 8 years ago
Phillip Webb 3ee7dae09b Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Phillip Webb f1012c104a Polish 8 years ago
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
8 years ago
Phillip Webb 7fda9c162e Polish web containers stop contribution
See gh-8227
8 years ago
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
8 years ago
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
8 years ago
Phillip Webb 987b6c956e Polish 8 years ago
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
8 years ago
Madhura Bhave 94a14dbcd8 Merge branch '1.5.x' 8 years ago
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
8 years ago
Madhura Bhave e5e1f24d1f Revert "Skip MvcSecurityInterceptor if Spring Security present"
Instead of entirely skipping the interceptor, we will be additionally
checking for authorities.
8 years ago
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
8 years ago
Andy Wilkinson 0cdd92bb06 Merge branch '1.5.x' 8 years ago
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 cc877aae82 Merge branch '1.5.x' 8 years ago
Andy Wilkinson f9455ba5c5 Start building against Spring Data Ingalls snapshots again
See gh-8444
8 years ago
Andy Wilkinson aa439343bd Merge branch '1.5.x' 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 a638401cb5 Merge branch '1.5.x' 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 833220f830 Merge branch '1.5.x' 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 205faa1950 Merge branch '1.5.x' 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