From 4442396bcab380c50fda816e5b6c6bee3e0f7bb0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 19 Mar 2026 12:56:21 +0100 Subject: [PATCH] Update bundled ASM bytecode versions up to Java 25 Resolves: RHEL-154034 --- ...-ASM-bytecode-versions-up-to-Java-25.patch | 56 +++++++++++++++++++ sisu.spec | 15 +++-- 2 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 Update-bundled-ASM-bytecode-versions-up-to-Java-25.patch diff --git a/Update-bundled-ASM-bytecode-versions-up-to-Java-25.patch b/Update-bundled-ASM-bytecode-versions-up-to-Java-25.patch new file mode 100644 index 0000000..0bce372 --- /dev/null +++ b/Update-bundled-ASM-bytecode-versions-up-to-Java-25.patch @@ -0,0 +1,56 @@ +From 2d8e18b56c7d3ef99b41a345d899d6c49baaf805 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 19 Mar 2026 12:27:10 +0100 +Subject: [PATCH] Update bundled ASM bytecode versions up to Java 25 + +--- + .../eclipse/sisu/space/asm/ClassReader.java | 2 +- + .../org/eclipse/sisu/space/asm/Opcodes.java | 19 +++++++++++++++++-- + 2 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/ClassReader.java b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/ClassReader.java +index d1d517b..c822a7e 100644 +--- a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/ClassReader.java ++++ b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/ClassReader.java +@@ -166,7 +166,7 @@ public final class ClassReader { + public ClassReader(final byte[] b, final int off, final int len) { + this.b = b; + // checks the class version +- if (readShort(off + 6) > Opcodes.V14) { // patch: relax scanning to work with Java14 ++ if (readShort(off + 6) > Opcodes.V25) { + throw new IllegalArgumentException(); + } + // parses the constant pool +diff --git a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/Opcodes.java b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/Opcodes.java +index f8f856e..278f5cc 100644 +--- a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/Opcodes.java ++++ b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/Opcodes.java +@@ -58,8 +58,23 @@ public interface Opcodes { + int V1_6 = 0 << 16 | 50; + int V1_7 = 0 << 16 | 51; + int V1_8 = 0 << 16 | 52; +- +- int V14 = 0 << 16 | 58; // patch: relax scanning to work with Java14 ++ int V9 = 0 << 16 | 53; ++ int V10 = 0 << 16 | 54; ++ int V11 = 0 << 16 | 55; ++ int V12 = 0 << 16 | 56; ++ int V13 = 0 << 16 | 57; ++ int V14 = 0 << 16 | 58; ++ int V15 = 0 << 16 | 59; ++ int V16 = 0 << 16 | 60; ++ int V17 = 0 << 16 | 61; ++ int V18 = 0 << 16 | 62; ++ int V19 = 0 << 16 | 63; ++ int V20 = 0 << 16 | 64; ++ int V21 = 0 << 16 | 65; ++ int V22 = 0 << 16 | 66; ++ int V23 = 0 << 16 | 67; ++ int V24 = 0 << 16 | 68; ++ int V25 = 0 << 16 | 69; + + // access flags + +-- +2.53.0 + diff --git a/sisu.spec b/sisu.spec index 634d72f..e0b3a2a 100644 --- a/sisu.spec +++ b/sisu.spec @@ -3,7 +3,7 @@ Name: sisu Epoch: 1 Version: 0.3.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Eclipse dependency injection framework # sisu is EPL-1.0, the bundled asm is BSD License: EPL-1.0 AND BSD-3-Clause @@ -22,6 +22,7 @@ Patch0: sisu-OSGi-import-guava.patch Patch2: sisu-ignored-tests.patch Patch3: sisu-osgi-api.patch Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch +Patch5: Update-bundled-ASM-bytecode-versions-up-to-Java-25.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -64,10 +65,11 @@ cp %{SOURCE100} pom.xml cp %{SOURCE101} sisu-inject/pom.xml cp %{SOURCE102} sisu-plexus/pom.xml -%patch0 -%patch2 -%patch3 -%patch4 -p1 +%patch 0 +%patch 2 +%patch 3 +%patch 4 -p1 +%patch 5 -p1 %pom_remove_dep :servlet-api sisu-inject @@ -88,6 +90,9 @@ cp %{SOURCE102} sisu-plexus/pom.xml %license sisu-inject/LICENSE.txt %changelog +* Thu Mar 19 2026 Marian Koncek - 1:0.3.5-15 +- Update-bundled-ASM-bytecode-versions-up-to-Java-25.patch + * Tue Oct 29 2024 Troy Dawson - 1:0.3.5-14 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018