.gitignore

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

.objectweb-asm.metadata

@@ -1 +1 @@
-14f65ad9c14f09da3fe7fd3fefc99915801cc780 SOURCES/objectweb-asm-9.6.tar.gz
+d4c155b63b6482c19ddcd1b4f62f9af39a951213 SOURCES/objectweb-asm-9.1.tar.gz

SOURCES/aggregator.pom

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
-  xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.fedoraproject.xmvn.objectweb-asm</groupId>
-  <artifactId>aggregator</artifactId>
-  <version>any</version>
-  <packaging>pom</packaging>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <modules>
-    <module>asm</module>
-    <module>asm-analysis</module>
-    <module>asm-commons</module>
-    <module>asm-tree</module>
-    <module>asm-util</module>
-    <module>tools/retrofitter</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- Run the retrofitter tool which:
-          * downgrades the class bytecode version to 1.5
-          * generates module-info.class files in each .jar
-        -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>any</version>
-          <executions>
-            <execution>
-              <phase>process-classes</phase>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <configuration>
-                <target>
-                  <java classname="org.objectweb.asm.tools.Retrofitter" failonerror="true">
-                    <arg value="${project.build.directory}/classes"/>
-                    <arg value="${project.version}"/>
-                    <classpath>
-                      <path refid="maven.compile.classpath"/>
-                    </classpath>
-                  </java>
-                </target>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>

SOURCES/asm-9.1.pom

@@ -1,9 +1,9 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.6</version>
+  <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>
@@ -70,6 +70,6 @@
   <parent>
     <groupId>org.ow2</groupId>
     <artifactId>ow2</artifactId>
-    <version>1.5.1</version>
+    <version>1.5</version>
   </parent>
 </project>

SOURCES/asm-analysis-9.1.pom

@@ -1,9 +1,9 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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-analysis</artifactId>
-  <version>9.6</version>
+  <version>9.1</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 +71,13 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
   <parent>
     <groupId>org.ow2</groupId>
     <artifactId>ow2</artifactId>
-    <version>1.5.1</version>
+    <version>1.5</version>
   </parent>
 </project>

SOURCES/asm-commons-9.1.pom

@@ -1,9 +1,9 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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-commons</artifactId>
-  <version>9.6</version>
+  <version>9.1</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,19 +71,25 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
   <parent>
     <groupId>org.ow2</groupId>
     <artifactId>ow2</artifactId>
-    <version>1.5.1</version>
+    <version>1.5</version>
   </parent>
 </project>

SOURCES/asm-test-9.1.pom

@@ -1,9 +1,9 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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-test</artifactId>
-  <version>9.6</version>
+  <version>9.1</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 +71,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.1</version>
+      <version>5.7.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.1</version>
+      <version>5.7.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
   <parent>
     <groupId>org.ow2</groupId>
     <artifactId>ow2</artifactId>
-    <version>1.5.1</version>
+    <version>1.5</version>
   </parent>
 </project>

SOURCES/asm-tree-9.1.pom

@@ -1,9 +1,9 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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-tree</artifactId>
-  <version>9.6</version>
+  <version>9.1</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 +71,13 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
   <parent>
     <groupId>org.ow2</groupId>
     <artifactId>ow2</artifactId>
-    <version>1.5.1</version>
+    <version>1.5</version>
   </parent>
 </project>

SOURCES/asm-util-9.1.pom

@@ -1,9 +1,9 @@
 <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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-util</artifactId>
-  <version>9.6</version>
+  <version>9.1</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>
@@ -71,25 +71,25 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
-      <version>9.6</version>
+      <version>9.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
   <parent>
     <groupId>org.ow2</groupId>
     <artifactId>ow2</artifactId>
-    <version>1.5.1</version>
+    <version>1.5</version>
   </parent>
 </project>

SOURCES/parent.pom

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
+    xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.ow2.asm</groupId>
+    <artifactId>asm-aggregator</artifactId>
+    <version>1</version>
+
+    <packaging>pom</packaging>
+
+    <modules>
+      <module>asm</module>
+      <module>asm-analysis</module>
+      <module>asm-commons</module>
+      <module>asm-tree</module>
+      <module>asm-util</module>
+    </modules>
+</project>

SOURCES/tools-retrofitter.pom

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-  xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.fedoraproject.xmvn.objectweb-asm</groupId>
-  <artifactId>tools-retrofitter</artifactId>
-  <version>any</version>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>any</version>
-    </dependency>
-  </dependencies>
-</project>

SPECS/objectweb-asm.spec

@@ -1,17 +1,16 @@
 %bcond_with bootstrap
 
 Name:           objectweb-asm
-Version:        9.6
+Version:        9.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java bytecode manipulation and analysis framework
-License:        BSD-3-Clause
+License:        BSD
 URL:            https://asm.ow2.org/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
-Source1:        aggregator.pom
+Source1:        parent.pom
 Source2:        https://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
 Source4:        https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom
@@ -20,14 +19,10 @@ Source6:        https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/a
 Source7:        https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom
 # The source contains binary jars that cannot be verified for licensing and could be proprietary
 Source9:        generate-tarball.sh
-Source10:       tools-retrofitter.pom
 
+BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  maven-local
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires:  mvn(org.ow2.asm:asm)
 %endif
 
 # Explicit javapackages-tools requires since asm-processor script uses
@@ -50,26 +45,17 @@ This package provides %{summary}.
 %prep
 %setup -q
 
-# A custom pom to aggregate the build
+# A custom parent pom to aggregate the build
 cp -p %{SOURCE1} pom.xml
 
-cp -p %{SOURCE10} tools/retrofitter/pom.xml
-
 # 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
+  cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml
-  %pom_add_dep org.fedoraproject.xmvn.objectweb-asm:tools-retrofitter::provided ${pom}
+  %pom_remove_parent $pom
-  %pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ${pom}
-  %pom_set_parent org.fedoraproject.xmvn.objectweb-asm:aggregator:any ${pom}
-  %pom_xpath_inject pom:parent '<relativePath>..</relativePath>' ${pom}
 done
 
-%pom_add_dep org.ow2.asm:asm-tree:%{version} asm-analysis
+# No need to ship the custom parent pom
-
+%mvn_package :asm-aggregator __noinstall
-# Don't ship poms used for build only
-%mvn_package :aggregator __noinstall
-%mvn_package :tools-retrofitter __noinstall
-
 # Don't ship the test framework to avoid runtime dep on junit
 %mvn_package :asm-test __noinstall
 
@@ -89,63 +75,18 @@ done
 %license LICENSE.txt
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 9.6-5
+* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 9.1-6
-- Rebuilt for MSVSphere 10
+- Rebuild with regenerated Requires on Java
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 9.6-5
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 9.6-4
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 11 2023 Marian Koncek <mkoncek@redhat.com> - 9.6-1
-- Update to upstream version 9.6
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.5-3
-- Convert License tag to SPDX format
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jun 05 2023 Marian Koncek <mkoncek@redhat.com> - 9.5-1
-- Update to upstream  version 9.5
-
-* Thu Feb 23 2023 Marian Koncek <mkoncek@redhat.com> - 9.4-1
-- Update to upstream version 9.4
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Sep 02 2022 Marian Koncek <mkoncek@redhat.com> - 9.3-4
-- Fix wrong generated module infos
-
-* Mon Aug 29 2022 Marian Koncek <mkoncek@redhat.com> - 9.3-3
-- Generate module-info without bnd-plugin
-- Resolves: rhbz#2106272
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 09 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.3-1
-- Update to upstream version 9.3
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 9.2-3
-- Rebuilt for java-17-openjdk as system jdk
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.2-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.2-1
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.1-4
-- Update to upstream version 9.2
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.1-3
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 9.1-2
 - Bootstrap build