Commit Graph

11130 Commits

Author SHA1 Message Date
Stephane Nicoll
6cffcb652c Merge pull request #8429 from bquintanaj:issues/8426-master
* pr/8429:
  Upgrade to versions maven plugin 2.3
2017-03-03 17:09:39 +01:00
bquintanaj
c99858e4fc Upgrade to versions maven plugin 2.3
Closes gh-8429
2017-03-03 17:08:22 +01:00
Stephane Nicoll
346ddfcf75 Merge branch '1.5.x' 2017-03-03 16:15:42 +01: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
edc2facd7a Merge branch '1.5.x' 2017-03-03 14:02:19 +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
f143ec52a6 Fix Javadoc of WebEnvironment
Closes gh-8469
2017-03-03 13:52:53 +01:00
Stephane Nicoll
c0b6d47ffe Merge branch '1.5.x' 2017-03-03 13:46:05 +01:00
Stephane Nicoll
1d9520b3ab Document fast profile in contributing documentation
Closes gh-8424
2017-03-03 13:45:44 +01:00
Stephane Nicoll
b61446b96d Merge branch '1.5.x' 2017-03-03 13:36:35 +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
c37bba29ef Polish forward merge to reflect renamed classes 2017-03-03 12:22:45 +00:00
Andy Wilkinson
dc0415ebb5 Merge branch '1.5.x' 2017-03-03 12:06:47 +00: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
2e1cda8743 Merge branch '1.5.x' 2017-03-03 11:45:37 +01:00
Stephane Nicoll
d74af04724 Rename JSR 303 Validator bean name
Closes gh-8481
2017-03-03 11:45:26 +01:00
Stephane Nicoll
28a8e3db2f Remove spring.cache.hazelcast.config
Remove the creation of a separate `HazelcastInstance` specific to caching.
Instead, the general `HazelcastAutoConfiguration` is used and if a
`HazelcastInstance` bean is present we wrap it in a `CacheManager`.

Closes gh-8470
2017-03-03 11:18:06 +01:00
Stephane Nicoll
d811b5fb1d Merge branch '1.5.x' 2017-03-03 10:31: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
8f26dc09b7 Merge branch '1.5.x' 2017-03-02 13:35:19 -08: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
Stephane Nicoll
c64bc2accf Merge pull request #8433 from vpavic:polish-hibernate-deps
* pr/8433:
  Remove dependency management for `hibernate-entitymanager`
2017-03-02 18:32:01 +01:00
Vedran Pavic
1c789f1a8d Remove dependency management for hibernate-entitymanager
Closes gh-8433
2017-03-02 18:31:53 +01:00
Andy Wilkinson
9c88ba3b90 Merge branch '1.5.x' 2017-03-02 17:30:44 +00: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
Andy Wilkinson
5285a8db44 Merge branch '1.5.x' 2017-03-02 16:47:04 +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
cb40ea485b Merge branch '1.5.x' 2017-03-02 14:31:49 +01: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
4edd1aeaaf Merge branch '1.5.x' 2017-03-02 13:50:41 +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
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