From cdbd9246dbbce2165e368dc48b3d1db3dceac621 Mon Sep 17 00:00:00 2001
From: "Stone, Avi (as206k)" <as206k@att.com>
Date: Mon, 21 May 2018 14:21:54 +0300
Subject: Fix pom for docker files

Fix poms for docker files so the docker job would run

Change-Id: I6cc2e9fc49ceed56657090c1721c65579b0c27c3
Issue-ID: SDC-1339
Signed-off-by: Stone, Avi (as206k) <as206k@att.com>
---
 pom.xml | 105 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 48 insertions(+), 57 deletions(-)

diff --git a/pom.xml b/pom.xml
index b607299..6add9b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,54 @@
       <artifactId>jetty-proxy</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.5</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch</artifactId>
+      <version>0.1.54</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId>
+      <artifactId>DCAE-DT-PROPERTY</artifactId>
+      <version>1.2.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -97,63 +145,6 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-      <id>server</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-web</artifactId>
-          <exclusions>
-            <exclusion>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-test</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-lang3</artifactId>
-          <version>3.5</version>
-        </dependency>
-        <dependency>
-          <groupId>commons-net</groupId>
-          <artifactId>commons-net</artifactId>
-          <version>3.3</version>
-        </dependency>
-        <dependency>
-          <groupId>com.jcraft</groupId>
-          <artifactId>jsch</artifactId>
-          <version>0.1.54</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.code.gson</groupId>
-          <artifactId>gson</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.json</groupId>
-          <artifactId>json</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-          <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId>
-          <artifactId>DCAE-DT-PROPERTY</artifactId>
-          <version>1.2.0-SNAPSHOT</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
 
     <profile>
         <id>docker</id>
-- 
cgit 1.2.3-korg