From cf8f39f36b08ee1242c6f1ea472830a9e4be49f9 Mon Sep 17 00:00:00 2001
From: "Manor, Yanir (ym903w)" <ym903w@intl.att.com>
Date: Wed, 26 Sep 2018 07:48:34 +0300
Subject: upgrade dace-d fe pom version

upgrade dace-d fe pom version

Change-Id: I6d1ce9ae2d841ef70d1a1354e44eb837849dd2a3
Issue-ID: DCAEGEN2-836
Signed-off-by: Manor, Yanir (ym903w) <ym903w@intl.att.com>
---
 pom.xml | 277 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 138 insertions(+), 139 deletions(-)

diff --git a/pom.xml b/pom.xml
index edfb4f0..117f693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,19 @@
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.sdc.dcae-d.fe</groupId>
     <artifactId>dcae_fe</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>dcae-d fe application</name>
     <description>DCAE FE</description>
 
     <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.13.RELEASE</version>
-    <relativePath />
-    <!-- lookup parent from repository   -->
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.13.RELEASE</version>
+        <relativePath />
+        <!-- lookup parent from repository   -->
     </parent>
 
     <properties>
@@ -24,62 +23,62 @@
         <staging.profile.id>176c31dfe190a</staging.profile.id>
         <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
         <sonar.branch>${project.version}</sonar.branch>
-    		<sonar.coverage.exclusions>**</sonar.coverage.exclusions>
+        <sonar.coverage.exclusions>**</sonar.coverage.exclusions>
     </properties>
     <dependencies>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <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>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <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.3.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -217,37 +216,37 @@
 
     <profiles>
         <profile>
-          <id>local</id>
-          <activation>
-            <activeByDefault>false</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-jetty</artifactId>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.eclipse.jetty.websocket</groupId>
-                  <artifactId>*</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-            <dependency>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-starter-test</artifactId>
-              <scope>test</scope>
-            </dependency>
-          </dependencies>
+            <id>local</id>
+            <activation>
+                <activeByDefault>false</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-jetty</artifactId>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.eclipse.jetty.websocket</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-test</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
         </profile>
 
         <profile>
@@ -307,52 +306,52 @@
                                             <includes>
                                                 <include>dcae_fe.war</include>
                                             </includes>
-                                       </resource>
-                                   </resources>
-                               </configuration>
-                           </execution>
-                       </executions>
-                   </plugin>
-                   <plugin>
-                       <groupId>io.fabric8</groupId>
-                       <artifactId>docker-maven-plugin</artifactId>
-                       <version>0.23.0</version>
-                       <configuration>
-                           <verbose>true</verbose>
-                           <apiVersion>1.23</apiVersion>
-                           <images>
-                               <!-- Build front image -->
-                               <image>
-                                   <name>onap/dcae-fe</name>
-                                   <alias>dcae-fe</alias>
-                                   <build>
-                                       <cleanup>try</cleanup>
-                                       <dockerFileDir>${project.basedir}/docker</dockerFileDir>
-                                       <tags>
-                                           <tag>${docker.tag}</tag>
-                                           <tag>${docker.latest.tag}</tag>
-                                           <tag>${docker.staging.tag}</tag>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.23.0</version>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <apiVersion>1.23</apiVersion>
+                            <images>
+                                <!-- Build front image -->
+                                <image>
+                                    <name>onap/dcae-fe</name>
+                                    <alias>dcae-fe</alias>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${project.basedir}/docker</dockerFileDir>
+                                        <tags>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</tag>
+                                            <tag>${docker.staging.tag}</tag>
                                         </tags>
-                                   </build>
-                               </image>
-                           </images>
-                       </configuration>
-                       <executions>
-                           <execution>
-                               <id>clean-images</id>
-                               <phase>pre-clean</phase>
-                               <goals>
-                                   <goal>remove</goal>
-                               </goals>
-                               <configuration>
-                                   <removeAll>true</removeAll>
-                                   <image>onap/dcae-fe</image>
-                               </configuration>
-                           </execution>
-                           <execution>
-                               <id>generate-images</id>
-                               <phase>install</phase>
-                               <goals>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>clean-images</id>
+                                <phase>pre-clean</phase>
+                                <goals>
+                                    <goal>remove</goal>
+                                </goals>
+                                <configuration>
+                                    <removeAll>true</removeAll>
+                                    <image>onap/dcae-fe</image>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>install</phase>
+                                <goals>
                                     <goal>build</goal>
                                 </goals>
                             </execution>
@@ -370,7 +369,7 @@
                     </plugin>
                 </plugins>
             </build>
-           </profile>
+        </profile>
     </profiles>
     <repositories>
         <!-- LF repositories -->
-- 
cgit 1.2.3-korg