From 335579d35c4930b2b32cbb55efc3af665aeca4e7 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Sun, 19 May 2019 21:54:44 +0000 Subject: [PATCH] Fix base64 dependency Issue-ID: APPC-1604 Change-Id: I7063bbfdcf1ca293d9775b7c21c3bc094ad02c3c Signed-off-by: Brian Freeman --- appc-event-listener/appc-event-listener-bundle/pom.xml | 7 +++++-- .../org/onap/appc/listener/LCM/operation/ProviderOperations.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/appc-event-listener/appc-event-listener-bundle/pom.xml b/appc-event-listener/appc-event-listener-bundle/pom.xml index d05a2a95a..0684c243a 100644 --- a/appc-event-listener/appc-event-listener-bundle/pom.xml +++ b/appc-event-listener/appc-event-listener-bundle/pom.xml @@ -102,7 +102,10 @@ equinoxSDK381 org.eclipse.osgi - + + commons-codec + commons-codec + com.fasterxml.jackson.core jackson-databind @@ -152,7 +155,7 @@ *;resolution:=optional - httpclient,httpcore,jasypt,commons-lang,commons-lang3,appc-common-bundle, + httpclient,httpcore,jasypt,commons-lang,commons-lang3,commons-codec,appc-common-bundle, logback-core,logback-classic,eelf-core,commons-logging;scope=compile|runtime;inline=false true diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/ProviderOperations.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/ProviderOperations.java index 42206ec2e..baaa5b539 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/ProviderOperations.java +++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/ProviderOperations.java @@ -188,7 +188,7 @@ public class ProviderOperations { public String setAuthentication(String user, String password) { if (user != null && password != null) { String authStr = user + ":" + password; - basicAuth = new String(Base64.encodeBase64(authStr.getBytes())); + basicAuth = new String(org.apache.commons.codec.binary.Base64.encodeBase64(authStr.getBytes())); } else { basicAuth = null; } @@ -278,4 +278,4 @@ public class ProviderOperations { //FIXME is it working as intended? return code != null && ((code == 100) || (code == 400)); } -} \ No newline at end of file +} -- 2.16.6