From f58ed99972fe216d039ec264c5c0f46138148a4e Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 6 Mar 2020 08:46:55 -0500
Subject: Use released Frankfurt M4 parent poms

Update to use released Frankfurt M4 version of parent poms.

Change-Id: Ie41a1cab0e3372a67a5a9a63f61994ded5bcee29
Issue-ID: SDNC-1110
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 pomba/network-discovery/pom.xml | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'pomba/network-discovery/pom.xml')

diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index f49e7ce..616efae 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -40,12 +40,9 @@ limitations under the License.
         
     </properties>
 
-
-
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <!-- Import dependency management from Spring Boot -->
+            <dependency><!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>1.5.17.RELEASE</version>
@@ -54,7 +51,6 @@ limitations under the License.
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <!-- Jolt transformation dependencies -->
         <dependency>
@@ -75,14 +71,14 @@ limitations under the License.
 
         <!-- Springboot dependencies -->
         <dependency>
-		    <groupId>org.eclipse.jetty</groupId>
-		    <artifactId>jetty-webapp</artifactId>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-webapp</artifactId>
         </dependency>
 
         <dependency>
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter-jersey</artifactId>
-		    <exclusions>
+  <groupId>org.springframework.boot</groupId>
+  <artifactId>spring-boot-starter-jersey</artifactId>
+  <exclusions>
 			<exclusion>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -148,6 +144,15 @@ limitations under the License.
 
     <build>
         <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -162,17 +167,6 @@ limitations under the License.
                 </executions>
             </plugin>
         </plugins>
-  
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-          
     </build>
 
     <profiles>
@@ -343,5 +337,4 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
 </project>
-- 
cgit 1.2.3-korg