helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hu...@apache.org
Subject [helix] branch master updated: Rearrange zookeeper imports in pom.xml (#995)
Date Mon, 04 May 2020 21:28:50 GMT
This is an automated email from the ASF dual-hosted git repository.

hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new fef186d  Rearrange zookeeper imports in pom.xml (#995)
fef186d is described below

commit fef186df3224a751e4b3e44c0d6af9e31370d2e6
Author: Hunter Lee <hulee@linkedin.com>
AuthorDate: Mon May 4 14:28:43 2020 -0700

    Rearrange zookeeper imports in pom.xml (#995)
    
    This commit makes sure pom.xml is up to date in preparation for the 1.0.X release.
---
 helix-core/pom.xml    | 15 ---------------
 helix-rest/pom.xml    |  2 +-
 zookeeper-api/pom.xml |  4 ++++
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 7027a0c..c4e760a 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -38,10 +38,6 @@ under the License.
       org.apache.commons.io*;version="[1.4,2)",
       org.apache.commons.math*;version="[2.1,4)",
       org.apache.jute*;resolution:=optional,
-      org.apache.zookeeper.server.persistence*;resolution:=optional,
-      org.apache.zookeeper.server.util*;resolution:=optional,
-      org.apache.zookeeper.txn*;resolution:=optional,
-      org.apache.zookeeper*;version="[3.4,4)",
       org.codehaus.jackson*;version="[1.8,2)",
       org.slf4j*;version="[1.6,2)",
       *
@@ -86,17 +82,6 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <version>3.4.13</version>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
      <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
diff --git a/helix-rest/pom.xml b/helix-rest/pom.xml
index dafee59..7f4efc7 100644
--- a/helix-rest/pom.xml
+++ b/helix-rest/pom.xml
@@ -36,7 +36,7 @@ under the License.
       org.apache.commons.cli*,
       org.restlet*,
       org.slf4j*;version="[1.6,2)",
-      org.apache.zookeeper*;version="[3.4,4)",
+      org.apache.zookeeper*;version="[3.4,13)",
       org.apache.commons.io*;version="[1.4,2)",
       *
     </osgi.import>
diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
index ee5afb3..aed65e6 100644
--- a/zookeeper-api/pom.xml
+++ b/zookeeper-api/pom.xml
@@ -32,6 +32,10 @@ under the License.
   <properties>
     <osgi.import>
       org.slf4j*;version="[1.6,2)",
+      org.apache.zookeeper.server.persistence*;resolution:=optional,
+      org.apache.zookeeper.server.util*;resolution:=optional,
+      org.apache.zookeeper.txn*;resolution:=optional,
+      org.apache.zookeeper*;version="[3.4,13)",
       *
     </osgi.import>
     <osgi.export>org.apache.helix.zookeeper*;version="${project.version};-noimport:=true</osgi.export>


Mime
View raw message