You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by sh...@apache.org on 2019/05/13 20:51:12 UTC

[curator] branch master updated: [CURATOR-429] Make Curator 4.x compatible with Zookeeper 3.4.x in OSGi too

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new fa3f84d  [CURATOR-429] Make Curator 4.x compatible with Zookeeper 3.4.x in OSGi too
     new a3514d8  Merge pull request #311 from JiriOndrusek/CURATOR-429_osgi-zookeeper-dependency
fa3f84d is described below

commit fa3f84d3506a6a780d8d722468853fdf0ef7545c
Author: JiriOndrusek <jo...@redhat.com>
AuthorDate: Mon May 13 12:09:31 2019 +0200

    [CURATOR-429] Make Curator 4.x compatible with Zookeeper 3.4.x in OSGi too
---
 curator-client/pom.xml             | 2 +-
 curator-framework/pom.xml          | 2 +-
 curator-recipes/pom.xml            | 2 +-
 curator-x-discovery-server/pom.xml | 2 +-
 curator-x-discovery/pom.xml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index c48e6f1..0978471 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <osgi.import.package>
-            *
+            org.apache.zookeeper.*;version="[3.4,4.0)", *
         </osgi.import.package>
         <osgi.export.package>
             org.apache.curator*;version="${project.version}";-noimport:=true
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 78f16ac..13fd908 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
         <osgi.import.package>
-            *
+            org.apache.zookeeper.*;version="[3.4,4.0)", *
         </osgi.import.package>
         <osgi.export.package>
             org.apache.curator.framework*;version="${project.version}";-noimport:=true
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 4263296..da67f9f 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
         <osgi.import.package>
-            *
+            org.apache.zookeeper.*;version="[3.4,4.0)", *
         </osgi.import.package>
         <osgi.export.package>
             org.apache.curator.framework.recipes*;version="${project.version}";-noimport:=true
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index 1a338fd..2e85388 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
         <osgi.import.package>
-            *
+            org.apache.zookeeper.*;version="[3.4,4.0)", *
         </osgi.import.package>
         <osgi.export.package>
             org.apache.curator.x.discovery.server*;version="${project.version}";-noimport:=true
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index d02e687..6e1fd4b 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
         <osgi.import.package>
-            *
+            org.apache.zookeeper.*;version="[3.4,4.0)", *
         </osgi.import.package>
         <osgi.export.package>
             org.apache.curator.x.discovery*;version="${project.version}";-noimport:=true