From e040d41781962740921b4e93a4c455711753633f Mon Sep 17 00:00:00 2001
From: "tian.ming@huawei.com" <tian.ming@huawei.com>
Date: Sat, 27 Aug 2016 10:25:21 +0800
Subject: modify the group id

Change-Id: Iad752e28f5bc01b0ef0f2973a4a6254b956691a3
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>
---
 common-util/pom.xml |   2 +-
 pom.xml             | 574 ++++++++++++++++++++++++++--------------------------
 rest-client/pom.xml |   4 +-
 3 files changed, 295 insertions(+), 285 deletions(-)

diff --git a/common-util/pom.xml b/common-util/pom.xml
index 32ce4c3..581148a 100644
--- a/common-util/pom.xml
+++ b/common-util/pom.xml
@@ -18,7 +18,7 @@
     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.baseservice</groupId>
+       <groupId>org.openo.common-services.common-utilities</groupId>
 	   <artifactId>common-setting</artifactId>
 	   <version>1.0.1-SNAPSHOT</version>
     </parent>
diff --git a/pom.xml b/pom.xml
index 8704713..3c74627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2016, Huawei Technologies Co., Ltd. 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. -->
+<!--
+  Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ 
+  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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openo.baseservice</groupId>
-    <artifactId>common-setting</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>common-setting</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.test.skip>false</maven.test.skip>
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <release.dir>${basedir}/target</release.dir>
-        <slf4j.version>1.6.1</slf4j.version>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.openo.common-services.common-utilities</groupId>
+	<artifactId>common-setting</artifactId>
+	<version>1.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>common-setting</name>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.test.skip>false</maven.test.skip>
+		<maven.test.failure.ignore>false</maven.test.failure.ignore>
+		<finalName>${project.artifactId}-${project.version}</finalName>
+		<release.dir>${basedir}/target</release.dir>
+		<slf4j.version>1.6.1</slf4j.version>
 
-        <bundle.name>${project.artifactId}-${project.version}</bundle.name>
-        <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>
-        <excludesFile>**/*$*</excludesFile>
 
+		<bundle.name>${project.artifactId}-${project.version}</bundle.name>
+		<pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>
+		<excludesFile>**/*$*</excludesFile>
+    
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>https://nexus.open-o.org/content</nexusproxy>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,282 +52,282 @@
             <url>${nexusproxy}/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
-
-    <scm>
+    
+     <scm>
         <connection>scm:git:ssh://git.open-o.org:29418/common-services-common-utilities.git</connection>
         <developerConnection>scm:git:ssh://git.open-o.org:29418/common-services-common-utilities.git</developerConnection>
         <tag>HEAD</tag>
         <url>https://wiki.open-o.orgiew/Common_Services</url>
     </scm>
-
+    
     <modules>
         <module>common-util</module>
         <module>rest-client</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>org.apache.commons.lang</artifactId>
-                <version>2.6.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>org.apache.commons.logging</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>org.apache.commons.codec</artifactId>
-                <version>1.9.0</version>
-            </dependency>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>2.4</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>org.apache.commons.lang</artifactId>
+				<version>2.6.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>org.apache.commons.logging</artifactId>
+				<version>1.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>org.apache.commons.codec</artifactId>
+				<version>1.9.0</version>
+			</dependency>
 
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.16</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis</artifactId>
-                <version>3.2.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.9.2</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.json-lib</groupId>
-                <artifactId>json-lib</artifactId>
-                <version>2.4</version>
-                <classifier>jdk15</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.aggregate</groupId>
-                <artifactId>jetty-all</artifactId>
-                <version>8.1.16.v20140903</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.orbit</groupId>
-                <artifactId>javax.servlet</artifactId>
-                <version>3.0.0.v201112011016</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>redis.clients</groupId>
-                <artifactId>jedis</artifactId>
-                <version>2.8.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-dbcp2</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.9.2</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-log4j12</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.16</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mybatis</groupId>
+				<artifactId>mybatis-spring</artifactId>
+				<version>1.2.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mybatis</groupId>
+				<artifactId>mybatis</artifactId>
+				<version>3.2.7</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+				<version>3.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jackson</groupId>
+				<artifactId>jackson-mapper-asl</artifactId>
+				<version>1.9.2</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sf.json-lib</groupId>
+				<artifactId>json-lib</artifactId>
+				<version>2.4</version>
+				<classifier>jdk15</classifier>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.aggregate</groupId>
+			    <artifactId>jetty-all</artifactId>
+			    <version>8.1.16.v20140903</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.orbit</groupId>
+				<artifactId>javax.servlet</artifactId>
+				<version>3.0.0.v201112011016</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>redis.clients</groupId>
+				<artifactId>jedis</artifactId>
+				<version>2.8.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-dbcp2</artifactId>
+				<version>2.0.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.jackson</groupId>
+				<artifactId>jackson-mapper-asl</artifactId>
+				<version>1.9.2</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>${resources.dir}</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}/generated-resources</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/main/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </testResource>
-            <testResource>
-                <directory>${basedir}/src/test/resources</directory>
-            </testResource>
-        </testResources>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.6</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>ant-contrib</groupId>
-                            <artifactId>ant-contrib</artifactId>
-                            <version>1.0b3</version>
-                            <exclusions>
-                                <exclusion>
-                                    <groupId>ant</groupId>
-                                    <artifactId>ant</artifactId>
-                                </exclusion>
-                            </exclusions>
-                        </dependency>
-                        <dependency>
-                            <groupId>com.google.js</groupId>
-                            <artifactId>closure-compiler</artifactId>
-                            <version>1.0.0</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>com.google.closure-stylesheets</groupId>
-                            <artifactId>closure-stylesheets</artifactId>
-                            <version>20140426</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.4.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.2</version>
-                    <configuration>
-                        <checkModificationExcludes>
-                            <checkModificationExclude>**/*.java</checkModificationExclude>
-                        </checkModificationExcludes>
-                        <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
-                    </configuration>
-                </plugin>
+	<build>
+		<resources>
+			<resource>
+				<directory>${resources.dir}</directory>
+			</resource>
+			<resource>
+				<directory>${project.build.directory}/generated-resources</directory>
+			</resource>
+			<resource>
+				<directory>${basedir}/src/main/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<directory>${basedir}/src/test/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+			<testResource>
+				<directory>${basedir}/src/test/resources</directory>
+			</testResource>
+		</testResources>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.6</version>
+					<dependencies>
+						<dependency>
+							<groupId>ant-contrib</groupId>
+							<artifactId>ant-contrib</artifactId>
+							<version>1.0b3</version>
+							<exclusions>
+								<exclusion>
+									<groupId>ant</groupId>
+									<artifactId>ant</artifactId>
+								</exclusion>
+							</exclusions>
+						</dependency>
+						<dependency>
+							<groupId>com.google.js</groupId>
+							<artifactId>closure-compiler</artifactId>
+							<version>1.0.0</version>
+						</dependency>
+						<dependency>
+							<groupId>com.google.closure-stylesheets</groupId>
+							<artifactId>closure-stylesheets</artifactId>
+							<version>20140426</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.4.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.5.2</version>
+					<configuration>
+						<checkModificationExcludes>
+							<checkModificationExclude>**/*.java</checkModificationExclude>
+						</checkModificationExcludes>
+						<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+					</configuration>
+				</plugin>
 
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <!--Release -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<!--Release -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+			</plugin>
 
-            <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>2.4-fixed</version> 
-                <configuration> <srcLocation>${srcLocation}</srcLocation> <classOutputDir>${classOutputDir}</classOutputDir> </configuration> 
-                </plugin -->
+			<!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> 
+				<version>2.4-fixed</version> <configuration> <srcLocation>${srcLocation}</srcLocation> 
+				<classOutputDir>${classOutputDir}</classOutputDir> </configuration> </plugin -->
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <retryFailedDeploymentCount>2</retryFailedDeploymentCount>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.7</version>
+				<configuration>
+					<retryFailedDeploymentCount>2</retryFailedDeploymentCount>
+				</configuration>
+			</plugin>
 
 
-            <!-- javadoc -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
-                <configuration>
-                    <aggregate>true</aggregate>
-                    <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
-                    <overview>${javadoc.loc}/overview.html</overview>
-                    <excludePackageNames>org.apache.*,*.impl</excludePackageNames>
-                    <breakiterator>true</breakiterator>
-                    <quiet>true</quiet>
-                    <failOnError>false</failOnError>
-                    <verbose>false</verbose>
-                    <show>protected</show>
-                    <source>1.5</source>
-                    <charset>gb2312</charset>
-                    <encoding>UTF-8</encoding>
-                    <docencoding>gb2312</docencoding>
-                    <maxmemory>256M</maxmemory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <finalName>${bundle.name}</finalName>
-                    <outputDirectory>${release.dir}</outputDirectory>
-                </configuration>
-            </plugin>
-            <!-- clean -->
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <filesets>
-                        <fileset>
-                            <directory>${release.dir}</directory>
-                            <includes>
-                                <include>${bundle.name}.${project.packaging}</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+			<!-- javadoc -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.6.1</version>
+				<configuration>
+					<aggregate>true</aggregate>
+					<stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
+					<overview>${javadoc.loc}/overview.html</overview>
+					<excludePackageNames>org.apache.*,*.impl</excludePackageNames>
+					<breakiterator>true</breakiterator>
+					<quiet>true</quiet>
+					<failOnError>false</failOnError>
+					<verbose>false</verbose>
+					<show>protected</show>
+					<source>1.5</source>
+					<charset>gb2312</charset>
+					<encoding>UTF-8</encoding>
+					<docencoding>gb2312</docencoding>
+					<maxmemory>256M</maxmemory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.3.1</version>
+				<configuration>
+					<finalName>${bundle.name}</finalName>
+					<outputDirectory>${release.dir}</outputDirectory>
+				</configuration>
+			</plugin>
+			<!-- clean -->
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<failOnError>false</failOnError>
+					<filesets>
+						<fileset>
+							<directory>${release.dir}</directory>
+							<includes>
+								<include>${bundle.name}.${project.packaging}</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
 
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
-                <configuration>
-                    <aggregate>true</aggregate>
-                    <quiet>true</quiet>
-                    <show>public</show>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.6.1</version>
+				<configuration>
+					<aggregate>true</aggregate>
+					<quiet>true</quiet>
+					<show>public</show>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 
 </project>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 77ecaf8..b3a6c6a 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -18,7 +18,7 @@
     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.baseservice</groupId>
+       <groupId>org.openo.common-services.common-utilities</groupId>
        <artifactId>common-setting</artifactId>
        <version>1.0.1-SNAPSHOT</version>
     </parent>
@@ -27,7 +27,7 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.openo.baseservice</groupId>
+            <groupId>org.openo.common-services.common-utilities</groupId>
             <artifactId>commonlib-cbb</artifactId>
             <version>1.0.1-SNAPSHOT</version>
         </dependency>
-- 
cgit 1.2.3-korg