Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f17f9231 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f17f9231 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f17f9231 Branch: refs/heads/master Commit: f17f923192cee7d734b872aa69fc7332bff0aa25 Parents: 543644a bc948f0 Author: irisding <irisd...@apache.org> Authored: Thu Jan 14 10:16:37 2016 +0800 Committer: irisding <irisd...@apache.org> Committed: Thu Jan 14 10:16:37 2016 +0800 ---------------------------------------------------------------------- parent/pom.xml | 7 ++++++- .../main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 2 +- .../grants/code/DefaultEHCacheCodeDataProvider.java | 2 +- .../provider/DefaultEHCacheOAuthDataProvider.java | 4 ++-- .../KerberosTokenInterceptorProvider.java | 2 +- .../policy/interceptors/NegotiationUtils.java | 2 +- .../ws/security/wss4j/StaxActionInInterceptor.java | 12 ++++++------ .../ws/security/wss4j/StaxCryptoCoverageChecker.java | 8 ++++---- .../wss4j/StaxSecurityContextInInterceptor.java | 14 +++++++------- .../cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java | 2 +- .../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 2 +- .../policyhandlers/StaxSymmetricBindingHandler.java | 12 ++++++------ .../apache/cxf/sts/operation/TokenIssueOperation.java | 2 +- .../apache/cxf/sts/token/canceller/SCTCanceller.java | 2 +- .../cxf/sts/token/provider/TokenProviderUtils.java | 2 +- systests/jaxrs/pom.xml | 4 ++++ .../systest/jaxrs/JAXRSContinuationsServlet3Test.java | 1 - 17 files changed, 44 insertions(+), 36 deletions(-) ----------------------------------------------------------------------