From 19f3f4a23a4b015b2a4091b42daa632bfa078d6b Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Sat, 26 Aug 2017 06:45:20 -0400
Subject: [PATCH] Skip deployment of widget-ms jar

Add plugin to skip deployment of ecomp-portal-widget-ms onejar.
Fix problem of manage widget pop up calendar moved off event date input field.

Issue: PORTAL-80
Change-Id: Id783989fed6a248ceb1a12bfce8403f6219e2e61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../views/dashboard/dashboard-widget.controller.less    |  6 +++---
 ecomp-portal-widget-ms/widget-ms/pom.xml                | 17 +++++------------
 .../widget-ms/src/main/docker/Dockerfile                |  6 ------
 3 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 ecomp-portal-widget-ms/widget-ms/src/main/docker/Dockerfile

diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less
index a9c3d800..b4cb0100 100644
--- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less
+++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less
@@ -119,8 +119,8 @@ padding-bottom: 20px;
  .add-widget-field .btn-calendar-icon {
    position: relative;
    width: 20px;
-   right:-225px;
-   top:-27px;
+   right: 25px;
+   top: 0px;
 }
 .dialog-control{
 bottom:30px;
@@ -134,4 +134,4 @@ input[type="text"]:focus {
   overflow:auto;
   }
   
-  
\ No newline at end of file
+  
diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index 14820b65..dcab5721 100644
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -146,20 +146,13 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 
+			<!-- No deployment step for this project -->
 			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.11</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8</version>
 				<configuration>
-					<imageName>${project.artifactId}</imageName>
-					<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-					</resources>
+					<skip>true</skip>
 				</configuration>
 			</plugin>
 
diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/docker/Dockerfile b/ecomp-portal-widget-ms/widget-ms/src/main/docker/Dockerfile
deleted file mode 100644
index 7e25c222..00000000
--- a/ecomp-portal-widget-ms/widget-ms/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM frolvlad/alpine-oraclejdk8:slim
-VOLUME /tmp
-ADD widget-ms.jar app.jar
-RUN sh -c 'touch /app.jar'
-ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
-- 
2.16.6