.gitignore

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

SPECS/plexus-classworlds.spec

@@ -1,24 +1,24 @@
+%bcond_with bootstrap
+
 Name:           plexus-classworlds
 Version:        2.6.0
-Release:        4%{?dist}
+Release:        12%{?dist}
 Summary:        Plexus Classworlds Classloader Framework
 License:        ASL 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
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap-openjdk8
+%else
 BuildRequires:  maven-local-openjdk8
+BuildRequires:  mvn(junit:junit)
 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
@@ -30,7 +30,6 @@ loading of components or otherwise represent a 'container'
 can benefit from the classloading control provided by
 classworlds.
 
-%{?module_package}
 %{?javadoc_package}
 
 %prep
@@ -38,28 +37,78 @@ 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)
+
 %build
 %mvn_build
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE.txt LICENSE-2.0.txt
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6.0-11
+- Add missing test dependency on JUnit 4
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.6.0-10
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-8
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
+
 * 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
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild