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>

diff --git a/client/pom.xml b/client/pom.xml
index 37c899c..8a1afe1 100644 (file)
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>client-parent</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
 
     <properties>

diff --git a/pom.xml b/pom.xml
index 6ddbb3c..f7a9e28 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-
-
+<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>
-    <packaging>pom</packaging>
-    <groupId>org.onap.sdnc</groupId>
-    <artifactId>apps</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
 
+    <groupId>org.onap.sdnc</groupId>
+    <artifactId>apps</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
     <name>sdnc-apps</name>
-    <url>http://wiki.onap.org</url>
     <description>POM to be used for apps in SDNC project</description>
-    
+    <url>http://wiki.onap.org</url>
+
     <modules>
         <module>pomba</module>
     </modules>

diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml
index bdbbb26..a60a51d 100644 (file)
--- a/pomba/network-discovery-api/pom.xml
+++ b/pomba/network-discovery-api/pom.xml
@@ -29,6 +29,7 @@ limitations under the License.
     <groupId>org.onap.sdnc.apps.pomba</groupId>
     <artifactId>network-discovery-api</artifactId>
     <version>1.8.0-SNAPSHOT</version>
+
     <name>Network Discovery API</name>
 
     <dependencies>
@@ -50,7 +51,8 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
            </dependencies>
-           <profiles>
+
+    <profiles>
                <profile>
                    <id>nexus-staging</id>
                    <activation>
@@ -75,5 +77,4 @@ limitations under the License.
                    </build>
                </profile>
            </profiles>
-
 </project>

diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index f49e7ce..616efae 100644 (file)
--- 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>

diff --git a/pomba/pom.xml b/pomba/pom.xml
index 0cfde48..06e6103 100644 (file)
--- a/pomba/pom.xml
+++ b/pomba/pom.xml
@@ -31,6 +31,12 @@ limitations under the License.
     <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <modules>
+        <module>network-discovery</module>
+        <module>network-discovery-api</module>
+        <module>service-decomposition</module>
+    </modules>
+
     <properties>
         <!-- Sonar properties -->
         <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
@@ -45,12 +51,6 @@ limitations under the License.
         <jacoco.version>0.8.5</jacoco.version>
     </properties>
 
-    <modules>
-        <module>network-discovery</module>
-        <module>network-discovery-api</module>
-        <module>service-decomposition</module>
-    </modules>
-
     <build>
         <plugins>
             <plugin>
@@ -165,6 +165,7 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <profile>
             <id>nexus-staging</id>

diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml
index 280e504..24a9434 100644 (file)
--- a/pomba/service-decomposition/pom.xml
+++ b/pomba/service-decomposition/pom.xml
@@ -39,8 +39,7 @@ limitations under the License.
 
     <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>
@@ -49,7 +48,6 @@ limitations under the License.
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <!-- Springframework dependencies -->
         <dependency>
@@ -140,6 +138,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>
@@ -153,15 +160,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>
@@ -329,5 +327,4 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
 </project>