From 86086bc04acf705e284735cf526a5898cfea826a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 2 Jan 2020 17:41:27 +0100
Subject: [PATCH] Factorize javacc jar property

---
 pmd-core/pom.xml        | 2 +-
 pmd-cpp/pom.xml         | 2 +-
 pmd-java/pom.xml        | 2 +-
 pmd-javascript/pom.xml  | 2 +-
 pmd-jsp/pom.xml         | 2 +-
 pmd-matlab/pom.xml      | 2 +-
 pmd-objectivec/pom.xml  | 2 +-
 pmd-plsql/pom.xml       | 2 +-
 pmd-python/pom.xml      | 2 +-
 pmd-visualforce/pom.xml | 2 +-
 pmd-vm/pom.xml          | 2 +-
 pom.xml                 | 1 +
 12 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 9443265f3b..f46e5bf834 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -24,7 +24,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 253f4b79b3..2ca5b92458 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -34,7 +34,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index ecf7dbb835..3417b76706 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -56,7 +56,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 11fb5fd85e..7d7011d3da 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -39,7 +39,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index ecb2101690..d1499f1c77 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -40,7 +40,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 73b9d0f7eb..d49731c5b8 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -34,7 +34,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index e43873e5dd..70732c4667 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -34,7 +34,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 56abfd1d71..76401058aa 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -40,7 +40,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 37cecb5d6b..92b9798e44 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -34,7 +34,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 2df2b60785..3a00d97ae3 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -40,7 +40,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 2ec5f0b9ac..f8effb5cf7 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -40,7 +40,7 @@
                             <target>
                                 <ant antfile="src/main/ant/alljavacc.xml">
                                     <property name="target" value="${project.build.directory}/generated-sources/javacc" />
-                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index edf4afbfc0..08f928262a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@ Objective-C, Perl, PHP, PLSQL, Python, Ruby, Salesforce.com Apex, Scala, Swift a
         <pmd.build-tools.version>5</pmd.build-tools.version>
 
         <pmd-designer.version>6.19.0</pmd-designer.version>
+        <javacc.jar>${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar</javacc.jar>
     </properties>
 
     <build>