From f8c8cebc21ea8afce63472d66b57a2c83f21d9f7 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 1 Sep 2016 16:33:32 -0700
Subject: Change artifact groupId to allow Nexus deployment

Change-Id: I78af2ba519302a02057fa2ad34cdbd76e7ea0f77
Issue-id: INT-40
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 msb-parent/msbparent-lite/pom.xml | 45 +++++++++++----------------------------
 msb-parent/msbparent/pom.xml      | 33 ++++++++++++++--------------
 msb-parent/pom.xml                | 15 ++++++-------
 3 files changed, 36 insertions(+), 57 deletions(-)

(limited to 'msb-parent')

diff --git a/msb-parent/msbparent-lite/pom.xml b/msb-parent/msbparent-lite/pom.xml
index 341de3d..7d16422 100644
--- a/msb-parent/msbparent-lite/pom.xml
+++ b/msb-parent/msbparent-lite/pom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
             http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
- 
+
 -->
 <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>
@@ -26,17 +26,13 @@
   </parent>
 
 
-  <groupId>org.openo.msb</groupId>
+  <groupId>org.openo.common-services.microservice-bus</groupId>
   <artifactId>msbparent-lite</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>msbparent-lite</name> 
+  <name>msbparent-lite</name>
 
   <properties>
-    
-    <nexus.repository.release>dav:http://nexus.open-o.com/repos/content/repositories/releases</nexus.repository.release>
-    <nexus.repository.snapshot>dav:http://nexus.open-o.com/repos/content/repositories/snapshots</nexus.repository.snapshot>
-
     <stream>latest</stream><!-- CI should pass in -Dstream={stream} -->
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,7 +43,7 @@
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
     <java.version.source>${maven.compiler.source}</java.version.source>
-    <java.version.target>${maven.compiler.target}</java.version.target>  
+    <java.version.target>${maven.compiler.target}</java.version.target>
 
 
     <!-- Maven plugin versions, in the 'canonical' format -->
@@ -65,23 +61,8 @@
     <checkstyle.version>2.16</checkstyle.version>
     <compiler.version>${maven.compile.plugin.version}</compiler.version>
     <enforcer.version>1.4</enforcer.version>
-
-
-
   </properties>
 
-  <distributionManagement>
-    <repository>
-      <id>releases</id>
-      <url>${nexus.repository.release}</url>
-    </repository>
-    <snapshotRepository>
-      <id>snapshots</id>
-      <url>${nexus.repository.snapshot}</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-
   <build>
     <extensions>
         <extension>
@@ -152,7 +133,7 @@
           <artifactId>maven-antrun-plugin</artifactId>
           <version>${maven.antrun.plugin.version}</version>
         </plugin>
-        
+
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
           <version>${maven.clean.plugin.version}</version>
@@ -209,7 +190,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>          
+          <version>2.10</version>
         </plugin>
 
         <plugin>
@@ -245,11 +226,11 @@
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
           </configuration>
         </plugin>
-       
+
       </plugins>
     </pluginManagement>
-  </build> 
- 
+  </build>
+
 
 
 </project>
diff --git a/msb-parent/msbparent/pom.xml b/msb-parent/msbparent/pom.xml
index 4f03c5e..61e0079 100644
--- a/msb-parent/msbparent/pom.xml
+++ b/msb-parent/msbparent/pom.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
             http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
- 
+
 -->
 <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.openo.msb</groupId>
+    <groupId>org.openo.common-services.microservice-bus</groupId>
     <artifactId>msbparent-lite</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../msbparent-lite</relativePath>
   </parent>
 
-  <groupId>org.openo.msb</groupId>
   <artifactId>msbparent</artifactId>
   <packaging>pom</packaging>
-  <name>msbparent</name> 
+  <name>msbparent</name>
 
 
   <scm>
@@ -42,7 +41,7 @@
   <properties>
     <!-- Supporting Libraries -->
     <dropwizard.version>0.8.0</dropwizard.version>
-    <swagger.version>1.5.3</swagger.version>  
+    <swagger.version>1.5.3</swagger.version>
     <jedis.version>2.7.3</jedis.version>
     <lombok.version>1.16.4</lombok.version>
     <json-lib.version>2.4</json-lib.version>
@@ -77,7 +76,7 @@
         <groupId>io.dropwizard</groupId>
         <artifactId>dropwizard-client</artifactId>
         <version>${dropwizard.version}</version>
-      </dependency>    
+      </dependency>
 
       <dependency>
         <groupId>io.swagger</groupId>
@@ -90,17 +89,17 @@
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
         <version>${jedis.version}</version>
-      </dependency>     
+      </dependency>
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
         <version>${lombok.version}</version>
       </dependency>
-      <dependency> 
-        <groupId>net.sf.json-lib</groupId> 
-        <artifactId>json-lib</artifactId> 
-        <version>${json-lib.version}</version> 
-      </dependency> 
+      <dependency>
+        <groupId>net.sf.json-lib</groupId>
+        <artifactId>json-lib</artifactId>
+        <version>${json-lib.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -172,5 +171,5 @@
       </plugin>
     </plugins>
   </build>
-  
+
 </project>
diff --git a/msb-parent/pom.xml b/msb-parent/pom.xml
index d4bedff..e07c915 100644
--- a/msb-parent/pom.xml
+++ b/msb-parent/pom.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- 
+
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
- 
+
             http://www.apache.org/licenses/LICENSE-2.0
- 
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
- 
+
 -->
 <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.openo.msb</groupId>
+    <groupId>org.openo.common-services.microservice-bus</groupId>
     <artifactId>msbparent-lite</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>msbparent-lite</relativePath>
 </parent>
 
-<groupId>org.openo.msb</groupId>
 <artifactId>msbparent-aggregator</artifactId>
 <version>1.0.0</version>
-<name>msbparent-aggregator</name> 
+<name>msbparent-aggregator</name>
 <packaging>pom</packaging>
 
 
-- 
cgit 1.2.3-korg