Fix mvn script, move pom plugin conf

Issue-Id: DCAEGEN2-60
Change-Id: I83f2e43a09c6a4a0c1ab046022ff6d6d4ec66de4
Signed-off-by: Lusheng Ji <lji@research.att.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 309c53d..3e5d35d 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -209,25 +209,24 @@ upload_raw_file()
 }
 
 
-
 upload_wagons_and_type_yamls()
 {
   WAGONS=$(ls -1 ./*.wgn)
-  for WAGON in "${WAGONS[@]}" ; do
+  for WAGON in $WAGONS ; do
     WAGON_NAME=$(echo "$WAGON" | cut -f1 -d '-')
     WAGON_VERSION=$(echo "$WAGON" | cut -f2 -d '-')
     WAGON_TYPEFILE=$(grep -rl "$WAGON_NAME" | grep yaml | head -1)
-   
+
     upload_raw_file "$WAGON"
     upload_raw_file "$WAGON_TYPEFILE"
   done
 }
 
-upload_yamls()
+upload_files_of_extension()
 {
-  YAMLS=$(ls -1 ./*.yaml)
-  for YAML in "${YAMLS[@]}" ; do
-    upload_raw_file "$YAML"
+  FILES=$(ls -1 ./*."$1")
+  for F in $FILES ; do
+    upload_raw_file "$F"
   done
 }
 
@@ -325,7 +324,7 @@ install)
   ;;
 deploy)
   echo "==> deploy phase script"
-  upload_yamls
+  upload_files_of_extension yaml
   ;;
 *)
   echo "==> unprocessed phase"