Commit Graph

11150 Commits

Author SHA1 Message Date
Phillip Webb
c7b46e4d1c Upgrade to HtmlUnit 2.25
Fixes gh-8515
2017-03-06 16:30:40 -08:00
Phillip Webb
e2cc4655f4 Remove deprecated OKHttp 2.0 tests 2017-03-06 15:51:07 -08:00
Phillip Webb
425dbc3e52 Update copyright header for edited files 2017-03-06 15:04:07 -08:00
Phillip Webb
2a592103f0 Polish formatting 2017-03-06 15:03:43 -08:00
Phillip Webb
91a7bf92e6 Merge branch '1.5.x' 2017-03-06 12:04:55 -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
Andy Wilkinson
dcf7e11de5 Upgrade to Snakeyaml 1.18
Closes gh-8505
2017-03-06 10:44:20 +00:00
Andy Wilkinson
dc2548d3bc Upgrade to Spring Security Oauth 2.1.0.RELEASE
Closes gh-8504
2017-03-06 10:44:20 +00:00
Andy Wilkinson
bf7c9acc87 Upgrade to Rxjava 1.2.7
Closes gh-8503
2017-03-06 10:44:20 +00:00
Andy Wilkinson
0d46181f11 Upgrade to Caffeine 2.4.0
Closes gh-8502
2017-03-06 10:44:19 +00:00
Andy Wilkinson
dba2ff13b1 Reinstate dependency management for hibernate-entitymanager
This commit reinstates dependency management for
hibernate-entitymanager as, while empty, it remains part of Hibernate
5.2.x and people may still have a dependency upon it.

It also reinstates the configuration of skipping the jar during TLD
scanning so that any application that does depend on
hibernate-entitymanager doesn't scan it for TLDs.

See gh-8433
2017-03-06 10:36:27 +00:00
Stephane Nicoll
546338ac80 Avoid early initializations for reactive support
This commit flags the `BeanPostProcessor` registered by the reactive
embedded support as `synthetic` so that it doesn't trigger an early
initialization of other components.

See gh-8467
2017-03-06 08:27:28 +01:00
Stephane Nicoll
36d6ab41a2 Merge branch '1.5.x' 2017-03-06 08:21:33 +01: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
bc15029e03 Merge branch '1.5.x' 2017-03-03 17:34:14 +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
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