fixes for security vulnerabilities

Issue-ID: DMAAP-1488
Change-Id: I8626c29ac1d0fffbfa22d47460c10b232e3fae81
Signed-off-by: su622b <su622b@att.com>

17 files changed, 64 insertions, 464 deletions

diff --git a/pom.xml b/pom.xml
index 63ed6d8..db802cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,13 @@
 	    <dependency>
 		<groupId>commons-codec</groupId>
 		<artifactId>commons-codec</artifactId>
-		<version>1.13</version>
+		<version>1.14</version>
 	</dependency>
+	<dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.20.0-GA</version>
+        </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
@@ -124,18 +129,24 @@
 			</exclusions>
 		</dependency>
 		<!-- Begin - Dependency on log4j for logging purpose -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>1.2.17</version>
 		</dependency>
-		<!-- Log4j's enhanced pattern layout is shipped separately -->
+		Log4j's enhanced pattern layout is shipped separately
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>apache-log4j-extras</artifactId>
 			<version>1.2.17</version>
-		</dependency>
+		</dependency> -->
 		<!-- End - Dependency on log4j for logging purpose -->
+		
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.7</version>
+		</dependency>
 
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
diff --git a/src/main/java/org/onap/dmaap/mr/logging/MRAppender.java b/src/main/java/org/onap/dmaap/mr/logging/MRAppender.java
deleted file mode 100644
index 8842b14..0000000
--- a/src/main/java/org/onap/dmaap/mr/logging/MRAppender.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- *  ============LICENSE_START=======================================================
- *  org.onap.dmaap
- *  ================================================================================
- *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- *  ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
- *******************************************************************************/
-/**
- * 
- */
-package org.onap.dmaap.mr.logging;
-
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.spi.LoggingEvent;
-
-import org.onap.dmaap.mr.client.MRClientFactory;
-import org.onap.dmaap.mr.client.MRPublisher;
-
-/**
- * @author author
- *
- */
-public class MRAppender extends AppenderSkeleton {
-
-	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-
-	private MRPublisher fPublisher;
-
-	//Provided through log4j configuration
-	private String topic;
-	private String partition;
-	private String hosts;
-	private int maxBatchSize = 1;
-	private int maxAgeMs = 1000;
-	private boolean compress = false;
-
-	/**
-	 * 
-	 */
-	public MRAppender() {
-		super();
-	}
-
-	/**
-	 * @param isActive
-	 */
-	public MRAppender(boolean isActive) {
-		super(isActive);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.log4j.Appender#close()
-	 */
-	@Override
-	public void close() {
-		if (!this.closed) {
-			this.closed = true;
-			fPublisher.close();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.log4j.Appender#requiresLayout()
-	 */
-	@Override
-	public boolean requiresLayout() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
-	 */
-	@Override
-	protected void append(LoggingEvent event) {
-		final String message;
-		
-		if (this.layout == null) {
-			message = event.getRenderedMessage();
-		} else {
-			message = this.layout.format(event);
-		}
-		
-		try {
-			fPublisher.send(partition, message);
-		} catch (IOException e) {
-                    logger.error("IOException: ", e);
-		}
-	}
-
-        @Override
-	public void activateOptions() {
-		if (hosts != null && topic != null && partition != null) {
-			fPublisher = MRClientFactory.createBatchingPublisher(hosts.split(","), topic, maxBatchSize, maxAgeMs, compress);
-		} else {
-			logger.error("The Hosts, Topic, and Partition parameter are required to create a MR Log4J Appender");
-		}
-	}
-	public String getTopic() {
-		return topic;
-	}
-
-	public void setTopic(String topic) {
-		this.topic = topic;
-	}
-
-	public String getPartition() {
-		return partition;
-	}
-
-	public void setPartition(String partition) {
-		this.partition = partition;
-	}
-
-	public String getHosts() {
-		return hosts;
-	}
-
-	public void setHosts(String hosts) {
-		this.hosts = hosts;
-	}
-	
-	public int getMaxBatchSize() {
-		return maxBatchSize;
-	}
-
-	public void setMaxBatchSize(int maxBatchSize) {
-		this.maxBatchSize = maxBatchSize;
-	}
-
-	public int getMaxAgeMs() {
-		return maxAgeMs;
-	}
-
-	public void setMaxAgeMs(int maxAgeMs) {
-		this.maxAgeMs = maxAgeMs;
-	}	
-	
-	public boolean isCompress() {
-		return compress;
-	}
-
-	public void setCompress(boolean compress) {
-		this.compress = compress;
-	}
-
-}
diff --git a/src/test/java/org/onap/dmaap/mr/client/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/client/JUnitTestSuite.java
index b791b51..1ed519a 100644
--- a/src/test/java/org/onap/dmaap/mr/client/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/mr/client/JUnitTestSuite.java
@@ -25,13 +25,14 @@ import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Suite.class)
 @SuiteClasses({ HostSelectorTest.class, MRClientBuildersTest.class, MRClientFactoryTest.class})
 
 public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
 
 	public static void main(String[] args) {
 		LOGGER.info("Running the test suite");
diff --git a/src/test/java/org/onap/dmaap/mr/client/TestRunner.java b/src/test/java/org/onap/dmaap/mr/client/TestRunner.java
index f9b8a86..2cc2c10 100644
--- a/src/test/java/org/onap/dmaap/mr/client/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/mr/client/TestRunner.java
@@ -23,10 +23,11 @@ package org.onap.dmaap.mr.client;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
@@ -35,7 +36,7 @@ public class TestRunner {
 			LOGGER.info(failure.toString());
 			
 		}
-		LOGGER.info(result.wasSuccessful());
+		LOGGER.info(String.valueOf(result.wasSuccessful()));
 	}
 
 }
diff --git a/src/test/java/org/onap/dmaap/mr/client/response/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/client/response/JUnitTestSuite.java
index 1cfaef4..362da00 100644
--- a/src/test/java/org/onap/dmaap/mr/client/response/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/mr/client/response/JUnitTestSuite.java
@@ -25,13 +25,15 @@ import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Suite.class)
 @SuiteClasses({ MRConsumerResponseTest.class, MRPublisherResponseTest.class,})
 
 public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
 
 	public static void main(String[] args) {
 		LOGGER.info("Running the test suite");
diff --git a/src/test/java/org/onap/dmaap/mr/client/response/TestRunner.java b/src/test/java/org/onap/dmaap/mr/client/response/TestRunner.java
index 9bf5880..a5f43d4 100644
--- a/src/test/java/org/onap/dmaap/mr/client/response/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/mr/client/response/TestRunner.java
@@ -23,10 +23,11 @@ package org.onap.dmaap.mr.client.response;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
@@ -35,7 +36,7 @@ public class TestRunner {
 			LOGGER.info(failure.toString());
 			
 		}
-		LOGGER.info(result.wasSuccessful());
+		LOGGER.info(String.valueOf(result.wasSuccessful()));
 	}
 
 }
diff --git a/src/test/java/org/onap/dmaap/mr/dme/client/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/dme/client/JUnitTestSuite.java
index 0d4c69a..e1f8431 100644
--- a/src/test/java/org/onap/dmaap/mr/dme/client/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/mr/dme/client/JUnitTestSuite.java
@@ -25,14 +25,16 @@ import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Suite.class)
 @SuiteClasses({ DefaultLoggingFailoverFaultHandlerTest.class, HeaderReplyHandlerTest.class,PreferredRouteReplyHandlerTest.class,
 	PreferredRouteRequestHandlerTest.class,SimpleExamplePublisherTest.class })
 
 public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
 
 	public static void main(String[] args) {
 		LOGGER.info("Running the test suite");
diff --git a/src/test/java/org/onap/dmaap/mr/dme/client/TestRunner.java b/src/test/java/org/onap/dmaap/mr/dme/client/TestRunner.java
index 74928c9..59fc7f0 100644
--- a/src/test/java/org/onap/dmaap/mr/dme/client/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/mr/dme/client/TestRunner.java
@@ -23,10 +23,11 @@ package org.onap.dmaap.mr.dme.client;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
@@ -35,7 +36,7 @@ public class TestRunner {
 			LOGGER.info(failure.toString());
 			
 		}
-		LOGGER.info(result.wasSuccessful());
+		LOGGER.info(String.valueOf(result.wasSuccessful()));
 	}
 
 }
diff --git a/src/test/java/org/onap/dmaap/mr/logging/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/logging/JUnitTestSuite.java
deleted file mode 100644
index 8828d1c..0000000
--- a/src/test/java/org/onap/dmaap/mr/logging/JUnitTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.mr.logging;
-
-import junit.framework.TestSuite;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
-
-@RunWith(Suite.class)
-@SuiteClasses({ MRAppenderTest.class, })
-
-public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
-
-	public static void main(String[] args) {
-		LOGGER.info("Running the test suite");
-		
-		TestSuite tstSuite = new TestSuite();
-		LOGGER.info("Total Test Counts " + tstSuite.countTestCases());
-	}
-
-}
diff --git a/src/test/java/org/onap/dmaap/mr/logging/MRAppenderTest.java b/src/test/java/org/onap/dmaap/mr/logging/MRAppenderTest.java
deleted file mode 100644
index 66121eb..0000000
--- a/src/test/java/org/onap/dmaap/mr/logging/MRAppenderTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.mr.logging;
-
-import static org.junit.Assert.assertTrue;
-
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class MRAppenderTest {
-	private MRAppender appender = null;
-
-	@Before
-	public void setUp() throws Exception {
-		appender = new MRAppender();
-
-	}
-
-	@After
-	public void tearDown() throws Exception {
-
-	}
-
-	@Test
-	public void testClose() {
-		try {
-			appender.close();
-		} catch (NullPointerException e) {
-			assertTrue(true);
-		}
-
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testRequiresLayout() {
-
-		appender.requiresLayout();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testAppend() {
-
-		try {
-			appender.append(null);
-		} catch (NullPointerException e) {
-			assertTrue(true);
-		}
-
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testActivateOptions() {
-
-		appender.activateOptions();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testGetTopic() {
-
-		appender.getTopic();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testSetTopic() {
-
-		appender.setTopic("testTopic");
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testGetPartition() {
-
-		appender.getPartition();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testSetPartition() {
-
-		appender.setPartition("partition");
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testGetHosts() {
-
-		appender.getHosts();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testSetHosts() {
-
-		appender.setHosts("hosts");
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testGetMaxBatchSize() {
-
-		appender.getMaxBatchSize();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testSetMaxBatchSize() {
-
-		appender.setMaxBatchSize(20);
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testGetMaxAgeMs() {
-
-		appender.getMaxAgeMs();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testSetMaxAgeMs() {
-
-		appender.setMaxAgeMs(15);
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testIsCompress() {
-
-		appender.isCompress();
-		assertTrue(true);
-
-	}
-
-	@Test
-	public void testSetCompress() {
-
-		appender.setCompress(true);
-		assertTrue(true);
-
-	}
-
-}
diff --git a/src/test/java/org/onap/dmaap/mr/logging/TestRunner.java b/src/test/java/org/onap/dmaap/mr/logging/TestRunner.java
deleted file mode 100644
index 8e77136..0000000
--- a/src/test/java/org/onap/dmaap/mr/logging/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dmaap.mr.logging;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
-
-public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		Result result = JUnitCore.runClasses(JUnitTestSuite.class);
-		for (Failure failure : result.getFailures()) {
-			LOGGER.info(failure.toString());
-			
-		}
-		LOGGER.info(result.wasSuccessful());
-	}
-
-}
diff --git a/src/test/java/org/onap/dmaap/mr/test/clients/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/test/clients/JUnitTestSuite.java
index eb0ca3d..a0c81a8 100644
--- a/src/test/java/org/onap/dmaap/mr/test/clients/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/mr/test/clients/JUnitTestSuite.java
@@ -25,7 +25,8 @@ import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Suite.class)
 @SuiteClasses({ SimpleExamplePublisherTest.class, ProtocolTypeConstantsTest.class,
@@ -33,7 +34,8 @@ import org.apache.log4j.Logger;
 	SimpleExamplePublisherWithResponseTest.class, SimpleExampleConsumerWithReturnResponseTest.class,})
 
 public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
 
 	public static void main(String[] args) {
 		LOGGER.info("Running the test suite");
diff --git a/src/test/java/org/onap/dmaap/mr/test/clients/TestRunner.java b/src/test/java/org/onap/dmaap/mr/test/clients/TestRunner.java
index 7e3d724..6db09f8 100644
--- a/src/test/java/org/onap/dmaap/mr/test/clients/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/mr/test/clients/TestRunner.java
@@ -23,10 +23,11 @@ package org.onap.dmaap.mr.test.clients;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
@@ -35,7 +36,7 @@ public class TestRunner {
 			LOGGER.info(failure.toString());
 			
 		}
-		LOGGER.info(result.wasSuccessful());
+		LOGGER.info(String.valueOf(result.wasSuccessful()));
 	}
 
 }
diff --git a/src/test/java/org/onap/dmaap/mr/test/support/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/test/support/JUnitTestSuite.java
index 6c2e0fc..3c3b4c8 100644
--- a/src/test/java/org/onap/dmaap/mr/test/support/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/mr/test/support/JUnitTestSuite.java
@@ -25,13 +25,15 @@ import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Suite.class)
 @SuiteClasses({ MRBatchingPublisherMockTest.class, MRConsumerMockTest.class,})
 
 public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
 
 	public static void main(String[] args) {
 		LOGGER.info("Running the test suite");
diff --git a/src/test/java/org/onap/dmaap/mr/test/support/TestRunner.java b/src/test/java/org/onap/dmaap/mr/test/support/TestRunner.java
index 0a09a14..69f499f 100644
--- a/src/test/java/org/onap/dmaap/mr/test/support/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/mr/test/support/TestRunner.java
@@ -23,10 +23,11 @@ package org.onap.dmaap.mr.test.support;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
@@ -35,7 +36,7 @@ public class TestRunner {
 			LOGGER.info(failure.toString());
 			
 		}
-		LOGGER.info(result.wasSuccessful());
+		LOGGER.info(String.valueOf(result.wasSuccessful()));
 	}
 
 }
diff --git a/src/test/java/org/onap/dmaap/mr/tools/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/tools/JUnitTestSuite.java
index ca79f9b..782dbb0 100644
--- a/src/test/java/org/onap/dmaap/mr/tools/JUnitTestSuite.java
+++ b/src/test/java/org/onap/dmaap/mr/tools/JUnitTestSuite.java
@@ -25,14 +25,16 @@ import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Suite.class)
 @SuiteClasses({ ApiKeyCommandTest.class, AuthCommandTest.class, ClusterCommandTest.class,
 	MessageCommandTest.class, MRCommandContextTest.class, TopicCommandTest.class, TraceCommandTest.class,})
 
 public class JUnitTestSuite {
-	private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JUnitTestSuite.class);
+
 
 	public static void main(String[] args) {
 		LOGGER.info("Running the test suite");
diff --git a/src/test/java/org/onap/dmaap/mr/tools/TestRunner.java b/src/test/java/org/onap/dmaap/mr/tools/TestRunner.java
index fff3bd7..2fd831b 100644
--- a/src/test/java/org/onap/dmaap/mr/tools/TestRunner.java
+++ b/src/test/java/org/onap/dmaap/mr/tools/TestRunner.java
@@ -23,10 +23,13 @@ package org.onap.dmaap.mr.tools;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
-import org.apache.log4j.Logger;
+import org.onap.dmaap.mr.client.JUnitTestSuite;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRunner {
-	private static final Logger LOGGER = Logger.getLogger(TestRunner.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestRunner.class);
+
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub
@@ -35,7 +38,7 @@ public class TestRunner {
 			LOGGER.info(failure.toString());
 			
 		}
-		LOGGER.info(result.wasSuccessful());
+		LOGGER.info(String.valueOf(result.wasSuccessful()));
 	}
 
 }