You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/05/02 13:02:01 UTC
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4908a8b0b7a0a1c7c7769938ee95e6751e5da772
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed May 2 11:54:26 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
.../org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e62f921..882907f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -982,6 +982,7 @@ M 4aaa6cc53f694e61eede9c3ef90484fe8f4f3770
M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
M 4b23cab79851b073d9902e504081c13db31145cb
M 4b84baa96a71431bb471763765c188165f83c1ca
+M 4c69a8aba5bc41a46e9cfc68386be736c27269f2
M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
M 4da18667296504ca698c392608e3f48062a4a53b
M 4e46cb7d8d4ccb47aeff85b5b2804728ea4b736d
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
index bf41872..4d604cd 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
@@ -43,8 +43,8 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.util.DOM2Writer;
-import org.apache.xml.security.utils.Base64;
import org.apache.xml.security.algorithms.JCEMapper;
+import org.apache.xml.security.utils.Base64;
import org.opensaml.saml.saml2.core.AuthnRequest;
public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter {
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.