Commit Graph

11090 Commits

Author SHA1 Message Date
Andy Wilkinson
b6e8a280fd Merge branch '1.5.x' 2017-03-02 11:22:17 +00:00
Andy Wilkinson
832ab053b2 Merge pull request #8346 from Dave Syer
* gh-7221:
  Polish "Tighten up PropertiesLauncher's contract"
  Tighten up PropertiesLauncher's contract
2017-03-02 11:20:28 +00:00
Andy Wilkinson
b36c8a7c24 Polish "Tighten up PropertiesLauncher's contract"
See gh-8346
Closes gh-7221
2017-03-02 11:19:48 +00:00
Dave Syer
e4c807b884 Tighten up PropertiesLauncher's contract
The main changes are:

- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
  the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
  or system/env vars)

See gh-7221
Closes gh-8346
2017-03-02 11:19:48 +00:00
Stephane Nicoll
44eaf47553 Merge branch '1.5.x' 2017-03-02 12:18:23 +01:00
Stephane Nicoll
5278baca01 Polish 2017-03-02 12:18:09 +01:00
Stephane Nicoll
ea18fe58e4 Remove useless checked exception throw clause 2017-03-02 12:16:28 +01:00
Stephane Nicoll
ad9d912009 Merge branch '1.5.x' 2017-03-02 12:13:51 +01:00
Stephane Nicoll
0d61f92479 Ignore URI when local.mongo.port is set
This commit makes sure that if `local.mongo.port` is set, a `MongoClient`
on the embedded MongoDB instance is created. When an embedded instance
is detected, only the `host` property is used and the `uri` is ignored if
set.

This makes sure that the auto-configured `MongoClient` automatically
switches to the embedded server, even if a production uri has been
specified.

Closes gh-8219
2017-03-02 11:50:11 +01:00
Stephane Nicoll
926ba47d9b Merge branch '1.5.x' 2017-03-02 11:49:48 +01:00
Stephane Nicoll
82d4bf619d Upgrade to Spring Data Ingalls.SR1
Closes gh-8444
2017-03-02 11:49:04 +01:00
Stephane Nicoll
653fd40bb6 Merge branch '1.5.x' 2017-03-02 09:58:03 +01:00
Stephane Nicoll
5355d6da72 Upgrade to Spring Security 4.2.2.RELEASE
Closes gh-8431
2017-03-02 09:57:18 +01:00
Stephane Nicoll
ed7c6e2063 Merge branch '1.5.x' 2017-03-02 09:55:44 +01:00
Stephane Nicoll
b5b69cca03 Merge branch '1.4.x' into 1.5.x 2017-03-02 09:55:29 +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
f59e96cf9f Merge branch '1.5.x' 2017-03-02 09:52:17 +01:00
Stephane Nicoll
ccb0e6b53a Merge branch '1.4.x' into 1.5.x 2017-03-02 09:51:58 +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
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