From 6b9926441199c20e46ca1609b139b0cbbaeb3bf52beaed9d5c9605d949013fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:53:50 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main objectweb-asm revision f20b58f6831c4e1b4db0901e976f7a8f --- _service | 20 ++++++++++++++ asm-9.6.pom => asm-9.7.pom | 2 +- asm-analysis-9.6.pom => asm-analysis-9.7.pom | 4 +-- asm-commons-9.6.pom => asm-commons-9.7.pom | 6 ++--- asm-test-9.6.pom => asm-test-9.7.pom | 6 ++--- asm-tree-9.6.pom => asm-tree-9.7.pom | 4 +-- asm-util-9.6.pom => asm-util-9.7.pom | 8 +++--- generate-tarball.sh | 28 -------------------- objectweb-asm-9.6-build.tar.xz | 3 --- objectweb-asm-9.6.tar.xz | 3 --- objectweb-asm-9.7.tar.xz | 3 +++ objectweb-asm-build.tar.xz | 3 +++ objectweb-asm.changes | 12 +++++++++ objectweb-asm.spec | 23 ++++++++-------- 14 files changed, 65 insertions(+), 60 deletions(-) create mode 100644 _service rename asm-9.6.pom => asm-9.7.pom (98%) rename asm-analysis-9.6.pom => asm-analysis-9.7.pom (97%) rename asm-commons-9.6.pom => asm-commons-9.7.pom (97%) rename asm-test-9.6.pom => asm-test-9.7.pom (96%) rename asm-tree-9.6.pom => asm-tree-9.7.pom (97%) rename asm-util-9.6.pom => asm-util-9.7.pom (96%) delete mode 100644 generate-tarball.sh delete mode 100644 objectweb-asm-9.6-build.tar.xz delete mode 100644 objectweb-asm-9.6.tar.xz create mode 100644 objectweb-asm-9.7.tar.xz create mode 100644 objectweb-asm-build.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..bec4edd --- /dev/null +++ b/_service @@ -0,0 +1,20 @@ + + + git + https://gitlab.ow2.org/asm/asm.git + ASM_9_7 + ASM_* + @PARENT_TAG@ + ASM_(\d+)_(\d+) + \1.\2 + **/*.jar + asm{,-analysis,-commons}/**/*.class + gradle + objectweb-asm + + + *.tar + xz + + + diff --git a/asm-9.6.pom b/asm-9.7.pom similarity index 98% rename from asm-9.6.pom rename to asm-9.7.pom index 751f77a..ff06503 100644 --- a/asm-9.6.pom +++ b/asm-9.7.pom @@ -3,7 +3,7 @@ 4.0.0 org.ow2.asm asm - 9.6 + 9.7 asm ASM, a very small and fast Java bytecode manipulation framework http://asm.ow2.io/ diff --git a/asm-analysis-9.6.pom b/asm-analysis-9.7.pom similarity index 97% rename from asm-analysis-9.6.pom rename to asm-analysis-9.7.pom index 5dc2f32..d31c81c 100644 --- a/asm-analysis-9.6.pom +++ b/asm-analysis-9.7.pom @@ -3,7 +3,7 @@ 4.0.0 org.ow2.asm asm-analysis - 9.6 + 9.7 asm-analysis Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework http://asm.ow2.io/ @@ -71,7 +71,7 @@ org.ow2.asm asm-tree - 9.6 + 9.7 compile diff --git a/asm-commons-9.6.pom b/asm-commons-9.7.pom similarity index 97% rename from asm-commons-9.6.pom rename to asm-commons-9.7.pom index f14f8bd..aef79c0 100644 --- a/asm-commons-9.6.pom +++ b/asm-commons-9.7.pom @@ -3,7 +3,7 @@ 4.0.0 org.ow2.asm asm-commons - 9.6 + 9.7 asm-commons Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework http://asm.ow2.io/ @@ -71,13 +71,13 @@ org.ow2.asm asm - 9.6 + 9.7 compile org.ow2.asm asm-tree - 9.6 + 9.7 compile diff --git a/asm-test-9.6.pom b/asm-test-9.7.pom similarity index 96% rename from asm-test-9.6.pom rename to asm-test-9.7.pom index 3a3cd4e..cf80009 100644 --- a/asm-test-9.6.pom +++ b/asm-test-9.7.pom @@ -3,7 +3,7 @@ 4.0.0 org.ow2.asm asm-test - 9.6 + 9.7 asm-test Utilities for testing ASM, a very small and fast Java bytecode manipulation framework http://asm.ow2.io/ @@ -71,13 +71,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.1 + 5.10.1 compile org.junit.jupiter junit-jupiter-params - 5.9.1 + 5.10.1 compile diff --git a/asm-tree-9.6.pom b/asm-tree-9.7.pom similarity index 97% rename from asm-tree-9.6.pom rename to asm-tree-9.7.pom index f696e21..ff395da 100644 --- a/asm-tree-9.6.pom +++ b/asm-tree-9.7.pom @@ -3,7 +3,7 @@ 4.0.0 org.ow2.asm asm-tree - 9.6 + 9.7 asm-tree Tree API of ASM, a very small and fast Java bytecode manipulation framework http://asm.ow2.io/ @@ -71,7 +71,7 @@ org.ow2.asm asm - 9.6 + 9.7 compile diff --git a/asm-util-9.6.pom b/asm-util-9.7.pom similarity index 96% rename from asm-util-9.6.pom rename to asm-util-9.7.pom index 3b1c78c..e0d2069 100644 --- a/asm-util-9.6.pom +++ b/asm-util-9.7.pom @@ -3,7 +3,7 @@ 4.0.0 org.ow2.asm asm-util - 9.6 + 9.7 asm-util Utilities for ASM, a very small and fast Java bytecode manipulation framework http://asm.ow2.io/ @@ -71,19 +71,19 @@ org.ow2.asm asm - 9.6 + 9.7 compile org.ow2.asm asm-tree - 9.6 + 9.7 compile org.ow2.asm asm-analysis - 9.6 + 9.7 compile diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100644 index 17813dd..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -e - -name=objectweb-asm -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" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xzf "../${name}-${version}.orig.tar.gz" - -# Rename dir not to contain commit -mv asm-${gittag} ${name}-${version} - -# CLEAN TARBALL -# Remove all jar files -find -name '*.jar' -delete -# Remove all class files except those in asm-test, which are shipped alongside appropriately licensed source -find */asm{,-analysis,-commons} -name '*.class' -delete -rm -r */gradle - -tar -cJf "../${name}-${version}.tar.xz" * -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/objectweb-asm-9.6-build.tar.xz b/objectweb-asm-9.6-build.tar.xz deleted file mode 100644 index c403f7f..0000000 --- a/objectweb-asm-9.6-build.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8b421379730cd9d8468b98245a878436f7018435cecab895afbc2db0bd6a303 -size 2756 diff --git a/objectweb-asm-9.6.tar.xz b/objectweb-asm-9.6.tar.xz deleted file mode 100644 index f9d1090..0000000 --- a/objectweb-asm-9.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c4feeebfb5f641104a0434c2094311955ac6845f5211576321a1977ab3bd685 -size 573256 diff --git a/objectweb-asm-9.7.tar.xz b/objectweb-asm-9.7.tar.xz new file mode 100644 index 0000000..f03cbf3 --- /dev/null +++ b/objectweb-asm-9.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:973050f895660eaa266c9213755d68d6394850218118d6bce5bf8a85d36bbf10 +size 613396 diff --git a/objectweb-asm-build.tar.xz b/objectweb-asm-build.tar.xz new file mode 100644 index 0000000..dddffb9 --- /dev/null +++ b/objectweb-asm-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56aa24dad579c7a53a6897afd26670b2a9a77afdb2618190cd67db73319576cf +size 3260 diff --git a/objectweb-asm.changes b/objectweb-asm.changes index 1b8f653..ddfa4b9 100644 --- a/objectweb-asm.changes +++ b/objectweb-asm.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 15 11:18:14 UTC 2024 - Fridrich Strba + +- Upgrade to version 9.7 + * new Opcodes.V23 constant for Java 23 + * bug fixes + + 318009: Unit test regression in dex2jar. + + 318007: 'ClassNode#outerClass' has incorrect JavaDocs. + + 318006: asm-bom packaging should be 'pom'. + + 318003: The Textifier prints a supplementary space at the end + of each method that throws at least one exception. + ------------------------------------------------------------------- Tue Oct 17 05:26:11 UTC 2023 - Anton Shvetz diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 9f050b2..1ace80d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ # # spec file for package objectweb-asm # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # +%define __requires_exclude java-headless Name: objectweb-asm -Version: 9.6 +Version: 9.7 Release: 0 Summary: Java bytecode manipulation framework License: BSD-3-Clause Group: Development/Libraries/Java URL: http://asm.objectweb.org/ -# ./generate-tarball.sh Source0: %{name}-%{version}.tar.xz -Source1: %{name}-%{version}-build.tar.xz +Source1: %{name}-build.tar.xz 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 @@ -35,13 +35,14 @@ Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/a # 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 Source9: asm-all.pom -# The source contains binary jars that cannot be verified for licensing and could be proprietary -Source10: generate-tarball.sh BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: java-devel >= 9 +BuildRequires: javapackages-local >= 6 BuildRequires: xz +Requires: java >= 1.8 +# For the script +Requires: javapackages-tools Obsoletes: %{name}-examples BuildArch: noarch @@ -103,7 +104,7 @@ for i in asm asm-analysis asm-commons asm-tree asm-util asm-all; do done %build -%ant -Dproject.version=%{version} \ +%{ant} -Dproject.version=%{version} \ package javadoc %install @@ -116,10 +117,10 @@ done # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} for i in asm asm-analysis asm-commons asm-tree asm-util; do - install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar done -install -pm 0644 asm-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/asm-all.pom +%{mvn_install_pom} asm-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/asm-all.pom %add_maven_depmap %{name}/asm-all.pom %{name}/asm-all.jar -a org.ow2.asm:asm-debug-all # javadoc