.gitignore

@@ -1 +1 @@
-SOURCES/objectweb-asm-9.1.tar.gz
+SOURCES/objectweb-asm-7.2.tar.gz

.objectweb-asm.metadata

@@ -1 +1 @@
-d4c155b63b6482c19ddcd1b4f62f9af39a951213 SOURCES/objectweb-asm-9.1.tar.gz
+35d476b1dace20fd180269067a06f7c7b1c1932a SOURCES/objectweb-asm-7.2.tar.gz

SOURCES/asm-7.2.pom

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
   <groupId>org.ow2.asm</groupId>
-  <artifactId>asm-util</artifactId>
+  <artifactId>asm</artifactId>
-  <version>9.1</version>
+  <version>7.2</version>
-  <name>asm-util</name>
+  <name>asm</name>
-  <description>Utilities for ASM, a very small and fast Java bytecode manipulation framework</description>
+  <description>ASM, a very small and fast Java bytecode manipulation framework</description>
   <url>http://asm.ow2.io/</url>
   <inceptionYear>2000</inceptionYear>
   <organization>
@@ -70,26 +76,21 @@
   <dependencies>
     <dependency>
       <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
+      <artifactId>asm-test</artifactId>
-      <version>9.1</version>
+      <version>7.2</version>
-      <scope>compile</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
+      <groupId>org.junit.jupiter</groupId>
-      <artifactId>asm-tree</artifactId>
+      <artifactId>junit-jupiter-api</artifactId>
-      <version>9.1</version>
+      <version>5.3.2</version>
-      <scope>compile</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
+      <groupId>org.junit.jupiter</groupId>
-      <artifactId>asm-analysis</artifactId>
+      <artifactId>junit-jupiter-params</artifactId>
-      <version>9.1</version>
+      <version>5.3.2</version>
-      <scope>compile</scope>
+      <scope>test</scope>
     </dependency>
   </dependencies>
-  <parent>
-    <groupId>org.ow2</groupId>
-    <artifactId>ow2</artifactId>
-    <version>1.5</version>
-  </parent>
 </project>

SOURCES/asm-9.1.pom

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ow2.asm</groupId>
-  <artifactId>asm</artifactId>
-  <version>9.1</version>
-  <name>asm</name>
-  <description>ASM, a very small and fast Java bytecode manipulation framework</description>
-  <url>http://asm.ow2.io/</url>
-  <inceptionYear>2000</inceptionYear>
-  <organization>
-    <name>OW2</name>
-    <url>http://www.ow2.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>BSD-3-Clause</name>
-      <url>https://asm.ow2.io/license.html</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>ebruneton</id>
-      <name>Eric Bruneton</name>
-      <email>ebruneton@free.fr</email>
-      <roles>
-        <role>Creator</role>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>eu</id>
-      <name>Eugene Kuleshov</name>
-      <email>eu@javatx.org</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>forax</id>
-      <name>Remi Forax</name>
-      <email>forax@univ-mlv.fr</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <mailingLists>
-    <mailingList>
-      <name>ASM Users List</name>
-      <subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
-      <post>asm@objectweb.org</post>
-      <archive>https://mail.ow2.org/wws/arc/asm/</archive>
-    </mailingList>
-    <mailingList>
-      <name>ASM Team List</name>
-      <subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
-      <post>asm-team@objectweb.org</post>
-      <archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
-    </mailingList>
-  </mailingLists>
-  <scm>
-    <connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
-    <developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
-    <url>https://gitlab.ow2.org/asm/asm/</url>
-  </scm>
-  <issueManagement>
-    <url>https://gitlab.ow2.org/asm/asm/issues</url>
-  </issueManagement>
-  <parent>
-    <groupId>org.ow2</groupId>
-    <artifactId>ow2</artifactId>
-    <version>1.5</version>
-  </parent>
-</project>

SOURCES/asm-all.pom

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-all</artifactId>
+  <version>@VERSION@</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.1.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

SOURCES/asm-analysis-7.2.pom

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-analysis</artifactId>
-  <version>9.1</version>
+  <version>7.2</version>
   <name>asm-analysis</name>
   <description>Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework</description>
   <url>http://asm.ow2.io/</url>
@@ -71,13 +77,26 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.1</version>
+      <version>7.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>7.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-  <parent>
-    <groupId>org.ow2</groupId>
-    <artifactId>ow2</artifactId>
-    <version>1.5</version>
-  </parent>
 </project>

SOURCES/asm-commons-7.2.pom

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-commons</artifactId>
-  <version>9.1</version>
+  <version>7.2</version>
   <name>asm-commons</name>
   <description>Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework</description>
   <url>http://asm.ow2.io/</url>
@@ -71,25 +77,44 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.1</version>
+      <version>7.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.1</version>
+      <version>7.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
-      <version>9.1</version>
+      <version>7.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>7.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>7.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-  <parent>
-    <groupId>org.ow2</groupId>
-    <artifactId>ow2</artifactId>
-    <version>1.5</version>
-  </parent>
 </project>

SOURCES/asm-test-7.2.pom

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-test</artifactId>
-  <version>9.1</version>
+  <version>7.2</version>
   <name>asm-test</name>
   <description>Utilities for testing ASM, a very small and fast Java bytecode manipulation framework</description>
   <url>http://asm.ow2.io/</url>
@@ -71,19 +77,20 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.7.0</version>
+      <version>5.3.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.7.0</version>
+      <version>5.3.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>7.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-  <parent>
-    <groupId>org.ow2</groupId>
-    <artifactId>ow2</artifactId>
-    <version>1.5</version>
-  </parent>
 </project>

SOURCES/asm-tree-7.2.pom

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-tree</artifactId>
-  <version>9.1</version>
+  <version>7.2</version>
   <name>asm-tree</name>
   <description>Tree API of ASM, a very small and fast Java bytecode manipulation framework</description>
   <url>http://asm.ow2.io/</url>
@@ -71,13 +77,26 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.1</version>
+      <version>7.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>7.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-  <parent>
-    <groupId>org.ow2</groupId>
-    <artifactId>ow2</artifactId>
-    <version>1.5</version>
-  </parent>
 </project>

SOURCES/asm-util-7.2.pom

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-util</artifactId>
+  <version>7.2</version>
+  <name>asm-util</name>
+  <description>Utilities for ASM, a very small and fast Java bytecode manipulation framework</description>
+  <url>http://asm.ow2.io/</url>
+  <inceptionYear>2000</inceptionYear>
+  <organization>
+    <name>OW2</name>
+    <url>http://www.ow2.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD-3-Clause</name>
+      <url>https://asm.ow2.io/license.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>ebruneton</id>
+      <name>Eric Bruneton</name>
+      <email>ebruneton@free.fr</email>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>eu</id>
+      <name>Eugene Kuleshov</name>
+      <email>eu@javatx.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>forax</id>
+      <name>Remi Forax</name>
+      <email>forax@univ-mlv.fr</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <mailingLists>
+    <mailingList>
+      <name>ASM Users List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
+      <post>asm@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm/</archive>
+    </mailingList>
+    <mailingList>
+      <name>ASM Team List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
+      <post>asm-team@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
+    <developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
+    <url>https://gitlab.ow2.org/asm/asm/</url>
+  </scm>
+  <issueManagement>
+    <url>https://gitlab.ow2.org/asm/asm/issues</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>7.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>7.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>7.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.janino</groupId>
+      <artifactId>janino</artifactId>
+      <version>3.0.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>7.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.3.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

SOURCES/generate-tarball.sh

@@ -6,15 +6,15 @@ version="$(sed -n 's/Version:\s*//p' *.spec)"
 gittag="ASM_${version//./_}"
 
 # RETRIEVE
-wget "https://gitlab.ow2.org/asm/asm/-/archive/${gittag}/asm-${gittag}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+wget "https://gitlab.ow2.org/asm/asm/repository/${gittag}/archive.tar.gz#/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
-pushd tarball-tmp
+cd tarball-tmp
-tar -xzf "../${name}-${version}.orig.tar.gz"
+tar xf "../${name}-${version}.orig.tar.gz"
 
 # Rename dir not to contain commit
-mv asm-${gittag} ${name}-${version}
+mv asm-${gittag}-* ${name}-${version}
 
 # CLEAN TARBALL
 # Remove all jar files
@@ -23,6 +23,6 @@ find -name '*.jar' -delete
 find */asm{,-analysis,-commons} -name '*.class' -delete
 rm -r */gradle
 
-tar -czf "../${name}-${version}.tar.gz" *
+tar cf "../${name}-${version}.tar.gz" *
-popd
+cd ..
 rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

SOURCES/parent.pom

@@ -13,7 +13,9 @@
       <module>asm</module>
       <module>asm-analysis</module>
       <module>asm-commons</module>
+      <module>asm-test</module>
       <module>asm-tree</module>
       <module>asm-util</module>
+      <module>asm-all</module>
     </modules>
 </project>

SPECS/objectweb-asm.spec

@@ -1,29 +1,35 @@
-%bcond_with bootstrap
-
 Name:           objectweb-asm
-Version:        9.1
+Version:        7.2
-Release:        5%{?dist}
+Release:        2%{?dist}
 Summary:        Java bytecode manipulation and analysis framework
 License:        BSD
-URL:            https://asm.ow2.org/
+URL:            http://asm.ow2.org/
 BuildArch:      noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 Source1:        parent.pom
-Source2:        https://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom
+Source2:        http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom
-Source3:        https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom
+Source3:        http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom
-Source4:        https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom
+Source4:        http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom
-Source5:        https://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom
+Source5:        http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom
-Source6:        https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom
+Source6:        http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom
-Source7:        https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom
+Source7:        http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom
+# We still want to create an "all" uberjar, so this is a custom pom to generate it
+# TODO: Fix other packages to no longer depend on "asm-all" so we can drop this
+Source8:        asm-all.pom
 # The source contains binary jars that cannot be verified for licensing and could be proprietary
-Source9:        generate-tarball.sh
+Source9:       generate-tarball.sh
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  javapackages-bootstrap
+BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
-%endif
+BuildRequires:  mvn(org.ow2:ow2:pom:)
+
+# asm-all needs to be in pluginpath for BND.  If this self-dependency
+# becomes a problem then ASM core will have to be build from source
+# with javac before main maven build, just like bnd-module-plugin
+BuildRequires:  objectweb-asm >= 6
 
 # Explicit javapackages-tools requires since asm-processor script uses
 # /usr/share/java-utils/java-functions
@@ -48,18 +54,72 @@ This package provides %{summary}.
 # A custom parent pom to aggregate the build
 cp -p %{SOURCE1} pom.xml
 
+%pom_disable_module asm-test
+
 # Insert poms into modules
 for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do
   cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml
-  %pom_remove_parent $pom
+  # Fix junit5 configuration
+  if [ "$pom" != "asm-test" ] ; then
+    # Make into OSGi bundles
+    bsn="org.objectweb.${pom//-/.}"
+    %pom_xpath_inject pom:project "<packaging>bundle</packaging>" $pom
+    %pom_add_plugin org.apache.felix:maven-bundle-plugin:3.5.0 $pom \
+"   <extensions>true</extensions>
+    <configuration>
+      <instructions>
+        <Bundle-SymbolicName>$bsn</Bundle-SymbolicName>
+        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+        <_removeheaders>Bnd-LastModified,Build-By,Created-By,Include-Resource,Require-Capability,Tool</_removeheaders>
+        <_pluginpath>$(pwd)/tools/bnd-module-plugin/bnd-module-plugin.jar, $(find-jar objectweb-asm/asm-all)</_pluginpath>
+        <_plugin>org.objectweb.asm.tools.ModuleInfoBndPlugin;</_plugin>
+      </instructions>
+    </configuration>"
+  fi
 done
 
+# Disable tests that use unlicensed class files
+sed -i -e '/testToByteArray_computeMaxs_largeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm/src/test/java/org/objectweb/asm/ClassWriterTest.java
+sed -i -e '/testAnalyze_mergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithBasicInterpreterTest.java
+sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java
+sed -i -e '/testAllMethods_issue317586/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java
+sed -i -e '/testAllMethods_anonymousInnerClass/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
+sed -i -e '/testAllMethods_emptyInterface/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
+sed -i -e '/testAllMethods_enum/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
+sed -i -e '/testAllMethods_class/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
+sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
+
+# Insert asm-all pom
+mkdir -p asm-all
+sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml
+
+# Remove invalid self-dependency
+%pom_remove_dep org.ow2.asm:asm-test asm-test
+
+# Compat aliases
+%mvn_alias :asm-all org.ow2.asm:asm-debug-all
+
 # No need to ship the custom parent pom
 %mvn_package :asm-aggregator __noinstall
 # Don't ship the test framework to avoid runtime dep on junit
 %mvn_package :asm-test __noinstall
 
 %build
+# Must compile bnd plugin first, which is used to generate Java 9 module-info.class files
+pushd tools/bnd-module-plugin
+javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath aqute-bnd) $(find -name *.java)
+jar cf bnd-module-plugin.jar -C src/main/java org
+popd
+
 %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
@@ -75,67 +135,12 @@ done
 %license LICENSE.txt
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.1-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.1-4
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.1-3
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.1-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Fri May 14 2021 Marian Koncek <mkoncek@redhat.com> - 9.1-1
-- Update to upstream version 9.1
-
-* Fri Feb 19 2021 Mat Booth <mat.booth@redhat.com> - 9.1-1
-- Update to latest upstream release
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Sep 25 2020 Marian Koncek <mkoncek@redhat.com> - 9.0-1
-- Update to upstream version 9.0
-
-* Fri Aug 14 2020 Jerry James <loganjerry@gmail.com> - 8.0.1-1
-- Version 8.0.1
-- Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test
-- Make generate-tarball.sh actually compress the tarball
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 7.3.1-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Jun 22 2020 Marian Koncek <mkoncek@redhat.com> - 8.0.1-1
-- Update to upstream version 8.0.1
-
-* Wed May 06 2020 Mat Booth <mat.booth@redhat.com> - 7.3.1-2
-- Revert an upstream change to prevent breaking API change
-
-* Thu Feb 27 2020 Jayashree Huttanagoudat <jhuttana@redhat.com> - 7.3.1-1
-- Upgraded to upstream version 7.3.1.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 21 2020 Marian Koncek <mkoncek@redhat.com> - 7.3.1-1
-- Update to upstream version 7.3.1
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.2-2
 - Mass rebuild for javapackages-tools 201902
 
 * Thu Oct 17 2019 Marian Koncek <mkoncek@redhat.com> - 7.2-1
 - Update to upstream version 7.2
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.1-2
 - Mass rebuild for javapackages-tools 201901