From 76d35418f789cda7dfe930fb074fb9c85573d325f572b6ad8d814fb4fb2db53e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Nov 2019 13:07:26 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=30 --- plexus-component-metadata.spec | 5 +--- plexus-containers-asm6.patch | 48 ---------------------------------- plexus-metadata-generator.spec | 6 ++--- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 plexus-containers-asm6.patch diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec index 5a35760..e99b69d 100644 --- a/plexus-component-metadata.spec +++ b/plexus-component-metadata.spec @@ -33,7 +33,6 @@ URL: https://github.com/codehaus-plexus/plexus-containers Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT -Patch0: plexus-containers-asm6.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.qdox:qdox) @@ -47,7 +46,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.jdom:jdom2) -BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm) >= 7 #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap #!BuildRequires: maven-javadoc-plugin-bootstrap @@ -74,8 +73,6 @@ Group: Documentation/HTML %prep %setup -q -n %{base_name}-%{base_name}-%{version} -%patch0 -p1 - cp %{SOURCE1} . cp %{SOURCE2} . diff --git a/plexus-containers-asm6.patch b/plexus-containers-asm6.patch deleted file mode 100644 index 576c8c6..0000000 --- a/plexus-containers-asm6.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urEbwB plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java ---- plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java 2019-10-23 12:28:46.000000000 +0200 -+++ plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java 2019-11-22 03:26:41.546581926 +0100 -@@ -35,7 +35,7 @@ - private final AnnClass annClass; - - private AnnReader(AnnClass annClass) { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - this.annClass = annClass; - } - -@@ -64,7 +64,7 @@ - public FieldVisitor visitField(int access, final String name, final String desc, String signature, Object value) { - final AnnField field = new AnnField(annClass, access, name, desc); - annClass.addField(field); -- return new FieldVisitor(Opcodes.ASM7) { -+ return new FieldVisitor(Opcodes.ASM6) { - - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - Ann ann = new Ann(desc); -@@ -79,7 +79,7 @@ - final AnnMethod method = new AnnMethod(annClass, access, mname, mdesc); - annClass.addMethod(method); - -- return new MethodVisitor(Opcodes.ASM7) { -+ return new MethodVisitor(Opcodes.ASM6) { - - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - Ann ann = new Ann(desc); -@@ -99,7 +99,7 @@ - private Ann ann; - - public AnnAnnReader(Ann ann) { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - this.ann = ann; - } - -@@ -132,7 +132,7 @@ - private ArrayList array = new ArrayList(); - - public AnnAnnArrayReader(Ann ann, String name) { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - this.ann = ann; - this.name = name; - } diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index 4533a0e..acdf27f 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -34,7 +34,6 @@ Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_n Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT Source100: %{base_name}-build.tar.xz -Patch0: plexus-containers-asm6.patch Patch1: plexus-metadata-generator-cli.patch Patch1000: %{name}-nomojo.patch BuildRequires: ant @@ -43,7 +42,7 @@ BuildRequires: fdupes BuildRequires: javapackages-local BuildRequires: jdom2 BuildRequires: junit -BuildRequires: objectweb-asm +BuildRequires: objectweb-asm >= 7 BuildRequires: plexus-classworlds BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations @@ -54,7 +53,7 @@ BuildRequires: xbean Requires: apache-commons-cli Requires: guava Requires: jdom2 -Requires: objectweb-asm +Requires: objectweb-asm >= 7 Requires: plexus-cli Requires: plexus-containers-component-annotations = %{version} Requires: plexus-containers-container-default = %{version} @@ -89,7 +88,6 @@ build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-com build-jar-repository -s lib hamcrest/core %endif -%patch0 -p1 %patch1 -p1 %patch1000 -p1 From 9292148e6437db2d93859f51b58e32129d91a6e5c522bd5b3775cd0c060da5f0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 14 May 2021 16:41:00 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=31 --- plexus-component-metadata.changes | 7 +++++++ plexus-component-metadata.spec | 2 +- plexus-containers.spec | 2 +- plexus-metadata-generator.changes | 7 +++++++ plexus-metadata-generator.spec | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/plexus-component-metadata.changes b/plexus-component-metadata.changes index 36a55e5..1d90381 100644 --- a/plexus-component-metadata.changes +++ b/plexus-component-metadata.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 16:39:03 UTC 2021 - Fridrich Strba + +- Removed patch: + * plexus-containers-asm6.patch + + build using asm >= 7 + ------------------------------------------------------------------- Sun Nov 24 14:53:52 UTC 2019 - Fridrich Strba diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec index e99b69d..32c0d86 100644 --- a/plexus-component-metadata.spec +++ b/plexus-component-metadata.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-component-metadata # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/plexus-containers.spec b/plexus-containers.spec index d33a244..36c41a6 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-containers # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/plexus-metadata-generator.changes b/plexus-metadata-generator.changes index 73026e8..ab24a7e 100644 --- a/plexus-metadata-generator.changes +++ b/plexus-metadata-generator.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 16:39:03 UTC 2021 - Fridrich Strba + +- Removed patch: + * plexus-containers-asm6.patch + + build using asm >= 7 + ------------------------------------------------------------------- Sun Nov 24 14:50:30 UTC 2019 - Fridrich Strba diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index acdf27f..5cb65c5 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-metadata-generator # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed