--- asm-5.0.4.orig/archive/asm.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm.xml	2015-09-12 00:40:39.702197123 -0500
@@ -33,15 +33,10 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            includes="org/objectweb/asm/*,org/objectweb/asm/signature/*"
+            excludes="tmp/**"/>
     <copy file="${archive}/asm.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-all.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-all.xml	2015-09-12 00:43:15.974683899 -0500
@@ -34,15 +34,9 @@
 
   <target name="build-jar">
     <mkdir dir="${out.dist.lib}/all"/>
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-all.bnd"
-            output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            excludes="tmp/**,org/objectweb/asm/optimizer**"/>
     <copy file="${archive}/asm-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-analysis.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-analysis.xml	2015-09-12 00:46:21.293679991 -0500
@@ -33,15 +33,10 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-analysis.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            includes="org/objectweb/asm/tree/analysis/*"
+            excludes="tmp/**"/>
     <copy file="${archive}/asm-analysis.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-commons.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-commons.xml	2015-09-12 00:47:33.099957670 -0500
@@ -33,15 +33,10 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-commons.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            includes="org/objectweb/asm/commons/*"
+            excludes="tmp/**"/>
     <copy file="${archive}/asm-commons.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-debug-all.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-debug-all.xml	2015-09-12 01:02:18.168496421 -0500
@@ -34,15 +34,9 @@
 
   <target name="build-jar">
     <mkdir dir="${out.dist.lib}/all"/>
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-      classpath="${out.build}/tmp"
-      eclipse="true"
-      failok="false"
-      exceptions="true"
-      files="archive/asm-debug-all.bnd"
-      output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            excludes="tmp/**,org/objectweb/asm/optimizer**"/>
     <copy file="${archive}/asm-debug-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-tree.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-tree.xml	2015-09-12 00:51:45.141925645 -0500
@@ -33,15 +33,10 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-tree.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            includes="org/objectweb/asm/tree/*"
+            excludes="tmp/**"/>
     <copy file="${archive}/asm-tree.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-util.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-util.xml	2015-09-12 01:03:14.101526755 -0500
@@ -33,15 +33,10 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-util.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            includes="org/objectweb/asm/util/*"
+            excludes="tmp/**"/>
     <copy file="${archive}/asm-util.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>
--- asm-5.0.4.orig/archive/asm-xml.xml	2015-05-15 09:37:24.000000000 -0500
+++ asm-5.0.4/archive/asm-xml.xml	2015-09-12 00:54:49.180928671 -0500
@@ -33,15 +33,10 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/>
-    <bnd
-            classpath="${out.build}"
-            eclipse="true"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-xml.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
-
+    <jar destfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+            basedir="${out.build}" manifest="archive/${ant.project.name}.osgi"
+            includes="org/objectweb/asm/xml/*"
+            excludes="tmp/**"/>
     <copy file="${archive}/asm-xml.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/>
     <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/>