[cxf-fediz] branch 1.4.x-fixes updated: Fixing build with JDK7

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 1.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/1.4.x-fixes by this push:
     new 071abe8  Fixing build with JDK7
071abe8 is described below

commit 071abe88defb3f91460f237f48153014c9eda929
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Mon Nov 4 18:44:42 2019 +0000

    Fixing build with JDK7
---
 .../test/java/org/apache/cxf/fediz/core/samlsso/SAMLLogoutTest.java   | 4 ++--
 pom.xml                                                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLLogoutTest.java
 
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLLogoutTest.java
index fad0bb2..91a7b65 100644
--- 
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLLogoutTest.java
+++ 
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLLogoutTest.java
@@ -26,7 +26,6 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
-import java.util.Base64;
 import java.util.UUID;
 
 import javax.security.auth.callback.CallbackHandler;
@@ -50,6 +49,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.OpenSAMLUtil;
 import org.apache.wss4j.common.util.DOM2Writer;
+import org.apache.xml.security.utils.Base64;
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -328,7 +328,7 @@ public class SAMLLogoutTest {
 
         byte[] deflatedBytes = 
CompressionUtils.deflate(responseMessage.getBytes(StandardCharsets.UTF_8));
 
-        return Base64.getEncoder().encodeToString(deflatedBytes);
+        return Base64.encode(deflatedBytes);
     }
 
 }
diff --git a/pom.xml b/pom.xml
index 1605f12..3561854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <dbcp.version>2.1.1</dbcp.version>
         <easymock.version>3.4</easymock.version>
         <ecj.version>4.6.1</ecj.version>
-        <ehcache.version>2.10.6</ehcache.version>
+        <ehcache.version>2.10.5</ehcache.version>
         <hsqldb.version>2.3.6</hsqldb.version>
         <htmlunit.version>2.24</htmlunit.version>
         <jackson.version>2.8.11</jackson.version>