diff --git a/.gitignore b/.gitignore
index e55c816..962f1d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/objectweb-asm-7.2.tar.gz
+SOURCES/objectweb-asm-9.7.1.tar.gz
diff --git a/.objectweb-asm.metadata b/.objectweb-asm.metadata
index 848a7b8..7de86b2 100644
--- a/.objectweb-asm.metadata
+++ b/.objectweb-asm.metadata
@@ -1 +1 @@
-35d476b1dace20fd180269067a06f7c7b1c1932a SOURCES/objectweb-asm-7.2.tar.gz
+7aa64fdfc299c0c31dae34f87db45c5446ffbcdc SOURCES/objectweb-asm-9.7.1.tar.gz
diff --git a/SOURCES/aggregator.pom b/SOURCES/aggregator.pom
new file mode 100644
index 0000000..f267e26
--- /dev/null
+++ b/SOURCES/aggregator.pom
@@ -0,0 +1,58 @@
+
+
+ 4.0.0
+
+ org.fedoraproject.xmvn.objectweb-asm
+ aggregator
+ any
+ pom
+
+
+ UTF-8
+
+
+
+ asm
+ asm-analysis
+ asm-commons
+ asm-tree
+ asm-util
+ tools/retrofitter
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ any
+
+
+ process-classes
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SOURCES/asm-9.7.1.pom b/SOURCES/asm-9.7.1.pom
new file mode 100644
index 0000000..103a5ce
--- /dev/null
+++ b/SOURCES/asm-9.7.1.pom
@@ -0,0 +1,75 @@
+
+
+ 4.0.0
+ org.ow2.asm
+ asm
+ 9.7.1
+ asm
+ ASM, a very small and fast Java bytecode manipulation framework
+ http://asm.ow2.io/
+ 2000
+
+ OW2
+ http://www.ow2.org/
+
+
+
+ BSD-3-Clause
+ https://asm.ow2.io/license.html
+
+
+
+
+ ebruneton
+ Eric Bruneton
+ ebruneton@free.fr
+
+ Creator
+ Java Developer
+
+
+
+ eu
+ Eugene Kuleshov
+ eu@javatx.org
+
+ Java Developer
+
+
+
+ forax
+ Remi Forax
+ forax@univ-mlv.fr
+
+ Java Developer
+
+
+
+
+
+ ASM Users List
+ https://mail.ow2.org/wws/subscribe/asm
+ asm@objectweb.org
+ https://mail.ow2.org/wws/arc/asm/
+
+
+ ASM Team List
+ https://mail.ow2.org/wws/subscribe/asm-team
+ asm-team@objectweb.org
+ https://mail.ow2.org/wws/arc/asm-team/
+
+
+
+ scm:git:https://gitlab.ow2.org/asm/asm/
+ scm:git:https://gitlab.ow2.org/asm/asm/
+ https://gitlab.ow2.org/asm/asm/
+
+
+ https://gitlab.ow2.org/asm/asm/issues
+
+
+ org.ow2
+ ow2
+ 1.5.1
+
+
diff --git a/SOURCES/asm-all.pom b/SOURCES/asm-all.pom
deleted file mode 100644
index 230058b..0000000
--- a/SOURCES/asm-all.pom
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
- 4.0.0
-
- org.ow2
- ow2
- 1.5
-
- org.ow2.asm
- asm-all
- @VERSION@
-
-
- org.ow2.asm
- asm
- @VERSION@
-
-
- org.ow2.asm
- asm-analysis
- @VERSION@
-
-
- org.ow2.asm
- asm-commons
- @VERSION@
-
-
- org.ow2.asm
- asm-tree
- @VERSION@
-
-
- org.ow2.asm
- asm-tree
- @VERSION@
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.1.1
-
-
- package
-
- shade
-
-
-
-
-
-
-
diff --git a/SOURCES/asm-analysis-7.2.pom b/SOURCES/asm-analysis-9.7.1.pom
similarity index 73%
rename from SOURCES/asm-analysis-7.2.pom
rename to SOURCES/asm-analysis-9.7.1.pom
index 9199beb..15f5d29 100644
--- a/SOURCES/asm-analysis-7.2.pom
+++ b/SOURCES/asm-analysis-9.7.1.pom
@@ -1,15 +1,9 @@
-
+
4.0.0
-
- org.ow2
- ow2
- 1.5
-
org.ow2.asm
asm-analysis
- 7.2
+ 9.7.1
asm-analysis
Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework
http://asm.ow2.io/
@@ -77,26 +71,13 @@
org.ow2.asm
asm-tree
- 7.2
+ 9.7.1
compile
-
- org.ow2.asm
- asm-test
- 7.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- 5.3.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- 5.3.2
- test
-
+
+ org.ow2
+ ow2
+ 1.5.1
+
diff --git a/SOURCES/asm-commons-7.2.pom b/SOURCES/asm-commons-7.2.pom
deleted file mode 100644
index 0f8b775..0000000
--- a/SOURCES/asm-commons-7.2.pom
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
- 4.0.0
-
- org.ow2
- ow2
- 1.5
-
- org.ow2.asm
- asm-commons
- 7.2
- asm-commons
- Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework
- http://asm.ow2.io/
- 2000
-
- OW2
- http://www.ow2.org/
-
-
-
- BSD-3-Clause
- https://asm.ow2.io/license.html
-
-
-
-
- ebruneton
- Eric Bruneton
- ebruneton@free.fr
-
- Creator
- Java Developer
-
-
-
- eu
- Eugene Kuleshov
- eu@javatx.org
-
- Java Developer
-
-
-
- forax
- Remi Forax
- forax@univ-mlv.fr
-
- Java Developer
-
-
-
-
-
- ASM Users List
- https://mail.ow2.org/wws/subscribe/asm
- asm@objectweb.org
- https://mail.ow2.org/wws/arc/asm/
-
-
- ASM Team List
- https://mail.ow2.org/wws/subscribe/asm-team
- asm-team@objectweb.org
- https://mail.ow2.org/wws/arc/asm-team/
-
-
-
- scm:git:https://gitlab.ow2.org/asm/asm/
- scm:git:https://gitlab.ow2.org/asm/asm/
- https://gitlab.ow2.org/asm/asm/
-
-
- https://gitlab.ow2.org/asm/asm/issues
-
-
-
- org.ow2.asm
- asm
- 7.2
- compile
-
-
- org.ow2.asm
- asm-tree
- 7.2
- compile
-
-
- org.ow2.asm
- asm-analysis
- 7.2
- compile
-
-
- org.ow2.asm
- asm-util
- 7.2
- test
-
-
- org.ow2.asm
- asm-test
- 7.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- 5.3.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- 5.3.2
- test
-
-
-
diff --git a/SOURCES/asm-commons-9.7.1.pom b/SOURCES/asm-commons-9.7.1.pom
new file mode 100644
index 0000000..27a9234
--- /dev/null
+++ b/SOURCES/asm-commons-9.7.1.pom
@@ -0,0 +1,89 @@
+
+
+ 4.0.0
+ org.ow2.asm
+ asm-commons
+ 9.7.1
+ asm-commons
+ Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework
+ http://asm.ow2.io/
+ 2000
+
+ OW2
+ http://www.ow2.org/
+
+
+
+ BSD-3-Clause
+ https://asm.ow2.io/license.html
+
+
+
+
+ ebruneton
+ Eric Bruneton
+ ebruneton@free.fr
+
+ Creator
+ Java Developer
+
+
+
+ eu
+ Eugene Kuleshov
+ eu@javatx.org
+
+ Java Developer
+
+
+
+ forax
+ Remi Forax
+ forax@univ-mlv.fr
+
+ Java Developer
+
+
+
+
+
+ ASM Users List
+ https://mail.ow2.org/wws/subscribe/asm
+ asm@objectweb.org
+ https://mail.ow2.org/wws/arc/asm/
+
+
+ ASM Team List
+ https://mail.ow2.org/wws/subscribe/asm-team
+ asm-team@objectweb.org
+ https://mail.ow2.org/wws/arc/asm-team/
+
+
+
+ scm:git:https://gitlab.ow2.org/asm/asm/
+ scm:git:https://gitlab.ow2.org/asm/asm/
+ https://gitlab.ow2.org/asm/asm/
+
+
+ https://gitlab.ow2.org/asm/asm/issues
+
+
+
+ org.ow2.asm
+ asm
+ 9.7.1
+ compile
+
+
+ org.ow2.asm
+ asm-tree
+ 9.7.1
+ compile
+
+
+
+ org.ow2
+ ow2
+ 1.5.1
+
+
diff --git a/SOURCES/asm-test-7.2.pom b/SOURCES/asm-test-9.7.1.pom
similarity index 83%
rename from SOURCES/asm-test-7.2.pom
rename to SOURCES/asm-test-9.7.1.pom
index 0e6aa5b..2468892 100644
--- a/SOURCES/asm-test-7.2.pom
+++ b/SOURCES/asm-test-9.7.1.pom
@@ -1,15 +1,9 @@
-
+
4.0.0
-
- org.ow2
- ow2
- 1.5
-
org.ow2.asm
asm-test
- 7.2
+ 9.7.1
asm-test
Utilities for testing ASM, a very small and fast Java bytecode manipulation framework
http://asm.ow2.io/
@@ -77,20 +71,19 @@
org.junit.jupiter
junit-jupiter-api
- 5.3.2
+ 5.10.1
compile
org.junit.jupiter
junit-jupiter-params
- 5.3.2
+ 5.10.1
compile
-
- org.ow2.asm
- asm-test
- 7.2
- test
-
+
+ org.ow2
+ ow2
+ 1.5.1
+
diff --git a/SOURCES/asm-tree-7.2.pom b/SOURCES/asm-tree-9.7.1.pom
similarity index 73%
rename from SOURCES/asm-tree-7.2.pom
rename to SOURCES/asm-tree-9.7.1.pom
index 03903be..b3257be 100644
--- a/SOURCES/asm-tree-7.2.pom
+++ b/SOURCES/asm-tree-9.7.1.pom
@@ -1,15 +1,9 @@
-
+
4.0.0
-
- org.ow2
- ow2
- 1.5
-
org.ow2.asm
asm-tree
- 7.2
+ 9.7.1
asm-tree
Tree API of ASM, a very small and fast Java bytecode manipulation framework
http://asm.ow2.io/
@@ -77,26 +71,13 @@
org.ow2.asm
asm
- 7.2
+ 9.7.1
compile
-
- org.ow2.asm
- asm-test
- 7.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- 5.3.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- 5.3.2
- test
-
+
+ org.ow2
+ ow2
+ 1.5.1
+
diff --git a/SOURCES/asm-util-7.2.pom b/SOURCES/asm-util-7.2.pom
deleted file mode 100644
index 1dde338..0000000
--- a/SOURCES/asm-util-7.2.pom
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
- 4.0.0
-
- org.ow2
- ow2
- 1.5
-
- org.ow2.asm
- asm-util
- 7.2
- asm-util
- Utilities for ASM, a very small and fast Java bytecode manipulation framework
- http://asm.ow2.io/
- 2000
-
- OW2
- http://www.ow2.org/
-
-
-
- BSD-3-Clause
- https://asm.ow2.io/license.html
-
-
-
-
- ebruneton
- Eric Bruneton
- ebruneton@free.fr
-
- Creator
- Java Developer
-
-
-
- eu
- Eugene Kuleshov
- eu@javatx.org
-
- Java Developer
-
-
-
- forax
- Remi Forax
- forax@univ-mlv.fr
-
- Java Developer
-
-
-
-
-
- ASM Users List
- https://mail.ow2.org/wws/subscribe/asm
- asm@objectweb.org
- https://mail.ow2.org/wws/arc/asm/
-
-
- ASM Team List
- https://mail.ow2.org/wws/subscribe/asm-team
- asm-team@objectweb.org
- https://mail.ow2.org/wws/arc/asm-team/
-
-
-
- scm:git:https://gitlab.ow2.org/asm/asm/
- scm:git:https://gitlab.ow2.org/asm/asm/
- https://gitlab.ow2.org/asm/asm/
-
-
- https://gitlab.ow2.org/asm/asm/issues
-
-
-
- org.ow2.asm
- asm
- 7.2
- compile
-
-
- org.ow2.asm
- asm-tree
- 7.2
- compile
-
-
- org.ow2.asm
- asm-analysis
- 7.2
- compile
-
-
- org.codehaus.janino
- janino
- 3.0.11
- test
-
-
- org.ow2.asm
- asm-test
- 7.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-api
- 5.3.2
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- 5.3.2
- test
-
-
-
diff --git a/SOURCES/asm-7.2.pom b/SOURCES/asm-util-9.7.1.pom
similarity index 72%
rename from SOURCES/asm-7.2.pom
rename to SOURCES/asm-util-9.7.1.pom
index ce2dd2e..ba37879 100644
--- a/SOURCES/asm-7.2.pom
+++ b/SOURCES/asm-util-9.7.1.pom
@@ -1,17 +1,11 @@
-
+
4.0.0
-
- org.ow2
- ow2
- 1.5
-
org.ow2.asm
- asm
- 7.2
- asm
- ASM, a very small and fast Java bytecode manipulation framework
+ asm-util
+ 9.7.1
+ asm-util
+ Utilities for ASM, a very small and fast Java bytecode manipulation framework
http://asm.ow2.io/
2000
@@ -76,21 +70,26 @@
org.ow2.asm
- asm-test
- 7.2
- test
+ asm
+ 9.7.1
+ compile
- org.junit.jupiter
- junit-jupiter-api
- 5.3.2
- test
+ org.ow2.asm
+ asm-tree
+ 9.7.1
+ compile
- org.junit.jupiter
- junit-jupiter-params
- 5.3.2
- test
+ org.ow2.asm
+ asm-analysis
+ 9.7.1
+ compile
+
+ org.ow2
+ ow2
+ 1.5.1
+
diff --git a/SOURCES/generate-tarball.sh b/SOURCES/generate-tarball.sh
index 255d107..b5a3d3a 100755
--- a/SOURCES/generate-tarball.sh
+++ b/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/repository/${gittag}/archive.tar.gz#/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+wget "https://gitlab.ow2.org/asm/asm/-/archive/${gittag}/asm-${gittag}.tar.gz" -O "${name}-${version}.orig.tar.gz"
rm -rf tarball-tmp
mkdir tarball-tmp
-cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+pushd tarball-tmp
+tar -xzf "../${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 cf "../${name}-${version}.tar.gz" *
-cd ..
+tar -czf "../${name}-${version}.tar.gz" *
+popd
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
diff --git a/SOURCES/parent.pom b/SOURCES/parent.pom
deleted file mode 100644
index 8cfbb70..0000000
--- a/SOURCES/parent.pom
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- 4.0.0
-
- org.ow2.asm
- asm-aggregator
- 1
-
- pom
-
-
- asm
- asm-analysis
- asm-commons
- asm-test
- asm-tree
- asm-util
- asm-all
-
-
diff --git a/SOURCES/tools-retrofitter.pom b/SOURCES/tools-retrofitter.pom
new file mode 100644
index 0000000..bd1f813
--- /dev/null
+++ b/SOURCES/tools-retrofitter.pom
@@ -0,0 +1,18 @@
+
+
+ 4.0.0
+
+ org.fedoraproject.xmvn.objectweb-asm
+ tools-retrofitter
+ any
+ jar
+
+
+
+ org.ow2.asm
+ asm
+ any
+
+
+
diff --git a/SPECS/objectweb-asm.spec b/SPECS/objectweb-asm.spec
index c75fdd0..1628b34 100644
--- a/SPECS/objectweb-asm.spec
+++ b/SPECS/objectweb-asm.spec
@@ -1,39 +1,34 @@
+%bcond_with bootstrap
+
Name: objectweb-asm
-Version: 7.2
-Release: 2%{?dist}
+Version: 9.7.1
+Release: 4%{?dist}
Summary: Java bytecode manipulation and analysis framework
-License: BSD
-URL: http://asm.ow2.org/
+License: BSD-3-Clause
+URL: https://asm.ow2.org/
BuildArch: noarch
+ExclusiveArch: %{java_arches} noarch
# ./generate-tarball.sh
Source0: %{name}-%{version}.tar.gz
-Source1: parent.pom
-Source2: http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom
-Source3: http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom
-Source4: http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom
-Source5: http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom
-Source6: http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{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
+Source1: aggregator.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
+Source5: https://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
+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
+Source9: generate-tarball.sh
+Source10: tools-retrofitter.pom
+%if %{with bootstrap}
+BuildRequires: javapackages-bootstrap
+%else
BuildRequires: maven-local
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
-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
-Requires: javapackages-tools
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires: mvn(org.ow2.asm:asm)
+%endif
%description
ASM is an all purpose Java bytecode manipulation and analysis
@@ -42,84 +37,39 @@ generate classes, directly in binary form. Provided common
transformations and analysis algorithms allow to easily assemble
custom complex transformations and code analysis tools.
-%package javadoc
+%package javadoc
Summary: API documentation for %{name}
-%description javadoc
-This package provides %{summary}.
+%description javadoc
+API documentation for %{name}.
%prep
-%setup -q
+%autosetup -p1
-# A custom parent pom to aggregate the build
+# A custom pom to aggregate the build
cp -p %{SOURCE1} pom.xml
-%pom_disable_module asm-test
+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
- # Fix junit5 configuration
- if [ "$pom" != "asm-test" ] ; then
- # Make into OSGi bundles
- bsn="org.objectweb.${pom//-/.}"
- %pom_xpath_inject pom:project "bundle" $pom
- %pom_add_plugin org.apache.felix:maven-bundle-plugin:3.5.0 $pom \
-" true
-
-
- $bsn
- JavaSE-1.8
- <_removeheaders>Bnd-LastModified,Build-By,Created-By,Include-Resource,Require-Capability,Tool
- <_pluginpath>$(pwd)/tools/bnd-module-plugin/bnd-module-plugin.jar, $(find-jar objectweb-asm/asm-all)
- <_plugin>org.objectweb.asm.tools.ModuleInfoBndPlugin;
-
- "
- fi
+ cp -p ${RPM_SOURCE_DIR}/${pom}-%{version}.pom ${pom}/pom.xml
+ %pom_add_dep org.fedoraproject.xmvn.objectweb-asm:tools-retrofitter::provided ${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 '..' ${pom}
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
+%pom_add_dep org.ow2.asm:asm-tree:%{version} asm-analysis
-# Insert asm-all pom
-mkdir -p asm-all
-sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml
+# Don't ship poms used for build only
+%mvn_package :aggregator __noinstall
+%mvn_package :tools-retrofitter __noinstall
-# 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
@@ -135,12 +85,126 @@ popd
%license LICENSE.txt
%changelog
+* Fri Nov 29 2024 Mikolaj Izdebski - 9.7.1-2
+- Drop explicit requires on javapackages-tools
+
+* Mon Oct 07 2024 Mikolaj Izdebski - 9.7.1-1
+- Update to upstream version 9.7.1
+- Resolves: rhbz#2316766
+
+* Fri Aug 23 2024 Mikolaj Izdebski - 9.7-1
+- Update to upstream version 9.7
+- Resolves: rhbz#2271211
+
+* Thu Jul 18 2024 Fedora Release Engineering - 9.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek - 9.6-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek - 9.6-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Thu Jan 25 2024 Fedora Release Engineering - 9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering - 9.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 11 2023 Marian Koncek - 9.6-1
+- Update to upstream version 9.6
+
+* Fri Sep 01 2023 Mikolaj Izdebski - 9.5-3
+- Convert License tag to SPDX format
+
+* Thu Jul 20 2023 Fedora Release Engineering - 9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jun 05 2023 Marian Koncek - 9.5-1
+- Update to upstream version 9.5
+
+* Thu Feb 23 2023 Marian Koncek - 9.4-1
+- Update to upstream version 9.4
+
+* Thu Jan 19 2023 Fedora Release Engineering - 9.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 02 2022 Marian Koncek - 9.3-4
+- Fix wrong generated module infos
+
+* Mon Aug 29 2022 Marian Koncek - 9.3-3
+- Generate module-info without bnd-plugin
+- Resolves: rhbz#2106272
+
+* Fri Jul 22 2022 Fedora Release Engineering - 9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 09 2022 Mikolaj Izdebski - 9.3-1
+- Update to upstream version 9.3
+
+* Sat Feb 05 2022 Jiri Vanek - 9.2-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering - 9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski - 9.2-1
+- Update to upstream version 9.2
+
+* Thu Jul 22 2021 Fedora Release Engineering - 9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski - 9.1-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Fri May 14 2021 Marian Koncek - 9.1-1
+- Update to upstream version 9.1
+
+* Fri Feb 19 2021 Mat Booth - 9.1-1
+- Update to latest upstream release
+
+* Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Sep 25 2020 Marian Koncek - 9.0-1
+- Update to upstream version 9.0
+
+* Fri Aug 14 2020 Jerry James - 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 - 7.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek - 7.3.1-3
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Mon Jun 22 2020 Marian Koncek - 8.0.1-1
+- Update to upstream version 8.0.1
+
+* Wed May 06 2020 Mat Booth - 7.3.1-2
+- Revert an upstream change to prevent breaking API change
+
+* Thu Feb 27 2020 Jayashree Huttanagoudat - 7.3.1-1
+- Upgraded to upstream version 7.3.1.
+
+* Wed Jan 29 2020 Fedora Release Engineering - 7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 21 2020 Marian Koncek - 7.3.1-1
+- Update to upstream version 7.3.1
+
* Tue Nov 05 2019 Mikolaj Izdebski - 7.2-2
- Mass rebuild for javapackages-tools 201902
* Thu Oct 17 2019 Marian Koncek - 7.2-1
- Update to upstream version 7.2
+* Thu Jul 25 2019 Fedora Release Engineering - 7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Fri May 24 2019 Mikolaj Izdebski - 7.1-2
- Mass rebuild for javapackages-tools 201901
@@ -318,13 +382,13 @@ popd
* Fri Feb 08 2008 Ralph Apel - 0:3.1-3jpp
- Add poms and depmap frags with groupId of org.objectweb.asm !
-- Add asm-all.jar
+- Add asm-all.jar
- Add -javadoc Requires post and postun
- Restore Vendor, Distribution
* Thu Nov 22 2007 Fernando Nasser - 0:3.1-2jpp
- Fix EOL of txt files
-- Add dependency on jaxp
+- Add dependency on jaxp
* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp
- Upgrade to 3.1