diff --git a/.gitignore b/.gitignore index 4e94ce5..6a5ce56 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-antrun-plugin-1.8-source-release.zip +SOURCES/maven-antrun-plugin-3.1.0-source-release.zip diff --git a/.maven-antrun-plugin.metadata b/.maven-antrun-plugin.metadata index 1884eea..e83fb24 100644 --- a/.maven-antrun-plugin.metadata +++ b/.maven-antrun-plugin.metadata @@ -1 +1 @@ -bf8f70edf126ef814f9ddd8c28680f59c928c95e SOURCES/maven-antrun-plugin-1.8-source-release.zip +bcc9c57627a8a07f3cea921d949fddecbbdec14a SOURCES/maven-antrun-plugin-3.1.0-source-release.zip diff --git a/SPECS/maven-antrun-plugin.spec b/SPECS/maven-antrun-plugin.spec index 2620c3f..0c16621 100644 --- a/SPECS/maven-antrun-plugin.spec +++ b/SPECS/maven-antrun-plugin.spec @@ -1,35 +1,46 @@ +%bcond_with bootstrap + Name: maven-antrun-plugin -Version: 1.8 -Release: 8%{?dist} +Version: 3.1.0 +Release: 20%{?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 - +License: Apache-2.0 +URL: https://maven.apache.org/plugins/maven-antrun-plugin/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local 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.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +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. It is even possible to embed Ant scripts in the POM. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep -%setup -q +%autosetup -p1 %build %mvn_build @@ -38,18 +49,91 @@ This package contains the API documentation for %{name}. %mvn_install %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.1.0-19 +- Update javapackages test plan to f42 + +* Wed Jul 24 2024 Mikolaj Izdebski - 3.1.0-11 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 3.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.1.0-9 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.1.0-8 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.1.0-5 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Apr 26 2022 Mikolaj Izdebski - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Sat Feb 05 2022 Jiri Vanek - 3.0.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.0.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.8-11 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sun May 17 2020 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 1.8-8 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 1.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1.8-7 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 1.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild