Commit Graph

11163 Commits

Author SHA1 Message Date
Andy Wilkinson
884fedcefb Upgrade to Selenium 3.2.0
Closes gh-8538
2017-03-08 09:32:38 +00:00
Stephane Nicoll
407894e1df Merge pull request #8526 from izeye:polish-20170307
* pr/8526:
  Polish
2017-03-08 06:58:45 +01:00
Johnny Lim
709ee23255 Polish
Closes gh-8526
2017-03-08 06:58:19 +01:00
Madhura Bhave
8f903987da Merge branch '1.5.x' 2017-03-07 11:08:59 -08:00
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
d75c8719ea Fix Javadoc link references
See gh-8517
See gh-814
2017-03-07 08:01:47 -08:00
Madhura Bhave
484c72cd19 Add OriginTrackedYamlLoader
Update the YAML parser so that origin  information can be tracked.
Line and column numbers are now available for each loaded property
value.

Fixes gh-8142
2017-03-06 17:37:20 -08:00
Madhura Bhave
7d793fd123 Add OriginTrackedPropertiesLoader
Use a custom parser to load `.properties` files so that origin
information can be tracked. Line and column numbers are now available
for each loaded property value.

Fixes gh-8517
2017-03-06 17:37:20 -08:00
Madhura Bhave
0593fd3db1 Add OriginTrackedMapPropertySource
Add `OriginTrackedMapPropertySource` that can be used for any `Map`
backed `PropertySource` that is also aware property origins. Rather than
directly storing the value in the `Map`, an `OriginTrackedValue` can
be used.

See gh-8142
See gh-8517
2017-03-06 17:37:20 -08:00
Phillip Webb
43a54c8db1 Add OriginCapablePropertySource interfaces
Add `OriginCapablePropertySource` interface and supporting classes so
that `PropertySource` implementations can reveal the source of any
given property.

The `TextResourcePropertyOrigin` can be used for sources that load
values from a text `Resource` and can track line/column numbers.

See gh-8517
See gh-8142
2017-03-06 17:37:20 -08:00
Phillip Webb
2136a39004 Fix checkstyle errors 2017-03-06 17:37:09 -08:00
Phillip Webb
d8f827d224 Cleanup and format code 2017-03-06 17:08:09 -08:00
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