diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index e9c8456..1cfc788 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,6 @@ /.build-*.log /*.src.rpm /noarch -/objectweb-asm-*.tar.gz -/objectweb-asm-*/ -/archive.tar.gz /asm-6.2.pom /asm-analysis-6.2.pom /asm-commons-6.2.pom @@ -13,8 +10,6 @@ /asm-tree-6.2.pom /asm-util-6.2.pom /asm-xml-6.2.pom -/objectweb-asm-6.2.tar.gz -/objectweb-asm-6.2.1.tar.gz /asm-6.2.1.pom /asm-analysis-6.2.1.pom /asm-commons-6.2.1.pom @@ -22,96 +17,17 @@ /asm-tree-6.2.1.pom /asm-util-6.2.1.pom /asm-xml-6.2.1.pom -/objectweb-asm-7.0.tar.gz -/objectweb-asm-7.0/ +/objectweb-asm-*.tar.gz +/objectweb-asm-*/ /asm-7.0.pom /asm-analysis-7.0.pom /asm-commons-7.0.pom /asm-test-7.0.pom /asm-tree-7.0.pom /asm-util-7.0.pom -/objectweb-asm-7.1.tar.gz -/asm-7.1.pom -/asm-analysis-7.1.pom -/asm-commons-7.1.pom -/asm-test-7.1.pom -/asm-tree-7.1.pom -/asm-util-7.1.pom -/objectweb-asm-7.1/ -/objectweb-asm-7.2.tar.gz -/asm-7.2.pom -/asm-analysis-7.2.pom -/asm-commons-7.2.pom -/asm-test-7.2.pom -/asm-tree-7.2.pom -/asm-util-7.2.pom -/objectweb-asm-7.3.1.tar.gz -/asm-7.3.1.pom -/asm-analysis-7.3.1.pom -/asm-commons-7.3.1.pom -/asm-test-7.3.1.pom -/asm-tree-7.3.1.pom -/asm-util-7.3.1.pom -/objectweb-asm-8.0.1.tar.gz /asm-8.0.1.pom /asm-analysis-8.0.1.pom /asm-commons-8.0.1.pom /asm-test-8.0.1.pom /asm-tree-8.0.1.pom /asm-util-8.0.1.pom -/objectweb-asm-9.0.tar.gz -/asm-9.0.pom -/asm-analysis-9.0.pom -/asm-commons-9.0.pom -/asm-test-9.0.pom -/asm-tree-9.0.pom -/asm-util-9.0.pom -/objectweb-asm-9.1.tar.gz -/asm-9.1.pom -/asm-analysis-9.1.pom -/asm-commons-9.1.pom -/asm-test-9.1.pom -/asm-tree-9.1.pom -/asm-util-9.1.pom -/asm-9.2.pom -/asm-analysis-9.2.pom -/asm-commons-9.2.pom -/asm-test-9.2.pom -/asm-tree-9.2.pom -/asm-util-9.2.pom -/asm-9.3.pom -/asm-analysis-9.3.pom -/asm-commons-9.3.pom -/asm-test-9.3.pom -/asm-tree-9.3.pom -/asm-util-9.3.pom -/asm-9.4.pom -/asm-analysis-9.4.pom -/asm-commons-9.4.pom -/asm-test-9.4.pom -/asm-tree-9.4.pom -/asm-util-9.4.pom -/asm-9.5.pom -/asm-analysis-9.5.pom -/asm-commons-9.5.pom -/asm-test-9.5.pom -/asm-tree-9.5.pom -/asm-util-9.5.pom -/asm-9.6.pom -/asm-analysis-9.6.pom -/asm-commons-9.6.pom -/asm-test-9.6.pom -/asm-tree-9.6.pom -/asm-util-9.6.pom -/asm-9.7.pom -/asm-analysis-9.7.pom -/asm-commons-9.7.pom -/asm-test-9.7.pom -/asm-tree-9.7.pom -/asm-util-9.7.pom -/asm-9.7.1.pom -/asm-analysis-9.7.1.pom -/asm-commons-9.7.1.pom -/asm-test-9.7.1.pom -/asm-tree-9.7.1.pom -/asm-util-9.7.1.pom diff --git a/0001-Add-support-of-Java-25.patch b/0001-Add-support-of-Java-25.patch deleted file mode 100644 index fda2675..0000000 --- a/0001-Add-support-of-Java-25.patch +++ /dev/null @@ -1,64 +0,0 @@ -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/0001-Revert-upstream-change-2a58bc9.patch b/0001-Revert-upstream-change-2a58bc9.patch new file mode 100644 index 0000000..907acb5 --- /dev/null +++ b/0001-Revert-upstream-change-2a58bc9.patch @@ -0,0 +1,813 @@ +From df50f201a0f253bc55dc89e191ac66cb920a3274 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 6 May 2020 15:09:27 +0100 +Subject: [PATCH] Revert upstream change 2a58bc9 + +--- + .../commons/RemappingAnnotationAdapter.java | 85 ++++++ + .../asm/commons/RemappingClassAdapter.java | 167 +++++++++++ + .../asm/commons/RemappingFieldAdapter.java | 74 +++++ + .../asm/commons/RemappingMethodAdapter.java | 279 ++++++++++++++++++ + .../commons/RemappingSignatureAdapter.java | 157 ++++++++++ + 5 files changed, 762 insertions(+) + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java + +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java +new file mode 100644 +index 0000000..86c6ee9 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java +@@ -0,0 +1,85 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.Opcodes; ++ ++/** ++ * An {@link AnnotationVisitor} adapter for type remapping. ++ * ++ * @deprecated use {@link AnnotationRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingAnnotationAdapter extends AnnotationVisitor { ++ ++ protected final Remapper remapper; ++ ++ public RemappingAnnotationAdapter( ++ final AnnotationVisitor annotationVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, annotationVisitor, remapper); ++ } ++ ++ protected RemappingAnnotationAdapter( ++ final int api, final AnnotationVisitor annotationVisitor, final Remapper remapper) { ++ super(api, annotationVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public void visit(final String name, final Object value) { ++ av.visit(name, remapper.mapValue(value)); ++ } ++ ++ @Override ++ public void visitEnum(final String name, final String descriptor, final String value) { ++ av.visitEnum(name, remapper.mapDesc(descriptor), value); ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String name, final String descriptor) { ++ AnnotationVisitor annotationVisitor = av.visitAnnotation(name, remapper.mapDesc(descriptor)); ++ return annotationVisitor == null ++ ? null ++ : (annotationVisitor == av ++ ? this ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper)); ++ } ++ ++ @Override ++ public AnnotationVisitor visitArray(final String name) { ++ AnnotationVisitor annotationVisitor = av.visitArray(name); ++ return annotationVisitor == null ++ ? null ++ : (annotationVisitor == av ++ ? this ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper)); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java +new file mode 100644 +index 0000000..b4cc08c +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java +@@ -0,0 +1,167 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.ClassVisitor; ++import org.objectweb.asm.FieldVisitor; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.ModuleVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.TypePath; ++ ++/** ++ * A {@link ClassVisitor} for type remapping. ++ * ++ * @deprecated use {@link ClassRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingClassAdapter extends ClassVisitor { ++ ++ protected final Remapper remapper; ++ ++ protected String className; ++ ++ public RemappingClassAdapter(final ClassVisitor classVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, classVisitor, remapper); ++ } ++ ++ protected RemappingClassAdapter( ++ final int api, final ClassVisitor classVisitor, final Remapper remapper) { ++ super(api, classVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public void visit( ++ final int version, ++ final int access, ++ final String name, ++ final String signature, ++ final String superName, ++ final String[] interfaces) { ++ this.className = name; ++ super.visit( ++ version, ++ access, ++ remapper.mapType(name), ++ remapper.mapSignature(signature, false), ++ remapper.mapType(superName), ++ interfaces == null ? null : remapper.mapTypes(interfaces)); ++ } ++ ++ @Override ++ public ModuleVisitor visitModule(final String name, final int flags, final String version) { ++ throw new RuntimeException("RemappingClassAdapter is deprecated, use ClassRemapper instead"); ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitAnnotation(remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTypeAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor); ++ } ++ ++ @Override ++ public FieldVisitor visitField( ++ final int access, ++ final String name, ++ final String descriptor, ++ final String signature, ++ final Object value) { ++ FieldVisitor fieldVisitor = ++ super.visitField( ++ access, ++ remapper.mapFieldName(className, name, descriptor), ++ remapper.mapDesc(descriptor), ++ remapper.mapSignature(signature, true), ++ remapper.mapValue(value)); ++ return fieldVisitor == null ? null : createRemappingFieldAdapter(fieldVisitor); ++ } ++ ++ @Override ++ public MethodVisitor visitMethod( ++ final int access, ++ final String name, ++ final String descriptor, ++ final String signature, ++ final String[] exceptions) { ++ String newDescriptor = remapper.mapMethodDesc(descriptor); ++ MethodVisitor methodVisitor = ++ super.visitMethod( ++ access, ++ remapper.mapMethodName(className, name, descriptor), ++ newDescriptor, ++ remapper.mapSignature(signature, false), ++ exceptions == null ? null : remapper.mapTypes(exceptions)); ++ return methodVisitor == null ++ ? null ++ : createRemappingMethodAdapter(access, newDescriptor, methodVisitor); ++ } ++ ++ @Override ++ public void visitInnerClass( ++ final String name, final String outerName, final String innerName, final int access) { ++ super.visitInnerClass( ++ remapper.mapType(name), ++ outerName == null ? null : remapper.mapType(outerName), ++ innerName, ++ access); ++ } ++ ++ @Override ++ public void visitOuterClass(final String owner, final String name, final String descriptor) { ++ super.visitOuterClass( ++ remapper.mapType(owner), ++ name == null ? null : remapper.mapMethodName(owner, name, descriptor), ++ descriptor == null ? null : remapper.mapMethodDesc(descriptor)); ++ } ++ ++ protected FieldVisitor createRemappingFieldAdapter(final FieldVisitor fieldVisitor) { ++ return new RemappingFieldAdapter(fieldVisitor, remapper); ++ } ++ ++ protected MethodVisitor createRemappingMethodAdapter( ++ final int access, final String newDescriptor, final MethodVisitor methodVisitior) { ++ return new RemappingMethodAdapter(access, newDescriptor, methodVisitior, remapper); ++ } ++ ++ protected AnnotationVisitor createRemappingAnnotationAdapter(final AnnotationVisitor av) { ++ return new RemappingAnnotationAdapter(av, remapper); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java +new file mode 100644 +index 0000000..5f14f33 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java +@@ -0,0 +1,74 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.FieldVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.TypePath; ++ ++/** ++ * A {@link FieldVisitor} adapter for type remapping. ++ * ++ * @deprecated use {@link FieldRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingFieldAdapter extends FieldVisitor { ++ ++ private final Remapper remapper; ++ ++ public RemappingFieldAdapter(final FieldVisitor fieldVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, fieldVisitor, remapper); ++ } ++ ++ protected RemappingFieldAdapter( ++ final int api, final FieldVisitor fieldVisitor, final Remapper remapper) { ++ super(api, fieldVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = fv.visitAnnotation(remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? null ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTypeAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? null ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java +new file mode 100644 +index 0000000..cf21f18 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java +@@ -0,0 +1,279 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.Handle; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.TypePath; ++ ++/** ++ * A {@link LocalVariablesSorter} for type mapping. ++ * ++ * @deprecated use {@link MethodRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingMethodAdapter extends LocalVariablesSorter { ++ ++ protected final Remapper remapper; ++ ++ public RemappingMethodAdapter( ++ final int access, ++ final String descriptor, ++ final MethodVisitor methodVisitor, ++ final Remapper remapper) { ++ this(Opcodes.ASM6, access, descriptor, methodVisitor, remapper); ++ } ++ ++ protected RemappingMethodAdapter( ++ final int api, ++ final int access, ++ final String descriptor, ++ final MethodVisitor methodVisitor, ++ final Remapper remapper) { ++ super(api, access, descriptor, methodVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotationDefault() { ++ AnnotationVisitor annotationVisitor = super.visitAnnotationDefault(); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitAnnotation(remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTypeAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitParameterAnnotation( ++ final int parameter, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitParameterAnnotation(parameter, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public void visitFrame( ++ final int type, ++ final int numLocal, ++ final Object[] local, ++ final int numStack, ++ final Object[] stack) { ++ super.visitFrame( ++ type, numLocal, remapEntries(numLocal, local), numStack, remapEntries(numStack, stack)); ++ } ++ ++ private Object[] remapEntries(final int numTypes, final Object[] entries) { ++ if (entries == null) { ++ return entries; ++ } ++ Object[] remappedEntries = null; ++ for (int i = 0; i < numTypes; ++i) { ++ if (entries[i] instanceof String) { ++ if (remappedEntries == null) { ++ remappedEntries = new Object[numTypes]; ++ System.arraycopy(entries, 0, remappedEntries, 0, numTypes); ++ } ++ remappedEntries[i] = remapper.mapType((String) entries[i]); ++ } ++ } ++ return remappedEntries == null ? entries : remappedEntries; ++ } ++ ++ @Override ++ public void visitFieldInsn( ++ final int opcode, final String owner, final String name, final String descriptor) { ++ super.visitFieldInsn( ++ opcode, ++ remapper.mapType(owner), ++ remapper.mapFieldName(owner, name, descriptor), ++ remapper.mapDesc(descriptor)); ++ } ++ ++ @Deprecated ++ @Override ++ public void visitMethodInsn( ++ final int opcode, final String owner, final String name, final String descriptor) { ++ if (api >= Opcodes.ASM5) { ++ super.visitMethodInsn(opcode, owner, name, descriptor); ++ return; ++ } ++ doVisitMethodInsn(opcode, owner, name, descriptor, opcode == Opcodes.INVOKEINTERFACE); ++ } ++ ++ @Override ++ public void visitMethodInsn( ++ final int opcode, ++ final String owner, ++ final String name, ++ final String descriptor, ++ final boolean isInterface) { ++ if (api < Opcodes.ASM5) { ++ super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); ++ return; ++ } ++ doVisitMethodInsn(opcode, owner, name, descriptor, isInterface); ++ } ++ ++ private void doVisitMethodInsn( ++ final int opcode, ++ final String owner, ++ final String name, ++ final String descriptor, ++ final boolean isInterface) { ++ // Calling super.visitMethodInsn requires to call the correct version ++ // depending on this.api (otherwise infinite loops can occur). To ++ // simplify and to make it easier to automatically remove the backward ++ // compatibility code, we inline the code of the overridden method here. ++ // IMPORTANT: THIS ASSUMES THAT visitMethodInsn IS NOT OVERRIDDEN IN ++ // LocalVariableSorter. ++ if (mv != null) { ++ mv.visitMethodInsn( ++ opcode, ++ remapper.mapType(owner), ++ remapper.mapMethodName(owner, name, descriptor), ++ remapper.mapMethodDesc(descriptor), ++ isInterface); ++ } ++ } ++ ++ @Override ++ public void visitInvokeDynamicInsn( ++ final String name, ++ final String descriptor, ++ final Handle bootstrapMethodHandle, ++ final Object... bootstrapMethodArguments) { ++ for (int i = 0; i < bootstrapMethodArguments.length; i++) { ++ bootstrapMethodArguments[i] = remapper.mapValue(bootstrapMethodArguments[i]); ++ } ++ super.visitInvokeDynamicInsn( ++ remapper.mapInvokeDynamicMethodName(name, descriptor), ++ remapper.mapMethodDesc(descriptor), ++ (Handle) remapper.mapValue(bootstrapMethodHandle), ++ bootstrapMethodArguments); ++ } ++ ++ @Override ++ public void visitTypeInsn(final int opcode, final String type) { ++ super.visitTypeInsn(opcode, remapper.mapType(type)); ++ } ++ ++ @Override ++ public void visitLdcInsn(final Object value) { ++ super.visitLdcInsn(remapper.mapValue(value)); ++ } ++ ++ @Override ++ public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) { ++ super.visitMultiANewArrayInsn(remapper.mapDesc(descriptor), numDimensions); ++ } ++ ++ @Override ++ public AnnotationVisitor visitInsnAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitInsnAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public void visitTryCatchBlock( ++ final Label start, final Label end, final Label handler, final String type) { ++ super.visitTryCatchBlock(start, end, handler, type == null ? null : remapper.mapType(type)); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTryCatchAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTryCatchAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public void visitLocalVariable( ++ final String name, ++ final String descriptor, ++ final String signature, ++ final Label start, ++ final Label end, ++ final int index) { ++ super.visitLocalVariable( ++ name, ++ remapper.mapDesc(descriptor), ++ remapper.mapSignature(signature, true), ++ start, ++ end, ++ index); ++ } ++ ++ @Override ++ public AnnotationVisitor visitLocalVariableAnnotation( ++ final int typeRef, ++ final TypePath typePath, ++ final Label[] start, ++ final Label[] end, ++ final int[] index, ++ final String descriptor, ++ final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitLocalVariableAnnotation( ++ typeRef, typePath, start, end, index, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java +new file mode 100644 +index 0000000..1553cd5 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java +@@ -0,0 +1,157 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.signature.SignatureVisitor; ++ ++/** ++ * A {@link SignatureVisitor} adapter for type mapping. ++ * ++ * @deprecated use {@link SignatureRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingSignatureAdapter extends SignatureVisitor { ++ ++ private final SignatureVisitor signatureVisitor; ++ ++ private final Remapper remapper; ++ ++ private String className; ++ ++ public RemappingSignatureAdapter( ++ final SignatureVisitor signatureVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, signatureVisitor, remapper); ++ } ++ ++ protected RemappingSignatureAdapter( ++ final int api, final SignatureVisitor signatureVisitor, final Remapper remapper) { ++ super(api); ++ this.signatureVisitor = signatureVisitor; ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public void visitClassType(final String name) { ++ className = name; ++ signatureVisitor.visitClassType(remapper.mapType(name)); ++ } ++ ++ @Override ++ public void visitInnerClassType(final String name) { ++ String remappedOuter = remapper.mapType(className) + '$'; ++ className = className + '$' + name; ++ String remappedName = remapper.mapType(className); ++ int index = ++ remappedName.startsWith(remappedOuter) ++ ? remappedOuter.length() ++ : remappedName.lastIndexOf('$') + 1; ++ signatureVisitor.visitInnerClassType(remappedName.substring(index)); ++ } ++ ++ @Override ++ public void visitFormalTypeParameter(final String name) { ++ signatureVisitor.visitFormalTypeParameter(name); ++ } ++ ++ @Override ++ public void visitTypeVariable(final String name) { ++ signatureVisitor.visitTypeVariable(name); ++ } ++ ++ @Override ++ public SignatureVisitor visitArrayType() { ++ signatureVisitor.visitArrayType(); ++ return this; ++ } ++ ++ @Override ++ public void visitBaseType(final char descriptor) { ++ signatureVisitor.visitBaseType(descriptor); ++ } ++ ++ @Override ++ public SignatureVisitor visitClassBound() { ++ signatureVisitor.visitClassBound(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitExceptionType() { ++ signatureVisitor.visitExceptionType(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitInterface() { ++ signatureVisitor.visitInterface(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitInterfaceBound() { ++ signatureVisitor.visitInterfaceBound(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitParameterType() { ++ signatureVisitor.visitParameterType(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitReturnType() { ++ signatureVisitor.visitReturnType(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitSuperclass() { ++ signatureVisitor.visitSuperclass(); ++ return this; ++ } ++ ++ @Override ++ public void visitTypeArgument() { ++ signatureVisitor.visitTypeArgument(); ++ } ++ ++ @Override ++ public SignatureVisitor visitTypeArgument(final char wildcard) { ++ signatureVisitor.visitTypeArgument(wildcard); ++ return this; ++ } ++ ++ @Override ++ public void visitEnd() { ++ signatureVisitor.visitEnd(); ++ } ++} +-- +2.26.0 + diff --git a/0002-Catch-CompileException-in-test.patch b/0002-Catch-CompileException-in-test.patch new file mode 100644 index 0000000..76e2fe7 --- /dev/null +++ b/0002-Catch-CompileException-in-test.patch @@ -0,0 +1,12 @@ +--- a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java ++++ b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java +@@ -107,8 +107,8 @@ public class ASMifierTest extends AsmTes + } + + private static byte[] compile(final String name, final String source) throws IOException { +- Parser parser = new Parser(new Scanner(name, new StringReader(source))); + try { ++ Parser parser = new Parser(new Scanner(name, new StringReader(source))); + UnitCompiler unitCompiler = new UnitCompiler(parser.parseCompilationUnit(), ICLASS_LOADER); + return unitCompiler.compileUnit(true, true, true)[0].toByteArray(); + } catch (CompileException e) { diff --git a/aggregator.pom b/aggregator.pom deleted file mode 100644 index f267e26..0000000 --- a/aggregator.pom +++ /dev/null @@ -1,58 +0,0 @@ - - - 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/asm-all.pom b/asm-all.pom new file mode 100644 index 0000000..230058b --- /dev/null +++ b/asm-all.pom @@ -0,0 +1,57 @@ + + + 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/changelog b/changelog deleted file mode 100644 index 2f5cd2a..0000000 --- a/changelog +++ /dev/null @@ -1,309 +0,0 @@ -* 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 - -* Mon May 06 2019 Severin Gehwolf - 7.1-1 -- Update to latest upstream 7.1 release. - -* Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 21 2018 Severin Gehwolf - 7.0-1 -- Update to latest upstream 7.0 release. -- Removes package asm-xml (deprecated since 6.1). - -* Tue Sep 11 2018 Mat Booth - 6.2.1-1 -- Update to latest upstream release -- Fix test suite execution - -* Fri Aug 03 2018 Michael Simacek - 6.2-5 -- Repack the tarball without binaries - -* Wed Aug 01 2018 Severin Gehwolf - 6.2-4 -- Explicitly require javapackages-tools for asm-processor script - which uses java-functions. - -* Wed Aug 01 2018 Severin Gehwolf - 6.2-3 -- Allow conditionally building without OSGi - metadata. - -* Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Michael Simacek - 6.2-1 -- Update to upstream version 6.2 - -* Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 -- Relax versioned self-build-requirement a bit - -* Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 -- Add objectweb-asm to BND pluginpath - -* Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 -- Allow conditionally building without junit5 - -* Wed Apr 25 2018 Mat Booth - 6.1.1-1 -- Update to latest upstream relase for Java 10 support -- Switch to maven build -- Now executing test suites - -* Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Michael Simacek - 6.0-1 -- Update to upstream version 6.0 - -* Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta -- Fix invalid OSGi metadata -- Resolves: rhbz#1490817 - -* Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta -- Update to upstream version 6.0 beta - -* Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 -- Use OSGi API JARs to run BND classpath, instead of Eclipse - -* Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 -- Update to current packaging guidelines -- Remove obsoletes and provides for objectweb-asm4 - -* Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 -- Add missing build-requires - -* Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 -- Avoid calling XMvn from build-classpath - -* Tue May 31 2016 Mikolaj Izdebski - 5.1-2 -- Add missing JARs to BND classpath - -* Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 -- Update to upstream version 5.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 -- Update to upstream version 5.0.4 - -* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 -- Update to upstream version 5.0.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 -- Update to upstream version 5.0.2 - -* Mon Apr 14 2014 Mat Booth - 5.0.1-2 -- SCL-ize package. -- Fix bogus dates in changelog. - -* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 -- Update to upstream version 5.0.1 - -* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta -- Enable asm-debug-all module - -* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta -- Remove Eclipse Orbit alias - -* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta -- Update to 5.0 beta - -* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 -- Make jetty orbit depmap point to asm-all jar -- Resolves: rhbz#917625 - -* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 -- Add depmap for org.eclipse.jetty.orbit -- Resolves: rhbz#917625 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 -- Use poms produced by the build not foreign ones. -- Adpat to current guidelines. - -* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 -- Upgrade to 3.3.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 -- Change depmap parent id to asm (bug #606659) - -* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 -- Upgrade to 3.2 - -* Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 23 2008 David Walluck 0:3.1-5.1 -- build for Fedora - -* Thu Oct 23 2008 David Walluck 0:3.1-5 -- add OSGi manifest (Alexander Kurtakov) - -* Mon Oct 20 2008 David Walluck 0:3.1-4 -- remove Class-Path from MANIFEST.MF -- add unversioned javadoc symlink -- remove javadoc scriptlets -- fix directory ownership -- remove build requirement on dos2unix - -* 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 -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 - -* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp -- Upgrade to 3.1 - -* Wed Aug 22 2007 Fernando Nasser - 0:3.0-1jpp -- Upgrade to 3.0 -- Rename to include objectweb- prefix as requested by ObjectWeb - -* Thu Jan 05 2006 Fernando Nasser - 0:2.1-2jpp -- First JPP 1.7 build - -* Thu Oct 06 2005 Ralph Apel 0:2.1-1jpp -- Upgrade to 2.1 - -* Fri Mar 11 2005 Sebastiano Vigna 0:2.0.RC1-1jpp -- First release of the 2.0 line. diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh index b5a3d3a..fdeacca 100755 --- a/generate-tarball.sh +++ b/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/-/archive/${gittag}/asm-${gittag}.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://gitlab.ow2.org/asm/asm/repository/${gittag}/archive.tar.gz#/${name}-${version}.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" +cd tarball-tmp +tar xf "../${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 -czf "../${name}-${version}.tar.gz" * -popd +tar cf "../${name}-${version}.tar.gz" -I 'gzip -9' * +cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 27e6805..be5f979 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,38 +1,60 @@ -%bcond_with bootstrap +%bcond_without junit5 +%bcond_without osgi Name: objectweb-asm -Version: 9.7.1 -Release: %autorelease +Version: 8.0.1 +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework -License: BSD-3-Clause -URL: https://asm.ow2.org/ +License: BSD +URL: http://asm.ow2.org/ BuildArch: noarch -ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -Source1: aggregator.pom +Source1: parent.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 +# 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 # The source contains binary jars that cannot be verified for licensing and could be proprietary -Source9: generate-tarball.sh -Source10: tools-retrofitter.pom +Source9: generate-tarball.sh -Patch: 0001-Add-support-of-Java-25.patch +# Revert upstream change https://gitlab.ow2.org/asm/asm/-/commit/2a58bc9bcf2ea6eee03e973d1df4cf9312573c9d +# To restore some deprecations that were deleted and broke the API +Patch0: 0001-Revert-upstream-change-2a58bc9.patch -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.ow2.asm:asm) +# Move a statement that can throw a CompileException inside a try-catch block +# for that exception. Upstream has fixed this another way with a large code +# refactor that seems inappropriate to backport. +Patch1: 0002-Catch-CompileException-in-test.patch + +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:) +%if %{with junit5} +BuildRequires: mvn(org.codehaus.janino:janino) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) %endif -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 9.7.1-9 + +%if %{with osgi} +# 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 +%endif + +# Explicit javapackages-tools requires since asm-processor script uses +# /usr/share/java-utils/java-functions +Requires: javapackages-tools %description ASM is an all purpose Java bytecode manipulation and analysis @@ -41,38 +63,319 @@ generate classes, directly in binary form. Provided common transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools. -%prep -%autosetup -p1 -C +%package javadoc +Summary: API documentation for %{name} -# A custom pom to aggregate the build +%description javadoc +This package provides %{summary}. + +%prep +%autosetup -p1 + +# A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml -cp -p %{SOURCE10} tools/retrofitter/pom.xml +%if %{without junit5} +%pom_disable_module asm-test +%endif # 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 - %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} + cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml + # Fix junit5 configuration +%if %{with junit5} + %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom + %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.22.0 $pom +%endif +%if %{with osgi} + 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 +%endif done -# Don't ship poms used for build only -%mvn_package :aggregator __noinstall -%mvn_package :tools-retrofitter __noinstall +# 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 '/testAllMethods_issue317586()/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java +# Remove failing test SerialVersionUidAdderTest due to missing class files +rm asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java + +# Insert asm-all pom +mkdir -p asm-all +sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml + +# 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 -%mvn_build -j -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +# 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 + +%if %{with junit5} +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%else +%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%endif %install %mvn_install +%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util %{name}-processor true + %files -f .mfiles %license LICENSE.txt +%{_bindir}/%{name}-processor + +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt %changelog -%autochangelog +* Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* 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 + +* 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 + +* Thu Jul 25 2019 Fedora Release Engineering - 7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 21 2018 Severin Gehwolf - 7.0-1 +- Update to latest upstream 7.0 release. +- Removes package asm-xml (deprecated since 6.1). + +* Tue Sep 11 2018 Mat Booth - 6.2.1-1 +- Update to latest upstream release +- Fix test suite execution + +* Fri Aug 03 2018 Michael Simacek - 6.2-5 +- Repack the tarball without binaries + +* Wed Aug 01 2018 Severin Gehwolf - 6.2-4 +- Explicitly require javapackages-tools for asm-processor script + which uses java-functions. + +* Wed Aug 01 2018 Severin Gehwolf - 6.2-3 +- Allow conditionally building without OSGi + metadata. + +* Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Michael Simacek - 6.2-1 +- Update to upstream version 6.2 + +* Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 +- Relax versioned self-build-requirement a bit + +* Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 +- Add objectweb-asm to BND pluginpath + +* Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 +- Allow conditionally building without junit5 + +* Wed Apr 25 2018 Mat Booth - 6.1.1-1 +- Update to latest upstream relase for Java 10 support +- Switch to maven build +- Now executing test suites + +* Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 25 2017 Michael Simacek - 6.0-1 +- Update to upstream version 6.0 + +* Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta +- Fix invalid OSGi metadata +- Resolves: rhbz#1490817 + +* Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta +- Update to upstream version 6.0 beta + +* Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 +- Use OSGi API JARs to run BND classpath, instead of Eclipse + +* Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 +- Update to current packaging guidelines +- Remove obsoletes and provides for objectweb-asm4 + +* Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 +- Add missing build-requires + +* Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 +- Avoid calling XMvn from build-classpath + +* Tue May 31 2016 Mikolaj Izdebski - 5.1-2 +- Add missing JARs to BND classpath + +* Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 +- Update to upstream version 5.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 +- Update to upstream version 5.0.4 + +* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 +- Update to upstream version 5.0.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 +- Update to upstream version 5.0.2 + +* Mon Apr 14 2014 Mat Booth - 5.0.1-2 +- SCL-ize package. +- Fix bogus dates in changelog. + +* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 +- Update to upstream version 5.0.1 + +* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta +- Enable asm-debug-all module + +* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta +- Remove Eclipse Orbit alias + +* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta +- Update to 5.0 beta + +* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 +- Make jetty orbit depmap point to asm-all jar +- Resolves: rhbz#917625 + +* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 +- Add depmap for org.eclipse.jetty.orbit +- Resolves: rhbz#917625 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 +- Use poms produced by the build not foreign ones. +- Adpat to current guidelines. + +* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 +- Upgrade to 3.3.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 +- Change depmap parent id to asm (bug #606659) + +* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 +- Upgrade to 3.2 + +* Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 23 2008 David Walluck 0:3.1-5.1 +- build for Fedora + +* Thu Oct 23 2008 David Walluck 0:3.1-5 +- add OSGi manifest (Alexander Kurtakov) + +* Mon Oct 20 2008 David Walluck 0:3.1-4 +- remove Class-Path from MANIFEST.MF +- add unversioned javadoc symlink +- remove javadoc scriptlets +- fix directory ownership +- remove build requirement on dos2unix + +* 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 -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 + +* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp +- Upgrade to 3.1 + +* Wed Aug 22 2007 Fernando Nasser - 0:3.0-1jpp +- Upgrade to 3.0 +- Rename to include objectweb- prefix as requested by ObjectWeb + +* Thu Jan 05 2006 Fernando Nasser - 0:2.1-2jpp +- First JPP 1.7 build + +* Thu Oct 06 2005 Ralph Apel 0:2.1-1jpp +- Upgrade to 2.1 + +* Fri Mar 11 2005 Sebastiano Vigna 0:2.0.RC1-1jpp +- First release of the 2.0 line. diff --git a/parent.pom b/parent.pom new file mode 100644 index 0000000..8cfbb70 --- /dev/null +++ b/parent.pom @@ -0,0 +1,21 @@ + + + 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/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/sources b/sources index e1a2064..d461c08 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -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 +SHA512 (objectweb-asm-8.0.1.tar.gz) = 9ab01a55a2cc855bb2bd113a6923c62a0bdeb9311a5061508cf76e6bf1d96c37a9ff6d7af90c52eaf1cec102142c3dd7b6fa6fc0392ef2a96e687c639593f375 +SHA512 (asm-8.0.1.pom) = d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8 +SHA512 (asm-analysis-8.0.1.pom) = 60b8806ad63a31a13f523f5b3410b2553292faebdc8fbc27c6d7d6237c17744a98ce5c7ac3a3defdbfe57400f914d66bfb4f3124b57c207fc6ebb4d559245550 +SHA512 (asm-commons-8.0.1.pom) = 1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0 +SHA512 (asm-test-8.0.1.pom) = fd796c236b9b19facf828337e276d8933e1d08776dec96f8a370637b9706054eb8a9653b4c44fcecee5522ec2a24f9517a31a9858137adee5517b2824ebc1870 +SHA512 (asm-tree-8.0.1.pom) = 0116575ff309fee303ebe9c226c55993958aa0f84426aeb8fceb08c1f5a618f516114e556320e3d4a75e4b4fe575b05e9d774a988efb3609ebf92c0be0fd8b84 +SHA512 (asm-util-8.0.1.pom) = 66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f diff --git a/tools-retrofitter.pom b/tools-retrofitter.pom deleted file mode 100644 index bd1f813..0000000 --- a/tools-retrofitter.pom +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - org.fedoraproject.xmvn.objectweb-asm - tools-retrofitter - any - jar - - - - org.ow2.asm - asm - any - - -