From a0a8e1a2fdb27179b40c1321534345802c91d9b2 Mon Sep 17 00:00:00 2001
From: Mat Booth <mbooth@apache.org>
Date: Sun, 22 Aug 2021 13:36:15 +0100
Subject: [PATCH 3/3] Update to latest maven-ant-plugin

Remove usages of deprecated ant-plugin configuration directives
that were removed in the latest release of the plugin

Signed-off-by: Mat Booth <mbooth@apache.org>
---
 pom.xml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index e50a874..75506dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,16 +225,35 @@
         </executions>
       </plugin>
 -->
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.2.0</version>
+          <executions>
+            <execution>
+              <id>add-source-directory</id>
+              <phase>generate-sources</phase>
+              <configuration>
+              <sources>
+                <source>${project.build.directory}/java</source>
+              </sources>
+              </configuration>
+              <goals>
+                <goal>add-source</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.6</version>
+          <version>3.0.0</version>
           <executions>
             <execution>
             <id>build-native-library</id>
             <phase>generate-sources</phase>
             <configuration>
-              <tasks>
+              <target>
                 <property name="os.name" value="${os.name}" />
                 <property name="os.arch" value="${os.arch}" />
                 <property name="java.home" value="${java.home}" />
@@ -242,11 +261,7 @@
                 <property name="build.dir" value="${project.build.directory}" />
                 <property name="build.classes.dir" value="${project.build.outputDirectory}" />
                 <ant antfile="version.xml" dir="." target="-generate-version-source" />
-              </tasks>
-              <sourceRoot>
-                ${project.build.directory}/java
-              </sourceRoot>
-
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -258,7 +273,7 @@
                     <goal>run</goal>
                 </goals>
                 <configuration>
-                    <tasks>
+                    <target>
                       <unzip dest="${project.build.directory}/" overwrite="true">
                           <patternset>
                             <include name="**/*.so" />
@@ -275,7 +290,7 @@
                         <arg value="-c"/>
                         <arg value="strip -s ${project.build.directory}/jni/*/*.so"/>
                       </exec>
-                    </tasks>
+                    </target>
                 </configuration>
             </execution>
         </executions>
-- 
2.31.1