Merge modular branch

maven-plugin-testing.spec

@@ -1,3 +1,5 @@
+%bcond_with bootstrap
+
 Name:           maven-plugin-testing
 Version:        3.3.0
 Release:        19%{?dist}
@@ -12,6 +14,9 @@ Patch0:         0001-Port-to-plexus-utils-3.0.21.patch
 Patch1:         0002-Port-to-current-maven-artifact.patch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-aether-provider)
@@ -20,13 +25,9 @@ BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.apache.maven.shared:maven-invoker)
-BuildRequires:  mvn(org.apache.maven.wagon:wagon-file)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.easymock:easymock)
+%endif
 
 %description
 The Maven Plugin Testing contains the necessary modules
@@ -40,25 +41,10 @@ API documentation for %{name}.
 
 %package harness
 Summary: Maven Plugin Testing Mechanism
-Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
 
 %description harness
 The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
 
-%package tools
-Summary: Maven Plugin Testing Tools
-Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release}
-
-%description tools
-A set of useful tools to help the Maven Plugin testing.
-
-%package -n maven-test-tools
-Summary: Maven Testing Tool
-Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release}
-
-%description -n maven-test-tools
-Framework to test Maven Plugins with Easymock objects.
-
 %prep
 %setup -q
 
@@ -67,11 +53,10 @@ Framework to test Maven Plugins with Easymock objects.
 
 %pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin :maven-source-plugin maven-plugin-testing-harness
 
-sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
-
-# needs network for some reason
-rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
+%pom_disable_module maven-plugin-testing-tools
+%pom_disable_module maven-test-tools
 
 %mvn_alias : org.apache.maven.shared:
 
@@ -84,8 +69,6 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/
 %files -f .mfiles-%{name}
 %doc LICENSE NOTICE
 %files harness -f .mfiles-%{name}-harness
-%files tools -f .mfiles-%{name}-tools
-%files -n maven-test-tools -f .mfiles-maven-test-tools
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
@@ -102,9 +85,15 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-14
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-13
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-e895f6d96435dd8ffc9fcb8f5089ac6a  maven-plugin-testing-3.3.0-source-release.zip
+SHA512 (maven-plugin-testing-3.3.0-source-release.zip) = d4a36aeec71244d93ab880dfec88f48415098926898926094b53708e4ea0c49a7f82c4f058ec73e2c41d9650b370ca6526d73c067e8367ffec9324c1164e6d1e