[axis] 36/60: Use bnd to generate OSGi metadata
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jan 12 17:30:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository axis.
commit 365a20d6b6f4e1491d637febbdcff74574412cab
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed Jan 23 21:00:25 2013 +0000
Use bnd to generate OSGi metadata
---
debian/changelog | 6 ++++
debian/control | 2 +-
debian/patches/add-osgi-metadata.patch | 55 ----------------------------------
debian/patches/series | 1 -
debian/rules | 6 ++++
5 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e431078..6a92658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+axis (1.4-17) UNRELEASED; urgency=low
+
+ * Use bnd to generate OSGi metadata.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz> Mon, 21 Jan 2013 21:15:10 +0100
+
axis (1.4-16.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 5e30b2d..ec8c8cc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Michael Koch <konqueror at gmx.de>,
Damien Raude-Morvan <drazzib at debian.org>,
Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: debhelper (>= 7), cdbs, ant-optional, default-jdk, libwsdl4j-java,
- libcommons-logging-java, libcommons-httpclient-java,
+ libcommons-logging-java, libcommons-httpclient-java, bnd,
libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.5-java,
maven-repo-helper
Standards-Version: 3.9.2
diff --git a/debian/patches/add-osgi-metadata.patch b/debian/patches/add-osgi-metadata.patch
deleted file mode 100644
index 79c0d35..0000000
--- a/debian/patches/add-osgi-metadata.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 9 Oct 2011 02:17:06 +0200
-Subject: add-osgi-metadata
-
----
- build.xml | 21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 738d245..8b7b0fe 100644
---- a/build.xml
-+++ b/build.xml
-@@ -195,6 +195,13 @@ Copyright:
- <include name="log4j.properties" unless="exclude.log4j.configuration"/>
- <include name="simplelog.properties"/>
- <manifest>
-+ <attribute name="Bundle-ManifestVersion" value="2"/>
-+ <attribute name="Bundle-Name" value="Apache Axis"/>
-+ <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+ <attribute name="Bundle-SymbolicName" value="org.apache.axis"/>
-+ <attribute name="Bundle-Version" value="${axis.version}"/>
-+ <attribute name="Export-Package" value="org.apache.axis,org.apache.axis.attachments,org.apache.axis.client,org.apache.axis.client.async,org.apache.axis.collections,org.apache.axis.components,org.apache.axis.components.compiler,org.apache.axis.components.encoding,org.apache.axis.components.image,org.apache.axis.components.jms,org.apache.axis.components.logger,org.apache.axis.components.net,org.apache.axis.components.script,org.apache.axis.components.threadpool,org.apache.axis.com [...]
-+ <attribute name="Require-Bundle" value="javax.wsdl,javax.activation,javax.mail,javax.xml,javax.xml.rpc,javax.xml.soap,javax.servlet,org.apache.commons.discovery,org.apache.commons.httpclient,org.apache.commons.logging"/>
- <section name="org/apache/axis">
- <attribute name="Implementation-Title" value="Apache Axis"/>
- <attribute name="Implementation-Version" value="${axis.version} ${TSTAMP} ${TODAY}"/>
-@@ -206,6 +213,13 @@ Copyright:
- <include name="javax/**"/>
- <exclude name="javax/xml/soap/**"/>
- <manifest>
-+ <attribute name="Bundle-ManifestVersion" value="2"/>
-+ <attribute name="Bundle-Name" value="JAX-RPC"/>
-+ <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+ <attribute name="Bundle-SymbolicName" value="javax.xml.rpc"/>
-+ <attribute name="Bundle-Version" value="${axis.version}"/>
-+ <attribute name="Export-Package" value="javax.xml.rpc,javax.xml.rpc.encoding,javax.xml.rpc.handler,javax.xml.rpc.handler.soap,javax.xml.rpc.holders,javax.xml.rpc.server,javax.xml.rpc.soap"/>
-+ <attribute name="Require-Bundle" value="javax.servlet,javax.xml,javax.xml.soap"/>
- <section name="javax/xml/rpc">
- <attribute name="Specification-Title" value="JAX-RPC"/>
- <attribute name="Specification-Version" value="1.1"/>
-@@ -216,6 +230,13 @@ Copyright:
- <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" >
- <include name="javax/xml/soap/**"/>
- <manifest>
-+ <attribute name="Bundle-ManifestVersion" value="2"/>
-+ <attribute name="Bundle-Name" value="SAAJ"/>
-+ <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+ <attribute name="Bundle-SymbolicName" value="javax.xml.soap"/>
-+ <attribute name="Bundle-Version" value="${axis.version}"/>
-+ <attribute name="Export-Package" value="javax.xml.soap"/>
-+ <attribute name="Require-Bundle" value="javax.activation,javax.xml"/>
- <section name="javax/xml/soap">
- <attribute name="Specification-Title" value="SAAJ"/>
- <attribute name="Specification-Version" value="1.2"/>
---
diff --git a/debian/patches/series b/debian/patches/series
index 865cdd2..3e6ca49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
02-gcj-4.4.patch
axis-bz152255.patch
javadoc.diff
-add-osgi-metadata.patch
06-fix-CVE-2012-5784.patch
diff --git a/debian/rules b/debian/rules
index 28395eb..ec44276 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,12 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discov
DEB_ANT_BUILD_TARGET := compile javadocs
+common-post-build-indep::
+ for BNDFILE in debian/*.bnd; do \
+ JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \
+ bnd wrap -properties $$BNDFILE -output $$JARPATH $$JARPATH; \
+ done
+
install/libaxis-java::
mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION)
mh_installjar -plibaxis-java -l debian/poms/axis.xml build/lib/axis.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/axis.git
More information about the pkg-java-commits
mailing list