Accepting request 1174341 from Java:packages

9.7

OBS-URL: https://build.opensuse.org/request/show/1174341
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/objectweb-asm?expand=0&rev=28

_service

@@ -0,0 +1,20 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://gitlab.ow2.org/asm/asm.git</param>
+		<param name="revision">ASM_9_7</param>
+		<param name="match-tag">ASM_*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">ASM_(\d+)_(\d+)</param>
+		<param name="versionrewrite-replacement">\1.\2</param>
+        <param name="exclude">**/*.jar</param>
+        <param name="exclude">asm{,-analysis,-commons}/**/*.class</param>
+        <param name="exclude">gradle</param>
+		<param name="filename">objectweb-asm</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

asm-9.7.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm</artifactId>
-  <version>9.6</version>
+  <version>9.7</version>
   <name>asm</name>
   <description>ASM, a very small and fast Java bytecode manipulation framework</description>
   <url>http://asm.ow2.io/</url>

asm-analysis-9.7.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-analysis</artifactId>
-  <version>9.6</version>
+  <version>9.7</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,7 +71,7 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

asm-commons-9.7.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-commons</artifactId>
-  <version>9.6</version>
+  <version>9.7</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,13 +71,13 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

asm-test-9.7.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-test</artifactId>
-  <version>9.6</version>
+  <version>9.7</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,13 +71,13 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.1</version>
+      <version>5.10.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.1</version>
+      <version>5.10.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

asm-tree-9.7.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-tree</artifactId>
-  <version>9.6</version>
+  <version>9.7</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,7 +71,7 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

asm-util-9.7.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.ow2.asm</groupId>
   <artifactId>asm-util</artifactId>
-  <version>9.6</version>
+  <version>9.7</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,19 +71,19 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
-      <version>9.6</version>
+      <version>9.7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

generate-tarball.sh

@@ -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"

objectweb-asm.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed May 15 11:18:14 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <shvetz.anton@gmail.com>
 

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:  java-devel >= 9
-BuildRequires:  javapackages-local
+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