From ab1976382af7be6b424a5500a2ce5dc84e645238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juan.sotuyo@pedidosya.com>
Date: Sat, 12 Oct 2024 17:28:18 -0300
Subject: [PATCH] Remove ant.contrib.jar property

---
 antlr4-wrapper.xml | 9 +--------
 pmd-cs/pom.xml     | 1 -
 pmd-dart/pom.xml   | 1 -
 pmd-go/pom.xml     | 1 -
 pmd-kotlin/pom.xml | 1 -
 pmd-lua/pom.xml    | 1 -
 pmd-swift/pom.xml  | 1 -
 pom.xml            | 1 -
 8 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/antlr4-wrapper.xml b/antlr4-wrapper.xml
index 0832bd9bc0..c3e4527f9f 100644
--- a/antlr4-wrapper.xml
+++ b/antlr4-wrapper.xml
@@ -11,15 +11,8 @@
         - root-node-name: name of the root node without prefix (eg "TopLevel"), will be made to implement RootNode
 
         See AntlrGeneratedParserBase
-
-        It also uses the following maven properties:
-         - ant.contrib.jar:  Location of the ant-contrib jar
 -->
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-        <classpath>
-            <pathelement location="${ant.contrib.jar}"/>
-        </classpath>
-    </taskdef>
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 
     <property name="target-package-dir" value="${antlr4.outputDirectory}/net/sourceforge/pmd/lang/${lang-id}/ast"/>
     <property name="stamp-file" value="${project.build.directory}/last-generated-timestamp" />
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index f4879ed0e7..0eec39f809 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -30,7 +30,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
-                                    <property name="ant.contrib.jar" value="${ant.contrib.jar}" />
                                     <property name="lang-name" value="CSharp" />
                                     <property name="lang-id" value="cs" />
                                 </ant>
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index f772795832..496115127b 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -30,7 +30,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
-                                    <property name="ant.contrib.jar" value="${ant.contrib.jar}" />
                                     <property name="lang-name" value="Dart" />
                                     <property name="lang-id" value="dart" />
                                 </ant>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index cf47e5217c..4df297ebc9 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -30,7 +30,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
-                                    <property name="ant.contrib.jar" value="${ant.contrib.jar}" />
                                     <property name="lang-name" value="Golang" />
                                     <property name="lang-id" value="go" />
                                 </ant>
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 5e9dbf2e80..40f19513de 100644
--- a/pmd-kotlin/pom.xml
+++ b/pmd-kotlin/pom.xml
@@ -43,7 +43,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${antlr4.ant.wrapper}" target="pmd-language">
-                                    <property name="ant.contrib.jar" value="${ant.contrib.jar}" />
                                     <property name="lang-name" value="Kotlin" />
                                     <property name="lang-id" value="kotlin" />
                                     <property name="root-node-name" value="KotlinFile" />
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index c8adda151f..f3a24be6d3 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -30,7 +30,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
-                                    <property name="ant.contrib.jar" value="${ant.contrib.jar}" />
                                     <property name="lang-name" value="Lua" />
                                     <property name="lang-id" value="lua" />
                                 </ant>
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index 0c50cdc818..023fa8dd39 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -42,7 +42,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${antlr4.ant.wrapper}" target="pmd-language">
-                                    <property name="ant.contrib.jar" value="${ant.contrib.jar}" />
                                     <property name="lang-name" value="Swift" />
                                     <property name="lang-id" value="swift" />
                                     <property name="root-node-name" value="TopLevel" />
diff --git a/pom.xml b/pom.xml
index 0f41e68e7d..871775ff54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,6 @@
         <javacc.ant.wrapper>${project.basedir}/../javacc-wrapper.xml</javacc.ant.wrapper>
 
         <ant-contrib.version>1.0b3</ant-contrib.version>
-        <ant.contrib.jar>${settings.localRepository}/ant-contrib/ant-contrib/${ant-contrib.version}/ant-contrib-${ant-contrib.version}.jar</ant.contrib.jar>
 
         <antlr4.outputDirectory>${project.build.directory}/generated-sources/antlr4</antlr4.outputDirectory>
         <antlr4.ant.wrapper>${project.basedir}/../antlr4-wrapper.xml</antlr4.ant.wrapper>