From 710f47c5f433713e602680d83cdb60c8e44a54f8 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 10390e1..50ee79e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43d36446386292876c4ad834027ac609 maven-antrun-plugin-1.8-source-release.zip +SHA512 (maven-antrun-plugin-1.8-source-release.zip) = e0eb6939da873666d77e9a29cacf46e1aa34afef9bc712af05499cef042bf3864b977f59b8e9f66c5e4e1813cd088b4e0efd288abacd01f5f9d7fdcacb81b0de From b9fa70f209fe134ba00e57e4f8c9e91d55569d7f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:57 +0200 Subject: [PATCH 2/7] Mass rebuild for javapackages-tools 201901 --- maven-antrun-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index 69fa23b..89340f6 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -1,6 +1,6 @@ Name: maven-antrun-plugin Version: 1.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Maven AntRun Plugin License: ASL 2.0 @@ -45,6 +45,9 @@ This package contains the API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.8-7 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 1.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9b0be96bc859652c10af42ff00191d64d9f69ea1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 3/7] Remove unneeded %dir --- maven-antrun-plugin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index 89340f6..5d445f9 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -38,7 +38,6 @@ This package contains the API documentation for %{name}. %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc From 8fc47415613fd143d55ba11dfc51638c2c8068f8 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-antrun-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index 5d445f9..2620c3f 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -1,6 +1,6 @@ Name: maven-antrun-plugin Version: 1.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Maven AntRun Plugin License: ASL 2.0 @@ -44,6 +44,9 @@ This package contains the API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.8-8 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.8-7 - Mass rebuild for javapackages-tools 201901 From 715c472118579efef7ed9392e0ce7bf64b2cb7d3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 09:01:39 +0200 Subject: [PATCH 5/7] Update to upstream version 3.0.0 --- .gitignore | 1 + maven-antrun-plugin.spec | 27 +++++++++++++++++---------- sources | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c5d6268..9bda890 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ maven-antrun-plugin-1.4.tar.xz maven-antrun-plugin-1.5-source-release.zip maven-antrun-plugin-1.7-source-release.zip /maven-antrun-plugin-1.8-source-release.zip +/maven-antrun-plugin-3.0.0-source-release.zip diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index 2620c3f..9ccae8f 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -1,22 +1,26 @@ Name: maven-antrun-plugin -Version: 1.8 -Release: 8%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Maven AntRun Plugin - License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-antrun-plugin/ -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip - +URL: https://maven.apache.org/plugins/maven-antrun-plugin/ BuildArch: noarch +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip + BuildRequires: maven-local +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.xmlunit:xmlunit-core) +BuildRequires: mvn(org.xmlunit:xmlunit-matchers) %description This plugin provides the ability to run Ant tasks from within Maven. @@ -44,6 +48,9 @@ This package contains the API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Sun May 17 2020 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.8-8 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 50ee79e..9ac166e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-antrun-plugin-1.8-source-release.zip) = e0eb6939da873666d77e9a29cacf46e1aa34afef9bc712af05499cef042bf3864b977f59b8e9f66c5e4e1813cd088b4e0efd288abacd01f5f9d7fdcacb81b0de +SHA512 (maven-antrun-plugin-3.0.0-source-release.zip) = 27976fb318c8481013ba89f90eba118f25bad72704b642185b5bae2d796a3f57af7eddb7f665f1db402b2351d34b7487bb28d32e01e9c0180967f64be4836725 From 83eb65d47690ff21bad24000e4b7e9e93ff0ed38 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-antrun-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index 9ccae8f..c724ac8 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-antrun-plugin Version: 3.0.0 Release: 1%{?dist} @@ -9,6 +11,9 @@ BuildArch: noarch Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) @@ -21,6 +26,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.xmlunit:xmlunit-core) BuildRequires: mvn(org.xmlunit:xmlunit-matchers) +%endif %description This plugin provides the ability to run Ant tasks from within Maven. From d4a58965152a811091c7b358d5873144086edcc5 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-antrun-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index c724ac8..6640662 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-antrun-plugin Version: 3.0.0