From 284b23a6d3d5c318ba9ae1c447e0b3a503bbbd10 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 18 Sep 2018 10:21:49 -0700
Subject: Upgrade oparent to 1.2.1

Change-Id: Idd9e0d0ebd681c0a9676181e37616158ce571f96
Issue-ID: INT-656
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 test/mocks/pnfsimulator/pom.xml                       | 4 ++--
 test/mocks/sniroemulator/pom.xml                      | 8 +-------
 version-manifest/pom.xml                              | 4 ++--
 version-manifest/src/main/resources/java-manifest.csv | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index cddbbbafa..b4adcd806 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>org.onap.pnfsimulator</groupId>
@@ -321,4 +321,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/test/mocks/sniroemulator/pom.xml b/test/mocks/sniroemulator/pom.xml
index 11b556d34..288ecb63b 100644
--- a/test/mocks/sniroemulator/pom.xml
+++ b/test/mocks/sniroemulator/pom.xml
@@ -12,15 +12,9 @@
 <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.2.1</version>
 </parent>
 
-<!-- <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.7.RELEASE</version>
-</parent>
--->
 <properties>
     <dockerLocation>${basedir}/target</dockerLocation>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml
index bde19331f..3c6dea7f8 100644
--- a/version-manifest/pom.xml
+++ b/version-manifest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.1</version>
   </parent>
   <groupId>org.onap.integration</groupId>
   <artifactId>version-manifest</artifactId>
@@ -50,7 +50,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.5.2</version>
         <configuration>
           <goalPrefix>version-manifest</goalPrefix>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 64d78a667..61b183709 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -201,7 +201,7 @@ org.onap.multicloud.openstack,ocata,1.1.2
 org.onap.multicloud.openstack,windriver,1.1.2
 org.onap.multicloud.openstack.vmware,vesagent,1.0.0
 org.onap.multicloud.openstack.vmware,vio,1.1.2
-org.onap.oparent,oparent,1.1.1
+org.onap.oparent,oparent,1.2.1
 org.onap.policy.common,common-modules,1.2.3
 org.onap.policy.drools-applications,drools-pdp-apps,1.2.3
 org.onap.policy.drools-pdp,drools-pdp,1.2.3
-- 
cgit 1.2.3-korg