From 2456e11eb08170355ed218e7888e4a3633a7b7a353e78e68453b0238776ef85f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 24 Mar 2022 05:46:04 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-utils?expand=0&rev=14 --- hashmap.patch | 20 ++++++++++++++++++++ plexus-utils.spec | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 hashmap.patch diff --git a/hashmap.patch b/hashmap.patch new file mode 100644 index 0000000..e5d0f5d --- /dev/null +++ b/hashmap.patch @@ -0,0 +1,20 @@ +--- plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:42:26.828858166 +0100 ++++ plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:43:39.629312093 +0100 +@@ -18,7 +18,7 @@ + + import java.lang.reflect.Method; + import java.lang.reflect.Modifier; +-import java.util.Hashtable; ++import java.util.HashMap; + import java.util.Map; + + /** +@@ -50,7 +50,7 @@ + /** + * Cache of Methods, or CACHE_MISS, keyed by method name and actual arguments used to find it. + */ +- private Map methodCache = new Hashtable(); ++ private Map methodCache = new HashMap(); + + private final MethodMap methodMap = new MethodMap(); + diff --git a/plexus-utils.spec b/plexus-utils.spec index 9d74f39..01cccdd 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -26,6 +26,7 @@ URL: https://codehaus-plexus.github.io/plexus-utils/ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Source2: http://apache.org/licenses/LICENSE-2.0.txt +Patch0: hashmap.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -47,6 +48,7 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 cp %{SOURCE1} build.xml cp %{SOURCE2} . From e3af4b0766e49c043780b87da4be05f15fa5068349dfcc6246e6aa8b1db64e0e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 25 Mar 2022 08:08:22 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-utils?expand=0&rev=16 --- hashmap.patch | 20 -------------------- plexus-utils.spec | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 hashmap.patch diff --git a/hashmap.patch b/hashmap.patch deleted file mode 100644 index e5d0f5d..0000000 --- a/hashmap.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:42:26.828858166 +0100 -+++ plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:43:39.629312093 +0100 -@@ -18,7 +18,7 @@ - - import java.lang.reflect.Method; - import java.lang.reflect.Modifier; --import java.util.Hashtable; -+import java.util.HashMap; - import java.util.Map; - - /** -@@ -50,7 +50,7 @@ - /** - * Cache of Methods, or CACHE_MISS, keyed by method name and actual arguments used to find it. - */ -- private Map methodCache = new Hashtable(); -+ private Map methodCache = new HashMap(); - - private final MethodMap methodMap = new MethodMap(); - diff --git a/plexus-utils.spec b/plexus-utils.spec index 01cccdd..9d74f39 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -26,7 +26,6 @@ URL: https://codehaus-plexus.github.io/plexus-utils/ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Source2: http://apache.org/licenses/LICENSE-2.0.txt -Patch0: hashmap.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -48,7 +47,6 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 cp %{SOURCE1} build.xml cp %{SOURCE2} . From 78b2d1f09c17a38da7bad42edf42c197437a8bfd2ec6b8c3e4bad3ba8f679d4a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 04:56:10 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-utils?expand=0&rev=17 --- hashmap.patch | 20 ++++++++++++++++++++ plexus-utils.spec | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 hashmap.patch diff --git a/hashmap.patch b/hashmap.patch new file mode 100644 index 0000000..e5d0f5d --- /dev/null +++ b/hashmap.patch @@ -0,0 +1,20 @@ +--- plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:42:26.828858166 +0100 ++++ plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:43:39.629312093 +0100 +@@ -18,7 +18,7 @@ + + import java.lang.reflect.Method; + import java.lang.reflect.Modifier; +-import java.util.Hashtable; ++import java.util.HashMap; + import java.util.Map; + + /** +@@ -50,7 +50,7 @@ + /** + * Cache of Methods, or CACHE_MISS, keyed by method name and actual arguments used to find it. + */ +- private Map methodCache = new Hashtable(); ++ private Map methodCache = new HashMap(); + + private final MethodMap methodMap = new MethodMap(); + diff --git a/plexus-utils.spec b/plexus-utils.spec index 9d74f39..01cccdd 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -26,6 +26,7 @@ URL: https://codehaus-plexus.github.io/plexus-utils/ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Source2: http://apache.org/licenses/LICENSE-2.0.txt +Patch0: hashmap.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -47,6 +48,7 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 cp %{SOURCE1} build.xml cp %{SOURCE2} . From 344c063c4af1d3a0d14f226e0e56fd7c78b1e35cc7da4fe14413e389eab1ddd9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 13:42:16 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-utils?expand=0&rev=18 --- plexus-utils-3.3.0.tar.gz | 3 --- plexus-utils-3.3.1.tar.gz | 3 +++ plexus-utils-build.xml | 2 +- plexus-utils.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 plexus-utils-3.3.0.tar.gz create mode 100644 plexus-utils-3.3.1.tar.gz diff --git a/plexus-utils-3.3.0.tar.gz b/plexus-utils-3.3.0.tar.gz deleted file mode 100644 index 9f36869..0000000 --- a/plexus-utils-3.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8953a183887d026311742ef72ab64a8e38916097690c24566bcf28b82478b03 -size 432641 diff --git a/plexus-utils-3.3.1.tar.gz b/plexus-utils-3.3.1.tar.gz new file mode 100644 index 0000000..c52f839 --- /dev/null +++ b/plexus-utils-3.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2b2746149249af6150c9ea83ad4909b28ea31185de8f266e62893b9cd578741 +size 432612 diff --git a/plexus-utils-build.xml b/plexus-utils-build.xml index 6981f28..0ce270c 100644 --- a/plexus-utils-build.xml +++ b/plexus-utils-build.xml @@ -11,7 +11,7 @@ - + diff --git a/plexus-utils.spec b/plexus-utils.spec index 01cccdd..4a9dd20 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -17,7 +17,7 @@ Name: plexus-utils -Version: 3.3.0 +Version: 3.3.1 Release: 0 Summary: Plexus Common Utilities License: Apache-1.1 AND Apache-2.0 AND xpp AND BSD-3-Clause AND SUSE-Public-Domain From d663a25cdbe1c438ec3458236174e0a79476ae8591f41c64102b05e5e74e2f79 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 4 Apr 2022 18:06:05 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-utils?expand=0&rev=19 --- hashmap.patch | 20 -------------------- plexus-utils.spec | 2 -- 2 files changed, 22 deletions(-) delete mode 100644 hashmap.patch diff --git a/hashmap.patch b/hashmap.patch deleted file mode 100644 index e5d0f5d..0000000 --- a/hashmap.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:42:26.828858166 +0100 -+++ plexus-utils-plexus-utils-3.3.0/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java 2022-03-24 06:43:39.629312093 +0100 -@@ -18,7 +18,7 @@ - - import java.lang.reflect.Method; - import java.lang.reflect.Modifier; --import java.util.Hashtable; -+import java.util.HashMap; - import java.util.Map; - - /** -@@ -50,7 +50,7 @@ - /** - * Cache of Methods, or CACHE_MISS, keyed by method name and actual arguments used to find it. - */ -- private Map methodCache = new Hashtable(); -+ private Map methodCache = new HashMap(); - - private final MethodMap methodMap = new MethodMap(); - diff --git a/plexus-utils.spec b/plexus-utils.spec index 4a9dd20..89ae4ed 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -26,7 +26,6 @@ URL: https://codehaus-plexus.github.io/plexus-utils/ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Source2: http://apache.org/licenses/LICENSE-2.0.txt -Patch0: hashmap.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -48,7 +47,6 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 cp %{SOURCE1} build.xml cp %{SOURCE2} . From a52664d1901713e0280b275265a0b089cce896d35d223916e608415b73445516 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 11 May 2022 14:06:46 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-utils?expand=0&rev=20 --- plexus-utils.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-utils.changes b/plexus-utils.changes index f237d1c..9097347 100644 --- a/plexus-utils.changes +++ b/plexus-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 11 14:05:52 UTC 2022 - Fridrich Strba + +- Upgrade to upstream version 3.3.1 + * the latest version supporting Java 8 still + ------------------------------------------------------------------- Wed Mar 23 23:53:16 UTC 2022 - Fridrich Strba