From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Sun, 10 Dec 2017 18:55:03 +0200
Subject: Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 utils/webseal-simulator/pom.xml                                      | 5 +++--
 .../src/main/java/org/openecomp/sdc/webseal/simulator/Login.java     | 1 -
 .../src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'utils')

diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index e240da6d01..fa9d3529b3 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -14,6 +14,7 @@
 		<!--maven-->
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
 		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<dependencies>
@@ -161,7 +162,7 @@
 						<executions>
 							<execution>
 								<id>copy-resources-simulator</id>
-								<phase>validate</phase>
+								<phase>package</phase>
 								<goals>
 									<goal>copy-resources</goal>
 								</goals>
@@ -223,7 +224,7 @@
 									<alias>sdc-simulator</alias>
 									<build>
 										<cleanup>try</cleanup>
-										<dockerFileDir>${basedir}\sdc-simulator</dockerFileDir>
+										<dockerFileDir>${basedir}/sdc-simulator</dockerFileDir>
 										<tags>
 											<tag>${docker.tag}</tag>
 											<tag>${docker.latest.tag}</tag>
diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java
index 2798f68563..78aca50e95 100644
--- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java
+++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/Login.java
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.sdc.webseal.simulator.User;
 import org.openecomp.sdc.webseal.simulator.conf.Conf;
 
 public class Login extends HttpServlet {
diff --git a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java
index c00af32734..ae2fa036ea 100644
--- a/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java
+++ b/utils/webseal-simulator/src/main/java/org/openecomp/sdc/webseal/simulator/conf/Conf.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.openecomp.sdc.webseal.simulator.User;
+
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-- 
cgit