From 00868fce0acb918b518870cd561b5f1bcde3e3c3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 1/7] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index aa1887b..71ff2ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e895f6d96435dd8ffc9fcb8f5089ac6a maven-plugin-testing-3.3.0-source-release.zip +SHA512 (maven-plugin-testing-3.3.0-source-release.zip) = d4a36aeec71244d93ab880dfec88f48415098926898926094b53708e4ea0c49a7f82c4f058ec73e2c41d9650b370ca6526d73c067e8367ffec9324c1164e6d1e From e0dcfdf9ba76ecc8ff3bd10dc0bc1180a479e50e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 2/7] Remove Obsoletes --- maven-plugin-testing.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index d44d4f5..4ef54af 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -40,21 +40,18 @@ 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. From c553d49e4f44aee0e9064230c7bc6bd0eb1d7f1f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:10 +0200 Subject: [PATCH 3/7] Mass rebuild for javapackages-tools 201901 --- maven-plugin-testing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index 4ef54af..f7e8ca1 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,6 +1,6 @@ Name: maven-plugin-testing Version: 3.3.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Maven Plugin Testing License: ASL 2.0 URL: http://maven.apache.org/plugin-testing/ @@ -87,6 +87,9 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.3.0-13 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 09 2018 Igor Gnatenko - 3.3.0-12 - Escape macros in %%changelog From 7459d6879823e4d2a3cd482b179ed4f67b5f1ced Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 4/7] Mass rebuild for javapackages-tools 201902 --- maven-plugin-testing.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index f7e8ca1..aee093b 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,6 +1,6 @@ Name: maven-plugin-testing Version: 3.3.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Maven Plugin Testing License: ASL 2.0 URL: http://maven.apache.org/plugin-testing/ @@ -87,6 +87,9 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-14 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.3.0-13 - Mass rebuild for javapackages-tools 201901 From a32187e75a915812401a0e787c75feac2b784af3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 06:05:07 +0200 Subject: [PATCH 5/7] Disable maven-plugin-testing-tools and maven-test-tools --- maven-plugin-testing.spec | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index aee093b..232863a 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -20,13 +20,8 @@ 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) %description The Maven Plugin Testing contains the necessary modules @@ -44,18 +39,6 @@ Summary: Maven Plugin Testing Mechanism %description harness The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. -%package tools -Summary: Maven Plugin Testing Tools - -%description tools -A set of useful tools to help the Maven Plugin testing. - -%package -n maven-test-tools -Summary: Maven Testing Tool - -%description -n maven-test-tools -Framework to test Maven Plugins with Easymock objects. - %prep %setup -q @@ -64,11 +47,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: @@ -81,8 +63,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 From e66840c2af9c5728a8fcadc76745103840b85c89 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 6/7] Conditionalize buildrequires in bootstrap mode --- maven-plugin-testing.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index 232863a..ffe9e13 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-plugin-testing Version: 3.3.0 Release: 14%{?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) @@ -22,6 +27,7 @@ BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description The Maven Plugin Testing contains the necessary modules From 96ae0cfceab9fe0d1e760a34ddb776bf1e803e28 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 7/7] Turn off bootstrap mode by default --- maven-plugin-testing.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index ffe9e13..4625aaf 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-plugin-testing Version: 3.3.0