.gitignore

@@ -1 +1 @@
-SOURCES/plexus-classworlds-2.6.0.tar.gz
+SOURCES/plexus-classworlds-2.5.2.tar.gz

.plexus-classworlds.metadata

@@ -1 +1 @@
-129757fa7e767e88a520f51cef2ec490dbb82924 SOURCES/plexus-classworlds-2.6.0.tar.gz
+37565d7167aa146e183572ece19d0a112c78fd99 SOURCES/plexus-classworlds-2.5.2.tar.gz

SPECS/plexus-classworlds.spec

@@ -1,22 +1,25 @@
-%bcond_with bootstrap
-
 Name:           plexus-classworlds
-Version:        2.6.0
+Version:        2.5.2
-Release:        12%{?dist}
+Release:        9%{?dist}
 Summary:        Plexus Classworlds Classloader Framework
 License:        ASL 2.0 and Plexus
 URL:            https://github.com/codehaus-plexus/plexus-classworlds
 BuildArch:      noarch
 
-Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
+Source0:        https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
 
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
-%endif
+
+# test deps missed by builddep
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(xml-apis:xml-apis)
+
+Obsoletes:      classworlds < 1.1-13
 
 %description
 Classworlds is a framework for container developers
@@ -28,20 +31,17 @@ loading of components or otherwise represent a 'container'
 can benefit from the classloading control provided by
 classworlds.
 
-%{?javadoc_package}
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 %mvn_file : %{name} plexus/classworlds
 %mvn_alias : classworlds:classworlds
 
-%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)
-
 %build
 %mvn_build
 
@@ -49,62 +49,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
+%doc LICENSE.txt LICENSE-2.0.txt
-
-%changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 2.6.0-12
-- Rebuild with regenerated Requires on Java
-
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-11
-- Rebuild to regenerate auto-requires
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.6.0-10
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-9
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-8
-- Bootstrap Maven for CentOS Stream 9
 
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-7
+%files javadoc -f .mfiles-javadoc
-- Bootstrap build
+%doc LICENSE.txt LICENSE-2.0.txt
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.6.0-4
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-4
-- Build with OpenJDK 8
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-3
-- Mass rebuild for javapackages-tools 201902
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-2
-- Mass rebuild for javapackages-tools 201901
-
-* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-1
-- Update to upstream version 2.6.0
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
+%changelog
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild