Fix deploy issue

[vfc/nfvo/wfengine.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 2ff9e92..66b6f67 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,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>
-       <groupId>org.openo.baseservice</groupId>
+
+       <parent>
+         <groupId>org.openo.oparent</groupId>
+         <artifactId>oparent</artifactId>
+         <version>1.0.0-SNAPSHOT</version>
+         <relativePath></relativePath>
+       </parent>
+
+       <groupId>org.openo.common-services.common-utilities</groupId>
        <artifactId>common-setting</artifactId>
        <version>1.0.1-SNAPSHOT</version>
        <packaging>pom</packaging>
@@ -35,22 +43,26 @@
                <bundle.name>${project.artifactId}-${project.version}</bundle.name>
                <pkgzip.dir>${basedir}/../release/pkgzip</pkgzip.dir>
                <excludesFile>**/*$*</excludesFile>
-       </properties>
+    
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <nexusproxy>https://nexus.open-o.org/content</nexusproxy>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
+     <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>
+        <module>winery</module>
     </modules>
 
-       <distributionManagement>
-               <repository>
-                       <id>releases</id>
-                       <url>http://113.200.115.170:4096/nexus/content/repositories/OPEN-O_Release</url>
-               </repository>
-               <snapshotRepository>
-                       <id>snapshots</id>
-                       <url>http://113.200.115.170:4096/nexus/content/repositories/OPEN-O_SnapShots</url>
-               </snapshotRepository>
-       </distributionManagement>
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -60,17 +72,17 @@
                        </dependency>
                        <dependency>
                                <groupId>org.apache.commons</groupId>
-                               <artifactId>com.springsource.org.apache.commons.lang</artifactId>
+                               <artifactId>org.apache.commons.lang</artifactId>
                                <version>2.6.0</version>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.commons</groupId>
-                               <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                               <artifactId>org.apache.commons.logging</artifactId>
                                <version>1.1.1</version>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.commons</groupId>
-                               <artifactId>com.springsource.org.apache.commons.codec</artifactId>
+                               <artifactId>org.apache.commons.codec</artifactId>
                                <version>1.9.0</version>
                        </dependency>
 
@@ -81,12 +93,12 @@
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
-                               <artifactId>com.springsource.slf4j.log4j</artifactId>
+                               <artifactId>slf4j-log4j12</artifactId>
                                <version>${slf4j.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.apache.log4j</groupId>
-                               <artifactId>com.springsource.org.apache.log4j</artifactId>
+                               <groupId>log4j</groupId>
+                               <artifactId>log4j</artifactId>
                                <version>1.2.16</version>
                        </dependency>
                        <dependency>