From 31277565f2faac77d8dc6d767513a2358f85aa92 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Aug 04 2023 14:51:28 +0000
Subject: Bring back the ant-contrib dependency


---

diff --git a/mojo-executor-ant-contrib.patch b/mojo-executor-ant-contrib.patch
deleted file mode 100644
index 2efb8b6..0000000
--- a/mojo-executor-ant-contrib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/mojo-executor-maven-plugin/src/it/mojo-executor-test-project-with-dependencies/pom.xml	2019-11-21 02:49:07.000000000 -0700
-+++ b/mojo-executor-maven-plugin/src/it/mojo-executor-test-project-with-dependencies/pom.xml	2021-07-29 10:36:13.241065905 -0600
-@@ -47,17 +47,6 @@
-                                 <version>1.6</version>
-                                 <dependencies>
-                                     <dependency>
--                                        <groupId>ant-contrib</groupId>
--                                        <artifactId>ant-contrib</artifactId>
--                                        <version>1.0b3</version>
--                                        <exclusions>
--                                            <exclusion>
--                                                <groupId>ant</groupId>
--                                                <artifactId>ant</artifactId>
--                                            </exclusion>
--                                        </exclusions>
--                                    </dependency>
--                                    <dependency>
-                                         <groupId>org.apache.ant</groupId>
-                                         <artifactId>ant-nodeps</artifactId>
-                                         <version>1.8.1</version>
diff --git a/mojo-executor.spec b/mojo-executor.spec
index e82bbc3..55a8b46 100644
--- a/mojo-executor.spec
+++ b/mojo-executor.spec
@@ -4,20 +4,19 @@
 
 Name:           mojo-executor
 Version:        2.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Execute other plugins within a maven plugin
 
 License:        Apache-2.0
 URL:            https://mojo-executor.github.io/mojo-executor/
 Source0:        https://github.com/mojo-executor/mojo-executor/archive/%{name}-parent-%{version}.tar.gz
-# Remove dependency on ant-contrib, which no longer builds successfully
-Patch0:         %{name}-ant-contrib.patch
 # Fix a javadoc comment
-Patch1:         %{name}-javadoc.patch
+Patch0:         %{name}-javadoc.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 BuildRequires:  maven-local
+BuildRequires:  mvn(ant-contrib:ant-contrib)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
@@ -84,6 +83,9 @@ This package contains %{summary}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Aug  4 2023 Jerry James <loganjerry@gmail.com> - 2.4.0-6
+- Bring back the ant-contrib dependency
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild