From 867b142ee4dfe47115fc5658266be5761c71d315 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sun, 13 Oct 2024 12:03:17 +0200
Subject: [PATCH] Use plugin-classpath to simplify javacc-wrapper.xml

javacc is on the antrun plugin's classpath.
The javacc jar file doesn't need to be copied
explicitly.
---
 javacc-wrapper.xml      | 20 +++++---------------
 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-modelica/pom.xml    |  2 +-
 pmd-objectivec/pom.xml  |  2 +-
 pmd-plsql/pom.xml       |  2 +-
 pmd-python/pom.xml      |  2 +-
 pmd-velocity/pom.xml    |  2 +-
 pmd-visualforce/pom.xml |  2 +-
 pom.xml                 |  2 +-
 13 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/javacc-wrapper.xml b/javacc-wrapper.xml
index 05837e96ba..cde14d0ae1 100644
--- a/javacc-wrapper.xml
+++ b/javacc-wrapper.xml
@@ -25,9 +25,9 @@
          It also uses the following maven properties:
 
          - javacc.outputDirectory:  Directory in which to root the generated package tree
-         - javacc.jar:              JAR of JavaCC in the local maven repository
+         - plugin-classpath:        The classpath of maven-antrun-plugin with javacc.jar dependency
+                                    Provided by maven via "<property name="plugin-classpath" refid="maven.plugin.classpath"/>"
          - some properties of project.build
-
     -->
 
     <condition property="lang-name-camelcase" value="${lang-name}">
@@ -40,8 +40,6 @@
     <property name="target-package-dir" value="${javacc.outputDirectory}/net/sourceforge/pmd/lang/${lang-id}/ast" />
     <property name="stamp-file" value="${project.build.directory}/last-generated-timestamp" />
 
-    <property name="javacc-home.path" value="${project.build.directory}/lib/javacc" />
-
     <property name="lang-ast-package" value="net.sourceforge.pmd.lang.${lang-id}.ast" />
     <property name="ast-api-package" value="net.sourceforge.pmd.lang.ast" />
     <property name="ast-impl-package" value="${ast-api-package}.impl.javacc" />
@@ -84,7 +82,7 @@
 
     <target name="alljavacc"
             description="Generates JavaCC sources and cleans them up"
-            depends="checkUpToDate,init,jjtree,jjtree-ersatz,javacc,adapt-generated,default-visitor,cleanup" />
+            depends="checkUpToDate,init,jjtree,jjtree-ersatz,javacc,adapt-generated,default-visitor" />
 
     <target name="checkUpToDate"
             description="Checks the input files are up to date">
@@ -104,9 +102,6 @@
 
 
     <target name="init" unless="javaccBuildNotRequired" description="Initialize build">
-        <mkdir dir="${javacc-home.path}" />
-        <copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar" />
-
         <mkdir dir="${javacc.outputDirectory}" />
         <touch file="${stamp-file}" />
         <delete dir="${target-package-dir}" />
@@ -117,11 +112,6 @@
         </condition>
     </target>
 
-    <target name="cleanup" unless="javaccBuildNotRequired">
-        <delete dir="${javacc-home.path}" />
-    </target>
-
-
     <target name="jjtree" unless="jjtreeBuildNotRequired" description="Runs JJTree">
 
         <!--
@@ -130,7 +120,7 @@
         -->
         <java fork="true"
               classname="jjtree"
-              classpath="${javacc-home.path}/javacc.jar">
+              classpath="${plugin-classpath}">
             <sysproperty key="file.encoding" value="UTF-8" />
             <arg value="-OUTPUT_DIRECTORY:${target-package-dir}" />
             <arg value="-NODE_USES_PARSER:false" />
@@ -148,7 +138,7 @@
     <target name="javacc" depends="jjtree" unless="javaccBuildNotRequired">
         <java fork="true"
               classname="javacc"
-              classpath="${javacc-home.path}/javacc.jar">
+              classpath="${plugin-classpath}">
             <sysproperty key="file.encoding" value="UTF-8" />
             <arg value="-STATIC:false" />
             <arg value="-USER_CHAR_STREAM:true" />
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index adbfbd8e3c..a42c4f850a 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -34,10 +34,10 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
                                     <property name="lang-name" value="Cpp" />
                                     <property name="lang-id" value="cpp" />
-                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index d8131b8d65..2d82829d15 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -105,7 +105,7 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
-                                    <property name="javacc.jar" value="${javacc.jar}" />
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="lang-name" value="Java" />
                                     <property name="lang-id" value="java" />
                                 </ant>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 5e4506efd4..ea4d55938d 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -47,10 +47,10 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
                                     <property name="lang-name" value="Ecmascript5" />
                                     <property name="lang-id" value="ecmascript5" />
-                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index 9f1d3fb223..790d5353f8 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -40,7 +40,7 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
-                                    <property name="javacc.jar" value="${javacc.jar}" />
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="lang-name" value="Jsp" />
                                     <property name="lang-id" value="jsp" />
                                 </ant>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 373fa78a8d..42a69e2497 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -34,10 +34,10 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
                                     <property name="lang-name" value="Matlab" />
                                     <property name="lang-id" value="matlab" />
-                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index 639c224e2c..d551bc25a1 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -64,7 +64,7 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
-                                    <property name="javacc.jar" value="${javacc.jar}" />
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="lang-name" value="Modelica" />
                                     <property name="lang-id" value="modelica" />
                                 </ant>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 66818f1a47..197c6dac58 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -34,10 +34,10 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
                                     <property name="lang-name" value="ObjectiveC" />
                                     <property name="lang-id" value="objectivec" />
-                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 2e6ad097a4..26a5614255 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -40,7 +40,7 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
-                                    <property name="javacc.jar" value="${javacc.jar}" />
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="lang-name" value="PLSQL" />
                                     <property name="lang-name-camelcase" value="Plsql" />
                                     <property name="lang-id" value="plsql" />
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 85b6643126..30326faeeb 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -34,10 +34,10 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
                                     <property name="lang-name" value="Python" />
                                     <property name="lang-id" value="python" />
-                                    <property name="javacc.jar" value="${javacc.jar}" />
                                 </ant>
                             </target>
                         </configuration>
diff --git a/pmd-velocity/pom.xml b/pmd-velocity/pom.xml
index 6cb54b0cd5..905cd6b41c 100644
--- a/pmd-velocity/pom.xml
+++ b/pmd-velocity/pom.xml
@@ -43,7 +43,7 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
-                                    <property name="javacc.jar" value="${javacc.jar}" />
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="lang-name" value="Vtl" />
                                     <property name="lang-id" value="velocity" />
                                 </ant>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 7ae874578d..164795a623 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -47,7 +47,7 @@
                         <configuration>
                             <target>
                                 <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
-                                    <property name="javacc.jar" value="${javacc.jar}" />
+                                    <property name="plugin-classpath" refid="maven.plugin.classpath"/>
                                     <property name="lang-name" value="Vf" />
                                     <property name="lang-id" value="visualforce" />
                                 </ant>
diff --git a/pom.xml b/pom.xml
index 67269e26ad..fd7181a348 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
         <pmd.build-tools.version>27</pmd.build-tools.version>
 
         <pmd-designer.version>7.2.0</pmd-designer.version>
-        <javacc.jar>${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar</javacc.jar>
+
         <javacc.outputDirectory>${project.build.directory}/generated-sources/javacc</javacc.outputDirectory>
         <javacc.ant.wrapper>${project.basedir}/../javacc-wrapper.xml</javacc.ant.wrapper>