inherit from oparent

Change-Id: I65ec3504fcf1399d12d40cf646b21030dfaa9265
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

diff --git a/discovery-ui/pom.xml b/discovery-ui/pom.xml
index 14d7316..2343242 100644 (file)
--- a/discovery-ui/pom.xml
+++ b/discovery-ui/pom.xml
@@ -21,14 +21,14 @@
   <parent>
   <groupId>org.onap.msb.discovery</groupId>
   <artifactId>msb-discovery-parent</artifactId>
-  <version>0.0.1-SNAPSHOT</version>    
+  <version>1.0.0-SNAPSHOT</version>    
   </parent>
 
   <groupId>org.onap.msb.discovery</groupId>
   <artifactId>discovery-ui</artifactId>
   <name>onap/msb/discovery/discovery-ui</name>
   <packaging>jar</packaging>
-  <version>0.0.1-SNAPSHOT</version> 
+  <version>1.0.0-SNAPSHOT</version> 
 
   
 </project>

diff --git a/distributions/msb-discovery/pom.xml b/distributions/msb-discovery/pom.xml
index 009e8ec..3727120 100644 (file)
--- a/distributions/msb-discovery/pom.xml
+++ b/distributions/msb-discovery/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.onap.msb.discovery.distributions</groupId>
     <artifactId>distributions-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.msb.discovery.distributions</groupId>
   <artifactId>msb-discovery</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <name>onap/msb/discovery/distributions/msb-discovery</name>
   <packaging>pom</packaging>
 

diff --git a/distributions/pom.xml b/distributions/pom.xml
index 423903d..2a48aaf 100644 (file)
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -21,12 +21,12 @@
     <parent>
       <groupId>org.onap.msb.discovery</groupId>
       <artifactId>msb-discovery-parent</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.msb.discovery.distributions</groupId>
     <artifactId>distributions-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>onap/msb/discovery/distributions</name>
     <packaging>pom</packaging>
     <modules>

diff --git a/nginx-ext-consul/pom.xml b/nginx-ext-consul/pom.xml
index 02335b3..7a61a84 100644 (file)
--- a/nginx-ext-consul/pom.xml
+++ b/nginx-ext-consul/pom.xml
@@ -20,14 +20,14 @@
   <parent>
   <groupId>org.onap.msb.discovery</groupId>
   <artifactId>msb-discovery-parent</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.msb.discovery</groupId>
   <artifactId>nginx-ext-consul</artifactId>
   <name>onap/msb/discovery/nginx-ext-consul</name>
   <packaging>pom</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
   <properties>
     <outputdir>target/assembly/openresty</outputdir>

diff --git a/pom.xml b/pom.xml
index a6403a4..fccbc01 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,18 +18,19 @@
 -->
 <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>
-
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  
   <groupId>org.onap.msb.discovery</groupId>
   <artifactId>msb-discovery-parent</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>onap/msb/msb-discovery-parent</name> 
 
   <properties>
-<!--     <nexusproxy>http://proxynj.zte.com.cn</nexusproxy>
-    <nexus.repository.release>dav:http://10.74.156.77/repos/content/repositories/releases</nexus.repository.release>
-    <nexus.repository.snapshot>dav:http://10.74.156.77/repos/content/repositories/snapshots</nexus.repository.snapshot> -->
-
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/sdclient/discovery-service/dependency-reduced-pom.xml b/sdclient/discovery-service/dependency-reduced-pom.xml
index 2efbf10..cb2292a 100644 (file)
--- a/sdclient/discovery-service/dependency-reduced-pom.xml
+++ b/sdclient/discovery-service/dependency-reduced-pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <artifactId>sdclient</artifactId>
     <groupId>org.onap.msb.discovery</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.msb.discovery.sdclient</groupId>
   <artifactId>discovery-service</artifactId>
   <name>onap/msb/discovery/sdclient/discovery-service</name>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <build>
     <resources>
       <resource>

diff --git a/sdclient/discovery-service/pom.xml b/sdclient/discovery-service/pom.xml
index 22ec3e6..c17fd94 100644 (file)
--- a/sdclient/discovery-service/pom.xml
+++ b/sdclient/discovery-service/pom.xml
@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.onap.msb.discovery</groupId>
     <artifactId>sdclient</artifactId>
-    <version>0.0.1-SNAPSHOT</version>        
+    <version>1.0.0-SNAPSHOT</version>        
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.msb.discovery.sdclient</groupId>
   <artifactId>discovery-service</artifactId>
   <name>onap/msb/discovery/sdclient/discovery-service</name>
   <packaging>jar</packaging>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   
 
   <dependencies>

diff --git a/sdclient/discovery-standalone/pom.xml b/sdclient/discovery-standalone/pom.xml
index 431d480..96fa2b8 100644 (file)
--- a/sdclient/discovery-standalone/pom.xml
+++ b/sdclient/discovery-standalone/pom.xml
@@ -20,14 +20,14 @@
     <parent>
       <groupId>org.onap.msb.discovery</groupId>
       <artifactId>sdclient</artifactId>
-      <version>0.0.1-SNAPSHOT</version>        
+      <version>1.0.0-SNAPSHOT</version>        
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.msb.discovery.sdclient</groupId>
     <artifactId>discovery-standalone</artifactId>
     <name>onap/msb/discovery/sdclient/discovery-standalone</name>
     <packaging>pom</packaging>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <properties>
       <packageid>discovery-standalone</packageid>

diff --git a/sdclient/pom.xml b/sdclient/pom.xml
index 6b92ecd..fb46faf 100644 (file)
--- a/sdclient/pom.xml
+++ b/sdclient/pom.xml
@@ -23,12 +23,12 @@
        <parent>
          <groupId>org.onap.msb.discovery</groupId>
          <artifactId>msb-discovery-parent</artifactId>
-         <version>0.0.1-SNAPSHOT</version>
+         <version>1.0.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.msb.discovery</groupId>
        <artifactId>sdclient</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <name>onap/msb/discovery/sdclient</name>
        <packaging>pom</packaging>