--- objectweb-asm-6.0/archive/asm-all.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-all.xml	2018-12-11 10:20:37.851607047 +0100
@@ -34,14 +34,25 @@
 
   <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 jarfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/**/*.class"/>
+      <exclude name="org/objectweb/asm/optimizer/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM all classes"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name"      value="ASM all classes"/>
+        <attribute name="Bundle-Vendor"    value="France Telecom R&amp;D"/>
+        <attribute name="Bundle-Version"   value="${product.artifact}"/>
+        <attribute name="Bundle-DocURL"    value="http://asm.objectweb.org"/>
+        <attribute name="Bundle-SymbolicName" value="org.objectweb.asm.all"/>
+        <attribute name="Export-Package" value="org.objectweb.asm;version=${product.artifact},org.objectweb.asm.signature;version=${product.artifact},org.objectweb.asm.commons;version=${product.artifact},org.objectweb.asm.tree;version=${product.artifact},org.objectweb.asm.tree.analysis;version=${product.artifact},org.objectweb.asm.util;version=${product.artifact},org.objectweb.asm.xml;version=${product.artifact}"/>
+        <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.3"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm-analysis.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-analysis.xml	2018-12-11 10:19:23.011226060 +0100
@@ -33,13 +33,15 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
-    <bnd
-            classpath="${out.build}"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-analysis.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+    <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/tree/analysis/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM static code analysis framework"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm-commons.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-commons.xml	2018-12-11 10:19:23.011226060 +0100
@@ -33,13 +33,15 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
-    <bnd
-            classpath="${out.build}"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-commons.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+    <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/commons/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM commons"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm-debug-all.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-debug-all.xml	2018-12-11 10:21:41.675931989 +0100
@@ -34,14 +34,25 @@
 
   <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 jarfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}/tmp">
+      <include name="org/objectweb/asm/**/*.class"/>
+      <exclude name="org/objectweb/asm/optimizer/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM all classes with debug info"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name"      value="ASM all classes with debug info"/>
+        <attribute name="Bundle-Vendor"    value="France Telecom R&amp;D"/>
+        <attribute name="Bundle-Version"   value="${product.artifact}"/>
+        <attribute name="Bundle-DocURL"    value="http://asm.objectweb.org"/>
+        <attribute name="Bundle-SymbolicName" value="org.objectweb.asm.all"/>
+        <attribute name="Export-Package" value="org.objectweb.asm;version=${product.artifact},org.objectweb.asm.signature;version=${product.artifact},org.objectweb.asm.commons;version=${product.artifact},org.objectweb.asm.tree;version=${product.artifact},org.objectweb.asm.tree.analysis;version=${product.artifact},org.objectweb.asm.util;version=${product.artifact},org.objectweb.asm.xml;version=${product.artifact}"/>
+        <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.3"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm-tree.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-tree.xml	2018-12-11 10:19:23.011226060 +0100
@@ -33,13 +33,15 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
-    <bnd
-            classpath="${out.build}"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-tree.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+    <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/tree/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM Tree class visitor"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm-util.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-util.xml	2018-12-11 10:19:23.011226060 +0100
@@ -34,12 +34,15 @@
 
   <target name="build-jar">
     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
-    <bnd
-            classpath="${out.build}"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-util.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+    <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/util/**/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM Utilities"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm.xml	2018-12-11 10:19:23.011226060 +0100
@@ -33,13 +33,16 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
-    <bnd
-            classpath="${out.build}"
-            failok="false"
-            exceptions="true"
-            files="archive/asm.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+    <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/*.class"/>
+      <include name="org/objectweb/asm/signature/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/archive/asm-xml.xml	2018-12-11 10:19:05.855138717 +0100
+++ objectweb-asm-6.0/archive/asm-xml.xml	2018-12-11 10:19:23.015226080 +0100
@@ -33,13 +33,17 @@
   <target name="dist" depends="build-jar,build-snapshot"/>
 
   <target name="build-jar">
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/>
-    <bnd
-            classpath="${out.build}"
-            failok="false"
-            exceptions="true"
-            files="archive/asm-xml.bnd"
-            output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/>
+    <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
+         basedir="${out.build}">
+      <include name="org/objectweb/asm/xml/*.class"/>
+      <manifest>
+        <attribute name="Implementation-Title" value="ASM XML classes"/>
+        <attribute name="Implementation-Version" value="${product.artifact}"/> 
+        <attribute name="Implementation-Vendor" value="Eugene Kuleshov"/>
+        <attribute name="Class-path" value="asm-${product.artifact}.jar asm-util-${product.artifact}.jar asm-attrs-${product.artifact}.jar"/>
+        <attribute name="Main-class" value="org.objectweb.asm.xml.Processor"/>
+      </manifest>
+    </jar>
 
     <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}"/>
--- objectweb-asm-6.0/build.xml	2018-12-11 10:19:05.843138654 +0100
+++ objectweb-asm-6.0/build.xml	2018-12-11 10:22:41.928238728 +0100
@@ -79,7 +79,6 @@
 		<condition property="paths.configured">
 			<and>
 				<isset property="objectweb.ant.tasks.path" />
-				<isset property="biz.aQute.bnd.path" />
 			</and>
 		</condition>
 
@@ -131,7 +130,6 @@
 		<javac destdir="${out.build}/tmp" debug="on" source="${compile.source}" target="${compile.target}" encoding="ISO-8859-1">
 			<classpath>
 				<pathelement location="${out.build}/tmp" />
-				<pathelement location="${config}/${biz.aQute.bnd.path}" />
 			</classpath>
 			<src path="${src}" />
 			<include name="**/*.java" />
@@ -256,14 +254,7 @@
 		</condition>
 	</target>
 
-	<target name="bnd-module-plugin-jar" depends="compile">
-		 <jar destfile="${out.build}/bnd-module-plugin.jar"
-		      basedir="${out.build}/tmp"
-		 	   includes="org/objectweb/asm/**/*.class">
-		 </jar>
-        </target>
-	
-	<target name="jar" depends="dist.init,dist.version,compile,retrofit,bnd-module-plugin-jar">
+	<target name="jar" depends="dist.init,dist.version,compile,retrofit">
 		<ant antfile="${archive}/asm.xml" />
 		<ant antfile="${archive}/asm-all.xml" />
 		<ant antfile="${archive}/asm-analysis.xml" />