From 0b61c130b912345f104d661b9007632d3516bae3 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 19 Jul 2023 10:48:52 +0200
Subject: [PATCH] Update to upstream version 2.7.0

---
 .gitignore              |  1 +
 plexus-classworlds.spec | 34 ++++++++++++++++------------------
 sources                 |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a68598..ae3d9d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ bin
 /plexus-classworlds-2.5.1.tar.gz
 /plexus-classworlds-2.5.2.tar.gz
 /plexus-classworlds-2.6.0.tar.gz
+/plexus-classworlds-2.7.0.tar.gz
diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec
index 84a938f..efcd8df 100644
--- a/plexus-classworlds.spec
+++ b/plexus-classworlds.spec
@@ -1,33 +1,31 @@
 %bcond_with bootstrap
 
 Name:           plexus-classworlds
-Version:        2.6.0
-Release:        14%{?dist}
+Version:        2.7.0
+Release:        1%{?dist}
 Summary:        Plexus Classworlds Classloader Framework
 License:        Apache-2.0 and Plexus
 URL:            https://github.com/codehaus-plexus/plexus-classworlds
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 
 %if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap-openjdk8
+BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 %endif
 
 %description
-Classworlds is a framework for container developers
-who require complex manipulation of Java's ClassLoaders.
-Java's native ClassLoader mechanisms and classes can cause
-much headache and confusion for certain types of
-application developers. Projects which involve dynamic
-loading of components or otherwise represent a 'container'
-can benefit from the classloading control provided by
+Classworlds is a framework for container developers who require complex
+manipulation of Java's ClassLoaders. Java's native ClassLoader mechanisms and
+classes can cause much headache and confusion for certain types of application
+developers. Projects which involve dynamic loading of components or otherwise
+represent a 'container' can benefit from the classloading control provided by
 classworlds.
 
 %{?javadoc_package}
@@ -37,14 +35,11 @@ classworlds.
 %mvn_file : %{name} plexus/classworlds
 %mvn_alias : classworlds:classworlds
 
-%pom_add_dep junit:junit:4.13.1:test
-
-%pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :maven-dependency-plugin
 
 # These tests depend on artifacts that are not packaged
-sed -i /testConfigure_Valid/s/./@org.junit.Ignore/ $(find -name ConfiguratorTest.java)
-sed -i /testConfigure_Optionally_Existent/s/./@org.junit.Ignore/ $(find -name ConfiguratorTest.java)
+sed -i /testConfigure_Valid/s/./@org.junit.Ignore/ src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java
+sed -i /testConfigure_Optionally_Existent/s/./@org.junit.Ignore/ src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java
 
 %build
 %mvn_build
@@ -53,9 +48,12 @@ sed -i /testConfigure_Optionally_Existent/s/./@org.junit.Ignore/ $(find -name Co
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE.txt LICENSE-2.0.txt
+%license LICENSE.txt LICENSE-Codehaus.txt
 
 %changelog
+* Fri Aug 11 2023 Marian Koncek <mkoncek@redhat.com> - 2.7.0-1
+- Update to upstream version 2.7.0
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 0558d34..551b44f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (plexus-classworlds-2.6.0.tar.gz) = d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
+SHA512 (plexus-classworlds-2.7.0.tar.gz) = 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f