SPECS/plexus-classworlds.spec

@@ -1,8 +1,6 @@
-%bcond_with bootstrap
-
 Name:           plexus-classworlds
 Version:        2.6.0
-Release:        12%{?dist}
+Release:        4%{?dist}
 Summary:        Plexus Classworlds Classloader Framework
 License:        ASL 2.0 and Plexus
 URL:            https://github.com/codehaus-plexus/plexus-classworlds
@@ -11,12 +9,16 @@ BuildArch:      noarch
 Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local-openjdk8
-%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)
+
 
 %description
 Classworlds is a framework for container developers
@@ -28,6 +30,7 @@ loading of components or otherwise represent a 'container'
 can benefit from the classloading control provided by
 classworlds.
 
+%{?module_package}
 %{?javadoc_package}
 
 %prep
@@ -35,54 +38,18 @@ classworlds.
 %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
 
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %license 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
-- Bootstrap build
-- 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
+* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.6.0-4
+- Rebuilt for MSVSphere 8.8
 
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-4
 - Build with OpenJDK 8
@@ -90,21 +57,12 @@ sed -i /testConfigure_Optionally_Existent/s/./@org.junit.Ignore/ $(find -name Co
 * 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
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild