diff --git a/.gitignore b/.gitignore index b4fd23f..e9c8456 100644 --- a/.gitignore +++ b/.gitignore @@ -115,15 +115,3 @@ /asm-test-9.7.1.pom /asm-tree-9.7.1.pom /asm-util-9.7.1.pom -/asm-9.9.1.pom -/asm-analysis-9.9.1.pom -/asm-commons-9.9.1.pom -/asm-test-9.9.1.pom -/asm-tree-9.9.1.pom -/asm-util-9.9.1.pom -/asm-9.10.1.pom -/asm-analysis-9.10.1.pom -/asm-commons-9.10.1.pom -/asm-test-9.10.1.pom -/asm-tree-9.10.1.pom -/asm-util-9.10.1.pom diff --git a/0001-Add-support-of-Java-25.patch b/0001-Add-support-of-Java-25.patch new file mode 100644 index 0000000..fda2675 --- /dev/null +++ b/0001-Add-support-of-Java-25.patch @@ -0,0 +1,64 @@ +From 756ccf40723d9ba68872252810f3dbb2b186be0c Mon Sep 17 00:00:00 2001 +From: forax +Date: Tue, 10 Dec 2024 11:11:49 +0100 +Subject: [PATCH] Add support of Java 25 + +--- + asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java | 1 + + asm/src/main/java/org/objectweb/asm/ClassReader.java | 2 +- + asm/src/main/java/org/objectweb/asm/Opcodes.java | 1 + + asm/src/test/java/org/objectweb/asm/ConstantsTest.java | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java +index 4ede9201..9ce9f1c6 100644 +--- a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java ++++ b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java +@@ -114,6 +114,7 @@ public class ASMifier extends Printer { + classVersions.put(Opcodes.V22, "V22"); + classVersions.put(Opcodes.V23, "V23"); + classVersions.put(Opcodes.V24, "V24"); ++ classVersions.put(Opcodes.V25, "V25"); + CLASS_VERSIONS = Collections.unmodifiableMap(classVersions); + } + +diff --git a/asm/src/main/java/org/objectweb/asm/ClassReader.java b/asm/src/main/java/org/objectweb/asm/ClassReader.java +index 33b2a300..5f66ed2b 100644 +--- a/asm/src/main/java/org/objectweb/asm/ClassReader.java ++++ b/asm/src/main/java/org/objectweb/asm/ClassReader.java +@@ -195,7 +195,7 @@ public class ClassReader { + this.b = classFileBuffer; + // Check the class' major_version. This field is after the magic and minor_version fields, which + // use 4 and 2 bytes respectively. +- if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V24) { ++ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) { + throw new IllegalArgumentException( + "Unsupported class file major version " + readShort(classFileOffset + 6)); + } +diff --git a/asm/src/main/java/org/objectweb/asm/Opcodes.java b/asm/src/main/java/org/objectweb/asm/Opcodes.java +index 9aa8a3b0..4ed95869 100644 +--- a/asm/src/main/java/org/objectweb/asm/Opcodes.java ++++ b/asm/src/main/java/org/objectweb/asm/Opcodes.java +@@ -290,6 +290,7 @@ public interface Opcodes { + int V22 = 0 << 16 | 66; + int V23 = 0 << 16 | 67; + int V24 = 0 << 16 | 68; ++ int V25 = 0 << 16 | 69; + + /** + * Version flag indicating that the class is using 'preview' features. +diff --git a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java +index e7af1d04..543ba044 100644 +--- a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java ++++ b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java +@@ -257,6 +257,7 @@ class ConstantsTest { + case "V22": + case "V23": + case "V24": ++ case "V25": + return ConstantType.CLASS_VERSION; + case "ACC_PUBLIC": + case "ACC_PRIVATE": +-- +2.48.1 + diff --git a/changelog b/changelog index 6ae625a..2f5cd2a 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,3 @@ -* Fri Jun 12 2026 Jacek Migacz - 9.10.1-1 -- Update to upstream version 9.10.1 - * Thu Jul 18 2024 Fedora Release Engineering - 9.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 62b49eb..27e6805 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.10.1 +Version: 9.7.1 Release: %autorelease Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause @@ -22,6 +22,8 @@ Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/a Source9: generate-tarball.sh Source10: tools-retrofitter.pom +Patch: 0001-Add-support-of-Java-25.patch + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else diff --git a/sources b/sources index 785336f..e1a2064 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.10.1.tar.gz) = 7227385ed57d9549d49642aca9b52ef97379803c6f9d65781bdefe0f0c852de522eb3915001f4201d3460265acd4cda5c05233c76e6de31f60b4e238a81b64da -SHA512 (asm-9.10.1.pom) = b4de3d72c93ef85499e69cb24693e92dec0818a9381e322e0c0c7c5e7dcf7071e6a309c788426a865552b31a356b594169de99df06e7cd0f0a71c898fad71ddf -SHA512 (asm-analysis-9.10.1.pom) = 085a365948157e1c08ddfb245a9a99516259200b7b102c33d1f4b4dc6b3923d514891563ba48c21bf326e77730e24008b5eb98254914c7930b6c3a165704b96a -SHA512 (asm-commons-9.10.1.pom) = 14105e16761b32239ef8f1db382653ce88cd5decbba2d091cb9e93b55687991019ad2953c31fd1288943aa009dc83f330988e76794cb588018dabc75878f0241 -SHA512 (asm-test-9.10.1.pom) = a945e123bb98b8a343de23b70fc75e2ebe99f4f4a3940d58dd062d9e58926dcd3c88abc87c54872c327befde35c04bbc772871d528831ce01ef5dd4f65ed5ef7 -SHA512 (asm-tree-9.10.1.pom) = 1d8eade6bb000d540065c92f02fbb23bc763ce44be25ee4e5a1f9b9ca3ad0a0e8c3ad02c4eabf3dc8521c4f527c54d957f5ca98c4bdb45ef8e509d11375e9a37 -SHA512 (asm-util-9.10.1.pom) = f6d7707297f64d12a0bbd4b5f7b30b8d3ee1ecd7173c26318146baf5687f87fe1020585185dce249481a47cb326c011bc373c1d363183341cc5f35ab7f915269 +SHA512 (objectweb-asm-9.7.1.tar.gz) = 201c490ac71196b1a47a73d7311a22efca833c92377d02d9071cabc2429032aaa7eb636dfbf8182b71af60830d65792dd8f0b423208fcaba78a800228717aee5 +SHA512 (asm-9.7.1.pom) = 9d69abaf9c15b97d37484246c951acc55d4a944496ab47079dc600b3cd90353090b4a3579f1f7eb2e6d778e6900a5e1427f1690a4459253f3b9270c01713f54d +SHA512 (asm-analysis-9.7.1.pom) = 860702b32e5034109beee7cfb9269e33a55fe50ee3ef8c7fe6c71d9916b2be8865991aab64618f9e03be88879bb410e07db74cf91bd7364956cd34d0fbf9231b +SHA512 (asm-commons-9.7.1.pom) = d4bd178cfde200ed04915e581dd1e7009b1960ef40c86e9c22d88ef141d4a32c7e6131ee2e48f92eba45d523006799c8be53312dc50c67ed7b8bb8b90175e480 +SHA512 (asm-test-9.7.1.pom) = e36d8f602a9e9e24547af4f8b0aa0a57f79123c7075ae4085d80e93d3b8ea63730f59e85ee81a4dff45b8749ded0c1ab787620bb5c9820460761fde9578b8868 +SHA512 (asm-tree-9.7.1.pom) = f66d75d0897916d0e3a7ffe4dedd2ca4a363cba0430cc464a358e71be19e8413ba9f26b313f6eb7c0fcc631487e5a420f7bcf6af63c07e3d9880e8adc83922b7 +SHA512 (asm-util-9.7.1.pom) = 6a67ceafce03eb0582dd1addf79ff69cf2a94824f860161cd9b5c808580fd28ce2deb4e25b2b977a70da86732d20de1e895005c824e49d6148637c2211374ff4 diff --git a/tools-retrofitter.pom b/tools-retrofitter.pom index f321a57..bd1f813 100644 --- a/tools-retrofitter.pom +++ b/tools-retrofitter.pom @@ -15,17 +15,4 @@ any - - - - - org.apache.maven.plugins - maven-compiler-plugin - any - - 11 - - - -