From db14c699054e4f03d0a141c30809556403013ae0 Mon Sep 17 00:00:00 2001
From: Jimmy Forsyth <jf2512@att.com>
Date: Tue, 9 Jul 2019 10:43:45 -0400
Subject: [PATCH 1/1] Upversion to oparent 2 and remove staging plugin

Issue-ID: AAI-2497
Change-Id: I97de01a7789a06de9685c2b38f49cba84e84f605
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
---
 pom.xml            | 18 ++++++++----------
 version.properties |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 720f428..c86ce5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,10 +23,15 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>2.0.0</version>
+    </parent>
     <groupId>org.onap.aai</groupId>
     <artifactId>sparky-fe</artifactId>
     <packaging>war</packaging>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <name>aai-sparky-fe</name>
     <url>http://maven.apache.org</url>
 
@@ -104,15 +109,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/version.properties b/version.properties
index b11eaff..4814eb2 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=5
-patch_version=0
+patch_version=1
 
 base_version=${major_version}.${minor_version}.${patch_version}
 
-- 
2.16.6