From c224c529e44240cbe1a85370b1dea89806cfab7844e4fc03548d982d7b04bc59 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 17 Jan 2022 11:57:54 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=33 --- plexus-component-metadata.spec | 8 +++----- plexus-containers-2.1.0.tar.gz | 3 --- plexus-containers-2.1.1.tar.gz | 3 +++ plexus-containers-build.tar.xz | 4 ++-- plexus-containers.spec | 6 ++---- plexus-metadata-generator.spec | 6 ++---- 6 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 plexus-containers-2.1.0.tar.gz create mode 100644 plexus-containers-2.1.1.tar.gz diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec index 32c0d86..204679c 100644 --- a/plexus-component-metadata.spec +++ b/plexus-component-metadata.spec @@ -1,7 +1,7 @@ # -# spec file for package plexus-component-metadata +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %global comp_name plexus-component-metadata %bcond_with tests Name: %{comp_name} -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Component metadata from %{base_name} # Most of the files are either under ASL 2.0 or MIT @@ -83,8 +83,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy # For Maven 3 compat %pom_add_dep org.apache.maven:maven-core plexus-component-metadata -%pom_change_dep -r :google-collections com.google.guava:guava:20.0 - # ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default diff --git a/plexus-containers-2.1.0.tar.gz b/plexus-containers-2.1.0.tar.gz deleted file mode 100644 index c1db9c3..0000000 --- a/plexus-containers-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b077bff72fd7b7705e3410557f38f7b7671babaefab28a0e70ccb7b1e3eac6c -size 347570 diff --git a/plexus-containers-2.1.1.tar.gz b/plexus-containers-2.1.1.tar.gz new file mode 100644 index 0000000..286adc2 --- /dev/null +++ b/plexus-containers-2.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b764d9beb36143a180308f7600a58e2192ad7e70e8951acd4e2136a102ee525 +size 348039 diff --git a/plexus-containers-build.tar.xz b/plexus-containers-build.tar.xz index 122c699..6507be5 100644 --- a/plexus-containers-build.tar.xz +++ b/plexus-containers-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a06444eb2bd8543e75e5828db22a6a693a0fa14e5548c724421cc0e33d7cdee -size 4968 +oid sha256:65ae1473279c48996bf5ab842481121eb2bd08c0ec99519e1a0714800a6e5331 +size 4976 diff --git a/plexus-containers.spec b/plexus-containers.spec index 36c41a6..6e8df1b 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-containers # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with tests Name: plexus-containers -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT @@ -99,8 +99,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy # For Maven 3 compat %pom_add_dep org.apache.maven:maven-core plexus-component-metadata -%pom_change_dep -r :google-collections com.google.guava:guava:20.0 - # ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index 5cb65c5..1ff8b13 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-metadata-generator # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %global comp_name component-metadata %bcond_with tests Name: plexus-metadata-generator -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Component metadata from %{base_name} # Most of the files are either under ASL 2.0 or MIT @@ -102,8 +102,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy # For Maven 3 compat %pom_add_dep org.apache.maven:maven-core plexus-component-metadata -%pom_change_dep -r :google-collections com.google.guava:guava:20.0 - # ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default From 36ba0ad18b8f4b283746db15b3ef4776fe0235bb1209b969f995e335e64584e3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 18 Jan 2022 08:00:21 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=34 --- plexus-containers.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plexus-containers.changes b/plexus-containers.changes index 4cf32e7..0d6a992 100644 --- a/plexus-containers.changes +++ b/plexus-containers.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 18 07:57:30 UTC 2022 - Fridrich Strba + +- Upgrade to version 2.1.1 + * Last version before deprecation + * Requires Java 7 and Maven 3.2.5+ + * Upgrade ASM to 9.2 + * Security upgrade org.jdom:jdom2 from 2.0.6 to 2.0.6.1 + ------------------------------------------------------------------- Sun Nov 24 14:46:44 UTC 2019 - Fridrich Strba