8000 [ZOOKEEPER-3389] Zookeeper does not export all required packages in OSGi (needed for curator) by JiriOndrusek · Pull Request #945 · apache/zookeeper · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[ZOOKEEPER-3389] Zookeeper does not export all required packages in OSGi (needed for curator) #945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+106 −3
Open

[ZOOKEEPER-3389] Zookeeper does not export all required packages in OSGi (needed for curator) #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
<attribute name="Bundle-DocURL" value="http://hadoop.apache.org/zookeeper"/>
<attribute name="Import-Package" value='javax.management;resolution:=optional,javax.security.auth.callback,javax.security.auth.login,javax.security.sasl,org.slf4j;version="[1.6,2)",org.jboss.netty.buffer;resolution:=optional;version="[3.2,4)",org.jboss.netty.channel;resolution:=optional;version="[3.2,4)",org.jboss.netty.channel.group;resolution:=optional;version="[3.2,4)",org.jboss.netty.channel.socket.nio;resolution:=optional;version="[3.2,4)",org.osgi.framework;resolution:=optional;version="[1.5,2)",org.osgi.util.tracker;resolution:=optional;version="[1.4,2)",org.ietf.jgss'/>
<attribute name="Export-Package" value='org.apache.zookeeper;version="${version-osgi}",org.apache.zookeeper.client;version="${version-osgi}",org.apache.zookeeper.data;version="${version-osgi}",org.apache.zookeeper.version;version="${version-osgi}",org.apache.zookeeper.server;version="${version-osgi}",org.apache.zookeeper.server.auth;version="${version-osgi}",org.apache.zookeeper.server.persistence;version="${version-osgi}",org.apache.zookeeper.server.quorum;version="${version-osgi}",org.apache.zookeeper.common;version="${version-osgi}"'/>
<attribute name="Export-Package" value='org.apache.zookeeper;version="${version-osgi}",org.apache.zookeeper.client;version="${version-osgi}",org.apache.zookeeper.data;version="${version-osgi}",org.apache.zookeeper.version;version="${version-osgi}",org.apache.zookeeper.server;version="${version-osgi}",org.apache.zookeeper.server.auth;version="${version-osgi}",org.apache.zookeeper.server.persistence;version="${version-osgi}",org.apache.zookeeper.server.quorum;version="${version-osgi}",org.apache.zookeeper.common;version="${version-osgi}",org.apache.jute;version="${version}",org.apache.zookeeper.server.quorum.flexible;version="${version}",org.apache.zookeeper.proto;version="${version}"'/>
</manifest>
</jar>
</target>
Expand Down
35 changes: 35 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@
<dropwizard.version>3.2.5</dropwizard.version>
<spotbugsannotations.version>3.1.9</spotbugsannotations.version>
<checkstyle.version>8.17</checkstyle.version>
<maven-bundle-plugin-version>4.1.0</maven-bundle-plugin-version>

<!-- OSGi -->
<osgi.doc.url>http://hadoop.apache.org/zookeeper</osgi.doc.url>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -597,6 +601,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin-version}</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -800,6 +809,32 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Export-Package>${osgi.export.package}</Export-Package>
<Import-Package>${osgi.import.package}</Import-Package>
<Private-Package>${osgi.private.package}</Private-Package>
<Bundle-DocURL>${osgi.doc.url}</Bundle-DocURL>

</instructions>
</configuration>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

<resources>
Expand Down
22 changes: 21 additions & 1 deletion zookeeper-jute/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,30 @@

<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
<packaging>jar</packaging>
<packaging>bundle</packaging>
<name>Apache ZooKeeper - Jute</name>
<description>ZooKeeper jute</description>

<properties>
<bundle.symbolicName>org.apache.hadoop.zookeeper-jute</bundle.symbolicName>
<osgi.import.package>
javax.xml.parsers,
org.apache.yetus.audience,
org.xml.sax,org.xml.sax.helpers
</osgi.import.package>
<osgi.export.package>
org.apache.jute;version="${project.version}",
org.apache.zookeeper.data;version="${project.version}",
org.apache.zookeeper.proto;version="${project.version}",
org.apache.zookeeper.server;version="${project.version}",
org.apache.zookeeper.txn;version="${project.version}"
</osgi.export.package>
<osgi.private.package>
org.apache.jute.*,
org.apache.zookeeper.*
</osgi.private.package>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.yetus</groupId>
Expand Down
50 changes: 49 additions & 1 deletion zookeeper-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,58 @@

<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<packaging>jar</packaging>
<packaging>bundle</packaging>
<name>Apache ZooKeeper - Server</name>
<description>ZooKeeper server</description>

<properties>
<bundle.symbolicName>org.apache.hadoop.zookeeper</bundle.symbolicName>
<osgi.import.package>
javax.management;resolution:=optional,
javax.security.auth.callback,
javax.security.auth.login,
javax.security.sasl,
org.slf4j;version="[1.6,2)",
org.jboss.netty.buffer;resolution:=optional;version="[3.2,4)",
org.jboss.netty.channel;resolution:=optional;version="[3.2,4)",
org.jboss.netty.channel.group;resolution:=optional;version="[3.2,4)",
org.jboss.netty.channel.socket.nio;resolution:=optional;version="[3.2,4)",
org.osgi.framework;resolution:=optional;version="[1.5,2)",
org.osgi.util.tracker;resolution:=optional;version="[1.4,2)",
org.ietf.jgss,
org.apache.jute;version="${project.version}"
org.apache.zookeeper.data;version="${project.version}",
org.apache.zookeeper.proto;version="${project.version}",
org.apache.zookeeper.server;version="${project.version}",
org.apache.zookeeper.txn;version="${project.version}"
</osgi.import.package>
<osgi.export.package>
org.apache.zookeeper;version="${project.version}",
org.apache.zookeeper.cli;version="${project.version}",
org.apache.zookeeper.client;version="${project.version}",
org.apache.zookeeper.common;version="${project.version}",
org.apache.zookeeper.jmx;version="${project.version}",
org.apache.zookeeper.metrics;version="${project.version}",
<!--org.apache.zookeeper.data;version="${project.version}",-->
org.apache.zookeeper.version;version="${project.version}",
org.apache.zookeeper.server;version="${project.version}",
org.apache.zookeeper.server.auth;version="${project.version}",
org.apache.zookeeper.server.admin;version="${project.version}",
org.apache.zookeeper.server.persistence;version="${project.version}";-split-package:=merge-first,
org.apache.zookeeper.server.quorum;version="${project.version}";-split-package:=merge-first,
org.apache.zookeeper.server.quorum.auth;version="${project.version}",
org.apache.zookeeper.server.util;version="${project.version}",
<!--org.apache.zookeeper.server.txn;version="${project.version}",-->
org.apache.zookeeper.server.watch;version="${project.version}",
org.apache.jute;version="${project.version}",
org.apache.zookeeper.server.quorum.flexible;version="${project.version}",
org.apache.zookeeper.proto;version="${project.version}"
</osgi.export.package>
<osgi.private.package>
org.apache.zookeeper.*;-split-package:=merge-first
</osgi.private.package>
</properties>

<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand Down
0