Author: sergeyb
Date: Wed Dec 14 22:29:02 2011
New Revision: 1214511
URL: http://svn.apache.org/viewvc?rev=1214511&view=rev
Log:
[DOSGI-100] Few more updates
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
cxf/dosgi/trunk/systests2/single-bundle/pom.xml
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1214511&r1=1214510&r2=1214511&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Wed Dec 14
22:29:02 2011
@@ -64,9 +64,23 @@
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
-
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml?rev=1214511&r1=1214510&r2=1214511&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Wed Dec 14
22:29:02 2011
@@ -58,9 +58,23 @@
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
-
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- This is a zookeeper dependency that we apparently have to list
here -->
Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1214511&r1=1214510&r2=1214511&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Wed Dec 14 22:29:02 2011
@@ -78,9 +78,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
-
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
Modified: cxf/dosgi/trunk/systests2/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/pom.xml?rev=1214511&r1=1214510&r2=1214511&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/single-bundle/pom.xml Wed Dec 14 22:29:02 2011
@@ -77,9 +77,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
-
<artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
Modified:
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java?rev=1214511&r1=1214510&r2=1214511&view=diff
==============================================================================
---
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
(original)
+++
cxf/dosgi/trunk/systests2/single-bundle/src/test/java/org/apache/cxf/dosgi/systests2/single/TestDiscoveryRountrip.java
Wed Dec 14 22:29:02 2011
@@ -49,7 +49,7 @@ public class TestDiscoveryRountrip exten
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-singlebundle-distribution").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.log4j").artifactId("com.springsource.org.apache.log4j").versionAsInProject(),
-
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper").versionAsInProject(),
+
CoreOptions.mavenBundle().groupId("org.apache.hadoop").artifactId("zookeeper").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi").artifactId("cxf-dosgi-ri-discovery-distributed-zookeeper-server").versionAsInProject(),
// This bundle contains the common system testing code
