From 8d5a43d3102f216b87ca881bed8d7f5017b93f23 Mon Sep 17 00:00:00 2001
From: Terence Parr <parrt@antlr.org>
Date: Sat, 9 Apr 2022 13:13:37 -0700
Subject: [PATCH] update pom versions

Signed-off-by: Terence Parr <parrt@antlr.org>
---
 antlr3-maven-plugin/pom.xml                   | 53 ++++++++++--------
 .../org/antlr/mojo/antlr3/Antlr3Mojo.java     | 54 ++++++++-----------
 .../antlr/mojo/antlr3/GUnitExecuteMojo.java   | 26 ++++-----
 3 files changed, 65 insertions(+), 68 deletions(-)

diff --git a/antlr3-maven-plugin/pom.xml b/antlr3-maven-plugin/pom.xml
index 4c88ad32e..f6f9d5347 100644
--- a/antlr3-maven-plugin/pom.xml
+++ b/antlr3-maven-plugin/pom.xml
@@ -66,19 +66,18 @@
     </parent>
 
     <name>ANTLR 3 Maven plugin</name>
-    <prerequisites>
-        <maven>2.0</maven>
-    </prerequisites>
+
+    <properties>
+        <mavenVersion>3.8.4</mavenVersion>
+        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <!--
      Where does our actual project live on the interwebs.
       -->
     <url>http://antlr.org</url>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <description>
 
 This is the brand new, re-written from scratch plugin for ANTLR v3.
@@ -162,20 +161,40 @@ Jim Idle - March 2009
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
+            <version>3.8.4</version>
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.6.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0</version>
+            <artifactId>maven-compat</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.4.1</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-compiler-api</artifactId>
-            <version>2.0</version>
+            <version>2.9.0</version>
         </dependency>
 
         <!--
@@ -215,26 +234,16 @@ Jim Idle - March 2009
                     <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
             </plugin>
-
         </plugins>
 
     </build>
 
     <reporting>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <quiet>true</quiet>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.6.2</version>
             </plugin>
         </plugins>
     </reporting>
diff --git a/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java b/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java
index 6c18c5564..f833f5ae3 100644
--- a/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java
+++ b/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java
@@ -56,10 +56,10 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * Parses ANTLR grammar files {@code *.g} and transforms them into Java source
  * files.
  *
- * @goal antlr
- * @phase generate-sources
- * @requiresDependencyResolution compile
- * @requiresProject true
+ * goal antlr
+ * phase generate-sources
+ * requiresDependencyResolution compile
+ * requiresProject true
  * 
  * @author <a href="mailto:jimi@temporal-wave.com">Jim Idle</a>
  */
@@ -74,14 +74,14 @@ public class Antlr3Mojo
      * it will report various statistics about the parser, such as information
      * on cyclic DFAs, which rules may use backtracking, and so on.
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean report;
     /**
      * If set to true, then the ANTLR tool will print a version of the input
      * grammar(s) which are stripped of any embedded actions.
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean printGrammar;
     /**
@@ -89,21 +89,21 @@ public class Antlr3Mojo
      * be set to debug mode. This means that when run, the code will 'hang' and
      * wait for a debug connection on a TCP port (49100 by default).
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean debug;
     /**
      * If set to true, then the generated parser will compute and report profile
      * information at runtime.
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean profile;
     /**
      * If set to true, then the ANTLR tool will generate a description of the
      * NFA for each rule in <a href="http://www.graphviz.org">Dot format</a>
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean nfa;
     /**
@@ -111,7 +111,7 @@ public class Antlr3Mojo
      * DFA for each decision in the grammar in
      * <a href="http://www.graphviz.org">Dot format</a>.
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean dfa;
     /**
@@ -119,7 +119,7 @@ public class Antlr3Mojo
      * points to stdout ({@link System#out} for the Java target) as an aid to
      * debugging.
      *
-     * @parameter default-value="false"
+     * default-value="false"
      */
     protected boolean trace;
     /**
@@ -128,7 +128,7 @@ public class Antlr3Mojo
      * ANTLR supports the built-in formats {@code antlr}, {@code gnu} and
      * {@code vs2005}.
      *
-     * @parameter default-value="antlr"
+     * default-value="antlr"
      */
     protected String messageFormat;
     /**
@@ -136,7 +136,7 @@ public class Antlr3Mojo
      * generation process. This includes the names of files, the version of
      * ANTLR, and more.
      *
-     * @parameter default-value="true"
+     * default-value="true"
      */
     protected boolean verbose;
 
@@ -144,7 +144,7 @@ public class Antlr3Mojo
      * The maximum number of alternatives allowed in an inline switch statement.
      * Beyond this, ANTLR will not generate a switch statement for the DFA.
      *
-     * @parameter default-value="300"
+     * default-value="300"
      */
     private int maxSwitchCaseLabels;
 
@@ -153,7 +153,7 @@ public class Antlr3Mojo
      * statement. For decisions with fewer alternatives, an if/else if/else
      * statement will be used instead.
      *
-     * @parameter default-value="3"
+     * default-value="3"
      */
     private int minSwitchAlts;
 
@@ -171,30 +171,26 @@ public class Antlr3Mojo
      * A set of Ant-like inclusion patterns used to select files from the source
      * directory for processing. By default, the pattern <code>**&#47;*.g</code>
      * is used to select grammar files.</p>
-     *
-     * @parameter
      */
     protected Set<String> includes = new HashSet<String>();
     /**
      * A set of Ant-like exclusion patterns used to prevent certain files from
      * being processed. By default, this set is empty such that no files are
      * excluded.
-     *
-     * @parameter
      */
     protected Set<String> excludes = new HashSet<String>();
     /**
      * The current Maven project.
      *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
+     * expression="${project}"
+     * required
+     * readonly
      */
     protected MavenProject project;
     /**
      * The directory where the ANTLR grammar files ({@code *.g}) are located.
      *
-     * @parameter default-value="${basedir}/src/main/antlr3"
+     * default-value="${basedir}/src/main/antlr3"
      */
     private File sourceDirectory;
     /**
@@ -203,7 +199,7 @@ public class Antlr3Mojo
      * such that the generated files will participate in later build phases like
      * compiling and packaging.
      *
-     * @parameter default-value="${project.build.directory}/generated-sources/antlr3"
+     * default-value="${project.build.directory}/generated-sources/antlr3"
      * @required
      */
     private File outputDirectory;
@@ -212,7 +208,7 @@ public class Antlr3Mojo
      * grammars. Note that ANTLR will not try to process grammars that it finds
      * to be imported into other grammars (in the same processing session).
      *
-     * @parameter default-value="${basedir}/src/main/antlr3/imports"
+     * default-value="${basedir}/src/main/antlr3/imports"
      */
     private File libDirectory;
 
@@ -398,14 +394,6 @@ public void execute()
 
     }
 
-
-    /**
-     *
-     * @param sourceDirectory
-     * @param outputDirectory
-     * @throws IOException
-     * @throws InclusionScanException
-     */
     private void processGrammarFiles(File sourceDirectory, File outputDirectory)
             throws IOException, InclusionScanException {
         // Which files under the source set should we be looking for as grammar files
diff --git a/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java b/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java
index a7e231769..b6fb72cc7 100644
--- a/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java
+++ b/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java
@@ -40,11 +40,11 @@
 /**
  * Takes gUnit scripts and directly performs testing.
  *
- * @goal gunit
+ * goal gunit
  *
- * @phase test
- * @requiresDependencyResolution test
- * @requiresProject true
+ * phase test
+ * requiresDependencyResolution test
+ * requiresProject true
  *
  * @author Steve Ebersole
  */
@@ -56,8 +56,8 @@ public class GUnitExecuteMojo extends AbstractMojo {
 	/**
      * INTERNAL : The Maven Project to which we are attached
      *
-     * @parameter expression="${project}"
-     * @required
+     * expression="${project}"
+     * required
      */
     private MavenProject project;
 
@@ -65,8 +65,8 @@ public class GUnitExecuteMojo extends AbstractMojo {
 	 * INTERNAL : The artifacts associated to the dependencies defined as part
 	 * of our configuration within the project to which we are being attached.
 	 *
-	 * @parameter expression="${plugin.artifacts}"
-     * @required
+	 * expression="${plugin.artifacts}"
+     * required
      * @readonly
 	 */
 	private List<Artifact> pluginArtifacts;
@@ -74,8 +74,8 @@ public class GUnitExecuteMojo extends AbstractMojo {
 	/**
      * Specifies the directory containing the gUnit testing files.
      *
-     * @parameter expression="${basedir}/src/test/gunit"
-     * @required
+     * expression="${basedir}/src/test/gunit"
+     * required
      */
     private File sourceDirectory;
 
@@ -97,8 +97,8 @@ public class GUnitExecuteMojo extends AbstractMojo {
 	/**
      * Specifies directory to which gUnit reports should get written.
      *
-     * @parameter expression="${basedir}/target/gunit-report"
-     * @required
+     * expression="${basedir}/target/gunit-report"
+     * required
      */
     private File reportDirectory;
 
@@ -107,7 +107,7 @@ public class GUnitExecuteMojo extends AbstractMojo {
 	 * <p>
 	 * By default we skip gUnit tests if the user requested that all testing be skipped using 'maven.test.skip'</p>
 	 *
-	 * @parameter expression="${maven.test.skip}"
+	 * expression="${maven.test.skip}"
 	 */
 	private boolean skip;