Commit Graph

10340 Commits

Author SHA1 Message Date
Madhura Bhave
703b7d9268 Merge branch '1.4.x' into 1.5.x 2017-03-07 11:08:06 -08: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
fedd7b9506 Polish 2017-03-06 12:01:05 -08:00
Phillip Webb
a3d5101369 Merge branch '1.4.x' into 1.5.x 2017-03-06 11:48:52 -08:00
Phillip Webb
f5aeac3658 Polish 2017-03-06 11:43:29 -08:00
Stephane Nicoll
28bba876fa Merge branch '1.4.x' into 1.5.x 2017-03-06 08:19:12 +01: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
3cdc81c351 Fixup version numbers following release 2017-03-03 17:34:05 +01:00
Spring Buildmaster
d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Stephane Nicoll
fe465f062e Merge branch '1.4.x' into 1.5.x 2017-03-03 16:15:25 +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
Andy Wilkinson
0ec372bfdb Merge pull request #8268 from Eddú Meléndez
* gh-8268:
  Polish "Enable customization of RestTemplate that retrieves JwtAccessTokenConverter's key"
  Enable customization of RestTemplate that retrieves JwtAccessTokenConverter's key
2017-03-03 13:56:04 +00:00
Andy Wilkinson
9e9f006720 Polish "Enable customization of RestTemplate that retrieves JwtAccessTokenConverter's key"
See gh-8268
See gh-5859
2017-03-03 13:55:40 +00:00
Eddú Meléndez
dc9ff73805 Enable customization of RestTemplate that retrieves JwtAccessTokenConverter's key
Closes gh-8268
See gh-5859
2017-03-03 13:55:40 +00:00
Stephane Nicoll
1d9520b3ab Document fast profile in contributing documentation
Closes gh-8424
2017-03-03 13:45:44 +01:00
Stephane Nicoll
26c3469cce Merge branch '1.4.x' into 1.5.x 2017-03-03 13:35:35 +01:00
Stephane Nicoll
dda84749ef Upgrade to Spring Security OAuth 2.0.13.RELEASE
Closes gh-8423
2017-03-03 13:33:59 +01:00
Andy Wilkinson
6381a07c71 Prevent ErrorPageFilter from being used if SBServletInitializer is used
Previously, the configuration class that produces the ErrorPageFilter
bean was an inner class of SpringBootServletInitializer. As a result,
whenever SpringBootServletInitializer was subclasses, the
ErrorPageFilter would be used. This adversely affected applications
running as an executable war file and those deployed to a container
with error page filter registration disabled.

This commit makes ErrorPageFilterConfiguration a top-level class so
that it is no longer always found via SpringBootServletInitializer.
The test that verifies that error page filter registration can be
disabled has been updated to more accurately simulate the behaviour
when an application is deployed as a war to a standalone container.
A test that mimics the behaviour of an application run as an
executable war has also been added.

Closes gh-8477
2017-03-03 12:06:30 +00:00
Stephane Nicoll
d74af04724 Rename JSR 303 Validator bean name
Closes gh-8481
2017-03-03 11:45:26 +01:00
Stephane Nicoll
bb8800a625 Deprecate spring.cache.hazelcast.config
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5

See gh-8470
2017-03-03 10:30:06 +01:00
Madhura Bhave
d4b52a3538 Expose Health details if user has authority
If the Princial is a Spring Security Authentication object and the
request doesn't have the right roles, check the authorities.

Fixes gh-8471
2017-03-02 12:37:47 -08:00
Andy Wilkinson
caefb23401 Merge pull request #8465 from Dave Syer
* gh-8334:
  Polish "Allow loader.path to refer to nested jars"
  Allow loader.path to refer to nested jars
2017-03-02 17:30:05 +00:00
Andy Wilkinson
6673d8eebc Polish "Allow loader.path to refer to nested jars"
Closes gh-8334
Closes gh-8465
2017-03-02 17:29:45 +00:00
Dave Syer
3701cce88f Allow loader.path to refer to nested jars
Previously, each entry in loader.path could only refer to a standard
jar file. Refering to such a jar would add all of the classes in
the root of the jar to the class path.

This commit adds support for referencing a directory within a jar file
that contains one or more nested jars. For example:

$ java -jar -Dloader.path='jar:file:./lib.jar/!BOOT-INF/lib' my.jar

This will add all of the classes in all of that jars in the
BOOT-INF/lib directory of lib.jar to the class path.

See gh-8334
2017-03-02 16:49:24 +00:00
Madhura Bhave
605b0aefc6 Simplify validation logic in ResourceServerProperties
Closes gh-8306
Closes gh-8317
2017-03-02 16:45:54 +00:00
Stephane Nicoll
3e0e4e81b9 Polish 2017-03-02 14:31:31 +01:00
Stephane Nicoll
5cc569fc91 Improve execution speed of CacheAutoConfigurationTests
As of Hazelcast 3.7, the bootstrap is pretty slow by default due to the
networking discovery. This commit disables both TCP/IP and multicast
discoveries.
2017-03-02 14:28:33 +01:00
Stephane Nicoll
3d97ffda6e Merge branch '1.4.x' into 1.5.x 2017-03-02 13:50:14 +01:00
Stephane Nicoll
3e570a3ee2 Upgrade to Spring Data Hopper.SR8
Closes gh-8443
2017-03-02 13:49:26 +01: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
5278baca01 Polish 2017-03-02 12:18:09 +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
82d4bf619d Upgrade to Spring Data Ingalls.SR1
Closes gh-8444
2017-03-02 11:49:04 +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
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
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
16fb8088e9 Upgrade to Spring AMQP 1.7.1.RELEASE
Closes gh-8461
2017-03-02 09:35:32 +01: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