summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2016-08-25 07:41:48 -0700
committerGary Wu <gary.i.wu@huawei.com>2016-08-25 07:43:28 -0700
commita00f28071009375c15b26e30c8a5bfc1d1296a39 (patch)
treeb6ac5ac21c6e505fb4105c80f2c2c86bd8653838
parent79d67955b160929ffacc6828014d3c5ce3110fb8 (diff)
Make necessary changes to build common-services-common-utilities
Change-Id: I171a0fc8c1205f3634c537d827f6b299d2eb1641 Issue-id: INT-40 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--.gitreview4
-rw-r--r--common-util/pom.xml2
-rw-r--r--pom.xml22
-rw-r--r--rest-client/pom.xml2
4 files changed, 12 insertions, 18 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..f21a39a
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.open-o.org
+port=29418
+project=common-services-common-utilities.git
diff --git a/common-util/pom.xml b/common-util/pom.xml
index b4245d0..32ce4c3 100644
--- a/common-util/pom.xml
+++ b/common-util/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>com.springsource.slf4j.log4j</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 2ff9e92..7c01bc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,16 +41,6 @@
<module>rest-client</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 +50,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 +71,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>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 33f24c3..77ecaf8 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -45,7 +45,7 @@
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<scope>test</scope>
- <version>1.18</version>
+ <version>1.19</version>
</dependency>
</dependencies>