Stephane Nicoll
752a91c75b
Merge branch '1.5.x'
2017-01-14 04:36:47 -05:00
Stephane Nicoll
de1d450af7
Merge pull request #7916 from pravsingh:readmeFix
...
* pr/7916:
Polish contribution
Polish samples list in readme
2017-01-14 04:36:27 -05:00
Stephane Nicoll
7e557662a5
Polish contribution
...
Closes gh-7916
2017-01-14 04:35:58 -05:00
Praveendra Singh
36de58f0fe
Polish samples list in readme
...
See gh-7916
2017-01-14 04:34:10 -05:00
Andy Wilkinson
1d589fc55a
Merge branch '1.5.x'
2017-01-13 18:58:46 -05:00
Andy Wilkinson
7423ce5e5c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:58:40 -05:00
Andy Wilkinson
f92719c4be
Remove unwanted override of git-commit-id-plugin's version
2017-01-13 18:58:19 -05:00
Andy Wilkinson
db70252102
Merge branch '1.5.x'
2017-01-13 18:50:51 -05:00
Andy Wilkinson
9b184e3955
Polishing
2017-01-13 18:47:43 -05:00
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
Andy Wilkinson
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 15:36:06 -05:00
Andy Wilkinson
f86a6098e1
Merge branch '1.5.x'
2017-01-13 15:32:10 -05:00
Andy Wilkinson
c04f79fd74
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:32:05 -05:00
Andy Wilkinson
bf642ff9db
Continue failure analysis when an analyzer throws an exception
...
Previously, if a failure analyzer threw an exception from its
analyze method, failure analysis would stop.
This commit updates FailureAnalyzers to catch and log any Throwable
thrown by an analyzer and continue to the next available analyzer.
Closes gh-7956
2017-01-13 15:30:09 -05:00
Andy Wilkinson
3570b06ebf
Merge branch '1.5.x'
2017-01-13 15:18:40 -05:00
Andy Wilkinson
3342504d7a
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:18:34 -05:00
Andy Wilkinson
7298b2dc1b
Set value of javax.servlet.error.exception_type to a Class not a String
...
Previously, ErrorPageFilter set the value of
javax.servlet.error.exception_type to be the name of the exception,
(a java.lang.String). This commit changes it to be a java.lang.Class
as required by the Servlet spec.
Closes gh-7925
2017-01-13 15:15:58 -05:00
Andy Wilkinson
8ca426281b
Merge branch '1.5.x'
2017-01-13 15:11:07 -05:00
Andy Wilkinson
1ce6e3392a
Upgrade to Spring Retry 1.2.0.RELEASE
...
Closes gh-7984
2017-01-13 15:09:50 -05:00
Andy Wilkinson
6100b3e850
Merge branch '1.5.x'
2017-01-13 07:29:26 -05:00
Andy Wilkinson
66915a456a
Merge branch '1.4.x' into 1.5.x
2017-01-13 07:29:17 -05:00
Andy Wilkinson
6f7d1de167
Remove redundant logic from OAuth2MethodSecurityConfiguration
...
Previously, OAuth2MethodSecurityConfiguration set the
PermissionEvaluator on the expression evaluator by looking in the
context for a PermissionEvaluator bean. This is unnecessary as
GlobalMethodSecurityConfiguration already does the same thing and does
so after the post-processor in OAuth2MethodSecurityConfiguration has
run. This commit removes the redundant logic and adds tests to check
that both the PermissionEvaluator and the RoleHierarchy are set use
beans in the context.
Closes gh-7979
2017-01-13 07:28:57 -05:00
Andy Wilkinson
1d4cee9460
Drop support for the old spring-boot Gradle plugin ID
...
Closes gh-7859
2017-01-13 06:47:02 -05:00
Andy Wilkinson
dc01f40f47
Upgrade to Spring Integration 5.0.0.M2
...
Closes gh-7768
2017-01-12 16:53:44 -05:00
Andy Wilkinson
446e9824c6
Merge branch '1.5.x'
2017-01-12 11:09:47 -05:00
Andy Wilkinson
689721de7a
Merge branch '1.4.x' into 1.5.x
2017-01-12 11:09:36 -05:00
Andy Wilkinson
8b0ecab181
Add dependency management for spring-plugin-metadata
...
Closes gh-7864
2017-01-12 11:09:25 -05:00
Stephane Nicoll
b4ceb46a6b
Merge branch '1.5.x'
2017-01-12 09:09:57 -05:00
Stephane Nicoll
5ee12a824f
Fix assertion
...
See gh-7962
2017-01-12 09:09:42 -05:00
Andy Wilkinson
99ffeb819f
Merge branch '1.5.x'
2017-01-12 07:44:23 -05:00
Andy Wilkinson
5885afdf81
Add dependency management for Spring LDAP
...
Closes gh-7964
2017-01-12 07:43:07 -05:00
Andy Wilkinson
78a06c3278
Merge branch '1.5.x'
2017-01-10 17:05:09 -05:00
Andy Wilkinson
65025d8dab
Enable Neo4J's open in view interceptor by default
...
Closes gh-7943
2017-01-10 17:04:51 -05:00
Phillip Webb
9159c87bf9
Polish
2017-01-10 09:51:11 -05:00
Stephane Nicoll
5898a17807
Merge branch '1.5.x'
2017-01-10 09:30:21 -05:00
Stephane Nicoll
766816f600
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:30:09 -05:00
Stephane Nicoll
a427982d77
Merge pull request #7911 from drumonii:fix-configure-a-datasource-doc-ref-link
...
* pr/7911:
Fix configure a datasource reference doc link
2017-01-10 09:29:55 -05:00
drumonii
bb5819b879
Fix configure a datasource reference doc link
...
Closes gh-7911
2017-01-10 09:29:35 -05:00
Andy Wilkinson
ce2256d7dc
Merge branch '1.5.x'
2017-01-10 09:13:37 -05:00
Andy Wilkinson
db56e1cd00
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:13:27 -05:00
Andy Wilkinson
bb4777c920
Merge pull request #7937 from Michael Simons
...
* gh-7937:
Update springloaded version to 1.2.6.RELEASE in Maven-related docs
2017-01-10 09:13:20 -05:00
Michael J. Simons
3c291150d6
Update springloaded version to 1.2.6.RELEASE in Maven-related docs
...
Closes gh-7937
2017-01-10 09:13:00 -05:00
Andy Wilkinson
891045880d
Merge branch '1.5.x'
2017-01-10 09:10:36 -05:00
Andy Wilkinson
8934dfaecf
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:10:26 -05:00
Andy Wilkinson
6a9397283c
Merge pull request #7937 from Michael Simons
...
* gh-7937:
Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
2017-01-10 09:10:11 -05:00
Michael J. Simons
ddca9a1687
Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
...
Closes gh-7937
2017-01-10 09:08:35 -05:00
Stephane Nicoll
a2bd186a78
Merge branch '1.5.x'
2017-01-09 14:09:55 -05:00
