Repository: thrift Updated Branches: refs/heads/master 656a2fbda -> 63ad5f6f5
Thrift-2715:Wrong Import-Package directive in MANIFEST Client: Java Patch: Zlika Updates java build.xml import headers for OSGI. Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/63ad5f6f Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/63ad5f6f Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/63ad5f6f Branch: refs/heads/master Commit: 63ad5f6f514a6d977d960a41bcda607d701f284c Parents: 656a2fb Author: jfarrell <[email protected]> Authored: Wed Oct 1 21:44:30 2014 -0400 Committer: jfarrell <[email protected]> Committed: Wed Oct 1 21:44:30 2014 -0400 ---------------------------------------------------------------------- lib/java/build.xml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/63ad5f6f/lib/java/build.xml ---------------------------------------------------------------------- diff --git a/lib/java/build.xml b/lib/java/build.xml index f8afed2..83028f6 100755 --- a/lib/java/build.xml +++ b/lib/java/build.xml @@ -126,21 +126,8 @@ <attribute name="Bundle-Description" value="Apache Thrift library"/> <attribute name="Bundle-License" value="${license}"/> <attribute name="Bundle-ActivationPolicy" value="lazy"/> - <attribute name="Export-Package" value="${thrift.groupid}.async;uses:=" -${thrift.groupid}.protocol,${thrift.groupid}.transport,org.slf4j,${thrift.groupid}";version="${version}", -${thrift.groupid}.protocol;uses:="${thrift.groupid}.transport,${thrift.groupid},${thrift.groupid}.scheme" -;version="${version}",${thrift.groupid}.server;uses:="${thrift.groupid}.transport,${thrift.groupid}.protocol, -${thrift.groupid},org.slf4j,javax.servlet,javax.servlet.http";version="${version}",${thrift.groupid}.transport; -uses:="${thrift.groupid}.protocol,${thrift.groupid},org.apache.http.client,org.apache.http.params,org.apache.http.entity, -org.apache.http.client.methods,org.apache.http,org.slf4j,javax.net.ssl,javax.net,javax.security.sasl, -javax.security.auth.callback";version="${version}",${thrift.groupid};uses:="${thrift.groupid}.protocol, -${thrift.groupid}.async,${thrift.groupid}.server,${thrift.groupid}.transport,org.slf4j,org.apache.log4j, -${thrift.groupid}.scheme";version="${version}",${thrift.groupid}.meta_data;uses:="${thrift.groupid}" -;version="${version}",${thrift.groupid}.scheme;uses:="${thrift.groupid}.protocol, -${thrift.groupid}";version="${version}""/> - <attribute name="Import-Package" value="javax.net,javax.net.ssl,javax.security.auth.callback, -javax.security.sasl,javax.servlet;resolution:=optional,javax.servlet.http;resolution:=optional, -resolution:=optional,org.slf4j;resolution:=optional;version="[1.4,2)""/> + <attribute name="Export-Package" value="${thrift.groupid}.async;uses:="${thrift.groupid}.protocol,${thrift.groupid}.transport,org.slf4j,${thrift.groupid}";version="${version}",${thrift.groupid}.protocol;uses:="${thrift.groupid}.transport,${thrift.groupid},${thrift.groupid}.scheme";version="${version}",${thrift.groupid}.server;uses:="${thrift.groupid}.transport,${thrift.groupid}.protocol,${thrift.groupid},org.slf4j,javax.servlet,javax.servlet.http";version="${version}",${thrift.groupid}.transport;uses:="${thrift.groupid}.protocol,${thrift.groupid},org.apache.http.client,org.apache.http.params,org.apache.http.entity,org.apache.http.client.methods,org.apache.http,org.slf4j,javax.net.ssl,javax.net,javax.security.sasl,javax.security.auth.callback";version="${version}",${thrift.groupid};uses:="${thrift.groupid}.protocol,${thrift.groupid}.async,${thrift.groupid}.server,${thrift.groupid}.transport,o rg.slf4j,org.apache.log4j,${thrift.groupid}.scheme";version="${version}",${thrift.groupid}.meta_data;uses:="${thrift.groupid}";version="${version}",${thrift.groupid}.scheme;uses:="${thrift.groupid}.protocol,${thrift.groupid}";version="${version}""/> + <attribute name="Import-Package" value="javax.net,javax.net.ssl,javax.security.auth.callback,javax.security.sasl,javax.servlet;resolution:=optional,javax.servlet.http;resolution:=optional,org.slf4j;resolution:=optional;version="[1.4,2)""/> </manifest> <fileset dir="${build.dir}"> <include name="org/apache/thrift/**/*.class"/>
