From: Brian Freeman <bf1936@att.com>
Date: Sun, 19 May 2019 21:54:44 +0000 (+0000)
Subject: Fix base64 dependency
X-Git-Tag: 1.5.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=335579d35c4930b2b32cbb55efc3af665aeca4e7;p=appc.git

Fix base64 dependency

Issue-ID: APPC-1604
Change-Id: I7063bbfdcf1ca293d9775b7c21c3bc094ad02c3c
Signed-off-by: Brian Freeman <bf1936@att.com>
---

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 @@
 			<groupId>equinoxSDK381</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
-
+                <dependency>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -152,7 +155,7 @@
 							*;resolution:=optional
 						</Import-Package>
 						<Embed-Dependency>
-							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
 						</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
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
+}