From 3d2351b25d8f17010f5850c8f91b135fec057f70 Mon Sep 17 00:00:00 2001
From: dglFromAtt <dgl@research.att.com>
Date: Fri, 2 Mar 2018 21:37:57 -0500
Subject: [PATCH] corrections for packaging and CSIT

Change-Id: I66f981b92988f820469c272063e7b22661900e8d
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-318
---
 misc/dmaapbc |  8 +++++++-
 pom.xml      | 23 ++++++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 7ee0e68..3d19f88 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -86,7 +86,13 @@ start() {
 	if [ "$PIDS" = "" ]
 	then
 		echo $COMPONENT startup failed
-		tail -100 $APP_ROOT/logs/dmaap*.log
+		ls -l $APP_ROOT/logs/EELF
+		echo "------------ error.log ---------------"
+		cat $APP_ROOT/logs/EELF/error.log
+		echo "------------ server.log ---------------"
+		cat $APP_ROOT/logs/EELF/server.log
+		echo "------------ tail -100 application.log ---------------"
+		tail -100 $APP_ROOT/logs/EELF/application.log
 	else
 		echo $COMPONENT started
 	fi
diff --git a/pom.xml b/pom.xml
index 53cbb70..ab6347d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,22 @@
             </configuration>
           </execution>
         </executions>
+      </plugin>
+	  <plugin>
+        <!--Special goal to populate target/libs with dependencies to place in docker image -->
+	    <groupId>org.apache.maven.plugins</groupId>
+	    <artifactId>maven-dependency-plugin</artifactId>
+	    <executions>
+	      <execution>
+		    <phase>install</phase>
+		    <goals>
+		      <goal>copy-dependencies</goal>
+		    </goals>
+		    <configuration>
+		      <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+		    </configuration>
+	      </execution>
+       </executions>
       </plugin>
 
     </plugins>
@@ -56,9 +72,10 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <versionRange>[2.10,)</versionRange>
-                    <goals>
-                      <goal>copy-dependencies</goal>
-                    </goals>
+					    <phase>install</phase>
+                        <goals>
+                          <goal>copy-dependencies</goal>
+                        </goals>
                   </pluginExecutionFilter>
                   <action>
                     <ignore/>
-- 
2.16.6