From f264609453e9d8f4c4f3ade9880d0bd4c306fbfa Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Tue, 27 Nov 2012 23:34:36 -0600
Subject: [PATCH 01/35] Updated POMs for deploying to sonotype

---
 antlr4-maven-plugin/pom.xml | 129 +-----------------------------------
 pom.xml                     |  64 +++++++++++++++---
 runtime/Java/pom.xml        |   1 +
 tool/pom.xml                |   7 +-
 4 files changed, 61 insertions(+), 140 deletions(-)

diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml
index 84959b7cb..2ef68f7fd 100644
--- a/antlr4-maven-plugin/pom.xml
+++ b/antlr4-maven-plugin/pom.xml
@@ -48,135 +48,16 @@
     <packaging>maven-plugin</packaging>
 
     <name>ANTLR 4 Maven plugin</name>
+    <description>Maven plugin for ANTLR 4 grammars</description>
 
     <prerequisites>
         <maven>3.0</maven>
     </prerequisites>
-
-    <developers>
-
-        <developer>
-            <name>Terence Parr</name>
-            <url>http://antlr.org/wiki/display/~admin/Home</url>
-            <roles>
-                <role>Project lead - ANTLR</role>
-            </roles>
-        </developer>
-
-        <developer>
-            <name>Sam Harwell</name>
-            <url>http://tunnelvisionlabs.com</url>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-
-        <developer>
-            <name>Jim Idle</name>
-            <url>http://www.temporal-wave.com</url>
-            <roles>
-                <role>Originator, version 4.0</role>
-            </roles>
-        </developer>
-
-        <developer>
-            <name>David Holroyd</name>
-            <url>http://david.holroyd.me.uk/</url>
-            <roles>
-                <role>Originator - prior version</role>
-            </roles>
-        </developer>
-
-        <developer>
-            <name>Kenny MacDermid</name>
-            <url>mailto:kenny "at" kmdconsulting.ca</url>
-            <roles>
-                <role>Contributor - prior versions</role>
-            </roles>
-        </developer>
-
-    </developers>
-
-    <!-- Location of the license description for this project
-      -->
-    <licenses>
-        <license>
-            <distribution>repo</distribution>
-            <name>The BSD License</name>
-            <url>http://www.antlr.org/LICENSE.txt </url>
-        </license>
-    </licenses>
-
-    <distributionManagement>
-
-        <repository>
-            <id>antlr-repo</id>
-            <name>ANTLR Testing repository</name>
-            <url>scpexe://antlr.org/home/mavensync/antlr-repo</url>
-        </repository>
-
-        <snapshotRepository>
-            <id>antlr-snapshot</id>
-            <name>ANTLR Testing Snapshot Repository</name>
-            <url>scpexe://antlr.org/home/mavensync/antlr-snapshot</url>
-        </snapshotRepository>
-
-        <site>
-            <id>antlr-repo</id>
-            <name>ANTLR Maven Plugin Web Site</name>
-            <url>scpexe://antlr.org/home/mavensync/antlr-maven-webs/antlr4-maven-plugin</url>
-        </site>
-    </distributionManagement>
-
-    <!--
-
-    Inform Maven of the ANTLR snapshot repository, which it will
-    need to consult to get the latest snapshot build of the runtime and tool
-    if it was not built and installed locally.
-    -->
-    <repositories>
-
-      <!--
-        This is the ANTLR repository.
-        -->
-        <repository>
-            <id>antlr-snapshot</id>
-            <name>ANTLR Testing Snapshot Repository</name>
-            <url>http://antlr.org/antlr-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            
-        </repository>
-
-    </repositories>
     
     <!-- Ancilliary information for completeness
       -->
     <inceptionYear>2009</inceptionYear>
 
-    <mailingLists>
-        <mailingList>
-            <archive>http://antlr.markmail.org/</archive>
-            <otherArchives>
-                <otherArchive>http://www.antlr.org/pipermail/antlr-interest/</otherArchive>
-            </otherArchives>
-            <name>ANTLR Users</name>
-            <subscribe>http://www.antlr.org/mailman/listinfo/antlr-interest/</subscribe>
-            <unsubscribe>http://www.antlr.org/mailman/options/antlr-interest/</unsubscribe>
-            <post>antlr-interest@antlr.org</post>
-        </mailingList>
-    </mailingLists>
-
-    <organization>
-        <name>ANTLR.org</name>
-        <url>http://www.antlr.org</url>
-    </organization>
     <!-- ============================================================================= -->
 
     <!--
@@ -253,14 +134,6 @@
 
         <defaultGoal>install</defaultGoal>
 
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-                <version>2.2</version>
-            </extension>
-        </extensions>
-
         <plugins>
 
             <plugin>
diff --git a/pom.xml b/pom.xml
index 322e284e7..8887a9a1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.antlr</groupId>
     <artifactId>project</artifactId>
@@ -8,8 +14,37 @@
     <packaging>pom</packaging>
 
     <name>ANTLR 4</name>
+    <description>ANTLR 4 Master Build POM</description>
     <url>http://www.antlr.org</url>
 
+    <licenses>
+        <license>
+            <name>The BSD License</name>
+            <url>http://www.antlr.org/license.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+
+        <developer>
+            <name>Terence Parr</name>
+            <url>http://antlr.org/wiki/display/~admin/Home</url>
+            <roles>
+                <role>Project lead - ANTLR</role>
+            </roles>
+        </developer>
+
+        <developer>
+            <name>Sam Harwell</name>
+            <url>http://tunnelvisionlabs.com</url>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+
+    </developers>
+
     <modules>
         <module>runtime/Java</module>
         <module>tool</module>
@@ -27,16 +62,27 @@
     </issueManagement>
 
     <scm>
-        <url>https://github.com/antlr/antlr4</url>
+        <url>git://github.com/antlr/antlr4.git</url>
         <connection>scm:git:git://github.com/antlr/antlr4.git</connection>
+        <developerConnection>scm:git:git@github.com:antlr/antlr4.git</developerConnection>
     </scm>
 
-    <repositories>
-        <repository>
-            <id>antlr.snapshots</id>
-            <name>ANTLR Snapshots Repository</name>
-            <url>http://antlr.org/antlr-snapshot</url>
-        </repository>
-    </repositories>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 5139a0652..596c96225 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -13,6 +13,7 @@
     <artifactId>antlr4-runtime</artifactId>
 
     <name>ANTLR 4 Runtime</name>
+    <description>The ANTLR 4 Runtime</description>
 
     <dependencies>
         <dependency>
diff --git a/tool/pom.xml b/tool/pom.xml
index 811d48fd9..e0681cd2f 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -12,6 +12,7 @@
     <artifactId>antlr4</artifactId>
 
     <name>ANTLR 4 Tool</name>
+    <description>The ANTLR 4 grammar compiler.</description>
 
     <dependencies>
         <dependency>
@@ -28,12 +29,12 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
-            <version>3.4.1-SNAPSHOT</version>
+            <version>3.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>ST4</artifactId>
-            <version>4.0.4</version>
+            <version>4.0.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -57,7 +58,7 @@
            <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr3-maven-plugin</artifactId>
-                <version>3.4</version>
+                <version>3.5.1-SNAPSHOT</version>
                 <configuration>
                     <sourceDirectory>src</sourceDirectory>
                     <verbose>true</verbose>

From 6e6201a341416034972028d79ab5a1651b34bef2 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Wed, 28 Nov 2012 11:43:09 -0600
Subject: [PATCH 02/35] Build uber-jar of the tool to make it easier to
 generate code on the command line

---
 tool/pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tool/pom.xml b/tool/pom.xml
index e0681cd2f..4da90ec60 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -55,6 +55,33 @@
         </testResources>
 
         <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <createSourcesJar>true</createSourcesJar>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.antlr.v4.Tool</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
            <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr3-maven-plugin</artifactId>

From 75a0551308e4b43d004efffca46c9ee5a07c62b7 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Wed, 28 Nov 2012 22:12:28 -0600
Subject: [PATCH 03/35] Update POM to include the Implementation-Title,
 Implementation-Version, and Implementation-Vendor-Id in the MANIFEST.MF

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8887a9a1e..a62a55afb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,19 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>

From af76d3294e4138c319e716b1414fedbf86ca6d6c Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Fri, 30 Nov 2012 12:26:25 -0600
Subject: [PATCH 04/35] Configure the maven-source-plugin and
 maven-javadoc-plugin in the parent POM

---
 antlr4-maven-plugin/pom.xml | 28 ----------------------------
 pom.xml                     | 28 ++++++++++++++++++++++++++++
 runtime/Java/pom.xml        | 28 ----------------------------
 tool/pom.xml                | 28 ----------------------------
 4 files changed, 28 insertions(+), 84 deletions(-)

diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml
index 2ef68f7fd..51d12627f 100644
--- a/antlr4-maven-plugin/pom.xml
+++ b/antlr4-maven-plugin/pom.xml
@@ -189,34 +189,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
 
     </build>
diff --git a/pom.xml b/pom.xml
index a62a55afb..91ed4b6e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,34 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 596c96225..e27e7275b 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -44,34 +44,6 @@
                     <compilerArgument>-Xlint:-serial</compilerArgument>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/tool/pom.xml b/tool/pom.xml
index 4da90ec60..33d39b596 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -108,34 +108,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.12.4</version>

From 8a3298e07513f928889733428a7f730579f8c99a Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Fri, 30 Nov 2012 12:28:39 -0600
Subject: [PATCH 05/35] Configure the maven-compiler-plugin in the parent POM,
 including the use of a bootstrap classpath to build a Java 6-compatible jar
 even when Java 7 is used to build it

---
 antlr4-maven-plugin/pom.xml | 14 -------------
 pom.xml                     | 42 +++++++++++++++++++++++++++++++++++++
 runtime/Java/pom.xml        | 16 --------------
 tool/pom.xml                |  9 --------
 4 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml
index 51d12627f..8e6b19591 100644
--- a/antlr4-maven-plugin/pom.xml
+++ b/antlr4-maven-plugin/pom.xml
@@ -136,20 +136,6 @@
 
         <plugins>
 
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>true</showDeprecation>
-                    <showWarnings>true</showWarnings>
-                    <compilerArguments>
-                        <Xlint/>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 91ed4b6e1..4f5b617e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java5.home>${env.JAVA5_HOME}</java5.home>
+        <java6.home>${env.JAVA6_HOME}</java6.home>
+        <bootclasspath.compile>${java6.home}/jre/lib/rt.jar</bootclasspath.compile>
+        <bootclasspath.testCompile>${java6.home}/jre/lib/rt.jar</bootclasspath.testCompile>
     </properties>
 
     <issueManagement>
@@ -69,6 +73,44 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <sourceDirectory>src</sourceDirectory>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <configuration>
+                            <source>1.6</source>
+                            <target>1.6</target>
+                            <compilerArgument>-Xlint:-serial</compilerArgument>
+                            <compilerArguments>
+                                <bootclasspath>${bootclasspath.compile}</bootclasspath>
+                                <Xlint/>
+                            </compilerArguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <configuration>
+                            <source>1.6</source>
+                            <target>1.6</target>
+                            <compilerArgument>-Xlint:-serial</compilerArgument>
+                            <compilerArguments>
+                                <bootclasspath>${bootclasspath.testCompile}</bootclasspath>
+                                <Xlint/>
+                            </compilerArguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index e27e7275b..8a33d2382 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -29,22 +29,6 @@
         <sourceDirectory>src</sourceDirectory>
         <resources/>
 
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showWarnings>true</showWarnings>
-                    <showDeprecation>true</showDeprecation>
-                    <compilerArguments>
-                        <Xlint/>
-                    </compilerArguments>
-                    <compilerArgument>-Xlint:-serial</compilerArgument>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
diff --git a/tool/pom.xml b/tool/pom.xml
index 33d39b596..04355a7a4 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -99,15 +99,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.12.4</version>

From 6de457096472a2d9fa066c3f1681a2f62497c16a Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Fri, 30 Nov 2012 12:28:58 -0600
Subject: [PATCH 06/35] Explicitly specify the compile scope

---
 tool/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tool/pom.xml b/tool/pom.xml
index 04355a7a4..da4eddae6 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -25,16 +25,19 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
             <version>3.5.1-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>ST4</artifactId>
             <version>4.0.7-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 

From 8ca298faffa9f669a76eaafa22e9c092b1e4156a Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Fri, 30 Nov 2012 12:34:54 -0600
Subject: [PATCH 07/35] Update changes.txt

---
 CHANGES.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e56b6e977..c7d3951d5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,21 @@
 ANTLR v4 Honey Badger
 
+November 30, 2012
+
+* Maven updates (cleanup, unification, and specify Java 6 bootstrap classpath)
+
+November 28, 2012
+
+* Maven updates (uber-jar, manifest details)
+
+November 27, 2012
+
+* Maven updates (prepare for deploying to Sonatype OSS)
+* Use efficient bitset tests instead of long chains of operator ==
+
 November 26, 2012
 
+* Maven updates (include sources and javadocs, fix warnings)
 * Don't generate action methods for lexer rules not containing an action
 * Generated action and sempred methods are private
 * Remove unused / problematic methods:

From 5d8d9670df11a27c66266340bacba498019aaa06 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Fri, 30 Nov 2012 12:40:24 -0600
Subject: [PATCH 08/35] Updated .gitignore

---
 .gitignore | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 36cfc9caa..2068ad7b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,19 @@
 # Maven build folders
+/target/
 /tool/target/
 /runtime/Java/target/
-/gunit/target/
 /antlr4-maven-plugin/target/
 
 # Ant build folders
 /build/
 /dist/
 
+# NetBeans user configuration files
+/nbactions.xml
+/tool/nbactions.xml
+/runtime/Java/nbactions.xml
+/antlr4-maven-plugin/nbactions.xml
+
 # IntelliJ projects
 *.iml
 *.ipr

From c30dc20aa5a8cc2c359576e7b672fab14e6f82ac Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 12:25:25 -0600
Subject: [PATCH 09/35] Cleaned up documentation and minor tweaks in
 Antlr4ErrorLog

---
 .../org/antlr/mojo/antlr4/Antlr4ErrorLog.java | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java
index 49fb58f02..e573b7a5f 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4ErrorLog.java
@@ -1,9 +1,7 @@
-/**
- [The "BSD licence"]
-
- ANTLR        - Copyright (c) 2005-2008 Terence Parr
- Maven Plugin - Copyright (c) 2009      Jim Idle
-
+/*
+ [The "BSD license"]
+ Copyright (c) 2012 Terence Parr
+ Copyright (c) 2012 Sam Harwell
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -30,31 +28,35 @@
 */
 package org.antlr.mojo.antlr4;
 
+import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.tool.ANTLRMessage;
 import org.antlr.v4.tool.ANTLRToolListener;
 import org.apache.maven.plugin.logging.Log;
 
 /**
- * The Maven plexus container gives us a Log logging provider
- * which we can use to install an error listener for the ANTLR
- * tool to report errors by.
+ * This implementation of {@link ANTLRToolListener} reports messages to the
+ * {@link Log} instance provided by Maven.
+ *
+ * @author Sam Harwell
  */
 public class Antlr4ErrorLog implements ANTLRToolListener {
 
-    private Log log;
+    private final Log log;
 
     /**
-     * Instantiate an ANTLR ErrorListner that communicates any messages
-     * it receives to the Maven error sink.
+     * Creates an instance of {@link Antlr4ErrorLog}.
      *
-     * @param log The Maven Error Log
+     * @param log The Maven log
      */
-    public Antlr4ErrorLog(Log log) {
+    public Antlr4ErrorLog(@NotNull Log log) {
         this.log = log;
     }
 
     /**
-     * Sends an informational message to the Maven log sink.
+     * {@inheritDoc}
+     * <p/>
+     * This implementation passes the message to the Maven log.
+     *
      * @param message The message to send to Maven
      */
     @Override
@@ -63,7 +65,9 @@ public class Antlr4ErrorLog implements ANTLRToolListener {
     }
 
     /**
-     * Sends an error message from ANTLR analysis to the Maven Log sink.
+     * {@inheritDoc}
+     * <p/>
+     * This implementation passes the message to the Maven log.
      *
      * @param message The message to send to Maven.
      */
@@ -73,7 +77,9 @@ public class Antlr4ErrorLog implements ANTLRToolListener {
     }
 
     /**
-     * Sends a warning message to the Maven log sink.
+     * {@inheritDoc}
+     * <p/>
+     * This implementation passes the message to the Maven log.
      *
      * @param message
      */

From 66bdbb7abdaf8fcd0e7c4f2a5710b514f6cb2f3a Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 12:27:10 -0600
Subject: [PATCH 10/35] Remove unused options from Tool

---
 tool/src/org/antlr/v4/Tool.java | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tool/src/org/antlr/v4/Tool.java b/tool/src/org/antlr/v4/Tool.java
index 26b8307ed..3a2874602 100644
--- a/tool/src/org/antlr/v4/Tool.java
+++ b/tool/src/org/antlr/v4/Tool.java
@@ -118,11 +118,6 @@ public class Tool {
 	public File inputDirectory;
 	public String outputDirectory;
 	public String libDirectory;
-	public boolean report = false;
-	public boolean printGrammar = false;
-	public boolean debug = false;
-	public boolean profile = false;
-	public boolean trace = false;
 	public boolean generate_ATN_dot = false;
 	public String grammarEncoding = null; // use default locale's encoding
 	public String msgFormat = "antlr";
@@ -141,12 +136,6 @@ public class Tool {
     public static Option[] optionDefs = {
         new Option("outputDirectory",	"-o", OptionArgType.STRING, "specify output directory where all output is generated"),
         new Option("libDirectory",		"-lib", OptionArgType.STRING, "specify location of grammars, tokens files"),
-/*
-        new Option("report",			"-report", "print out a report about the grammar(s) processed"),
-        new Option("printGrammar",		"-print", "print out the grammar without actions"),
-        new Option("debug",				"-debug", "generate a parser that emits debugging events"),
-        new Option("profile",			"-profile", "generate a parser that computes profiling information"),
-         */
         new Option("generate_ATN_dot",	"-atn", "generate rule augmented transition network diagrams"),
 		new Option("grammarEncoding",	"-encoding", OptionArgType.STRING, "specify grammar file encoding; e.g., euc-jp"),
 		new Option("msgFormat",			"-message-format", OptionArgType.STRING, "specify output style for messages in antlr, gnu, vs2005"),

From f91cb106a9946b3677f34a821e0eeaa2f150b089 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:08:52 -0600
Subject: [PATCH 11/35] Update copyright, remove options which are no longer
 relevant to the Tool

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 93 +------------------
 1 file changed, 5 insertions(+), 88 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index f0bbb8998..e190720bd 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -1,9 +1,7 @@
-/**
-[The "BSD licence"]
-
-ANTLR        - Copyright (c) 2005-2008 Terence Parr
-Maven Plugin - Copyright (c) 2009      Jim Idle
-
+/*
+ [The "BSD license"]
+ Copyright (c) 2012 Terence Parr
+ Copyright (c) 2012 Sam Harwell
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -72,7 +70,7 @@ import java.util.Set;
  * are required for generation of the compilable sources into the location
  * that we use to compile them, such as target/generated-sources/antlr4 ...
  * 
- * @author <a href="mailto:jimi@temporal-wave.com">Jim Idle</a>
+ * @author Sam Harwell
  */
 @Mojo(
 	name = "antlr",
@@ -85,44 +83,12 @@ public class Antlr4Mojo
     // First, let's deal with the options that the ANTLR tool itself
     // can be configured by.
     //
-    /**
-     * If set to true, then after the tool has processed an input grammar file
-     * it will report variaous statistics about the parser, such as information
-     * on cyclic DFAs, which rules may use backtracking, and so on.
-     */
-    @Parameter(defaultValue = "false")
-    protected boolean report;
-    /**
-     * If set to true, then the ANTLR tool will print a version of the input
-     * grammar which is devoid of any actions that may be present in the input file.
-     */
-    @Parameter(defaultValue = "false")
-    protected boolean printGrammar;
-    /**
-     * If set to true, then the code generated by the ANTLR code generator will
-     * 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(defaultValue = "false")
-    protected boolean debug;
-    /**
-     * If set to true, then then the generated parser will compute and report on
-     * profile information at runtime.
-     */
-    @Parameter(defaultValue = "false")
-    protected boolean profile;
     /**
      * If set to true then the ANTLR tool will generate a description of the atn
      * for each rule in <a href="http://www.graphviz.org">Dot format</a>
      */
     @Parameter(defaultValue = "false")
     protected boolean atn;
-    /**
-     * If set to true, the generated parser code will log rule entry and exit points
-     * to stdout as an aid to debugging.
-     */
-    @Parameter(defaultValue = "false")
-    protected boolean trace;
     /**
      * If this parameter is set, it indicates that any warning or error messages returned
      * by ANLTR, shoould be formatted in the specified way. Currently, ANTLR suports the
@@ -130,32 +96,11 @@ public class Antlr4Mojo
      */
     @Parameter(defaultValue = "antlr")
     protected String messageFormat;
-    /**
-     * If this parameter is set to true, then ANTLR will report all sorts of things
-     * about what it is doing such as the names of files and the version of ANTLR and so on.
-     */
-    @Parameter(defaultValue = "true")
-    protected boolean verbose;
 
 	protected boolean verbose_dfa;
 
 	protected boolean force_atn;
 
-	protected boolean abstract_recognizer;
-
-    /**
-     * The number of alts, beyond which ANTLR will not generate a switch statement
-     * for the DFA.
-     */
-    @Parameter(defaultValue = "300")
-    private int maxSwitchCaseLabels;
-
-    /**
-     * The number of alts, below which ANTLR will not choose to generate a switch
-     * statement over an if statement.
-     */
-    private int minSwitchAlts;
-
     /* --------------------------------------------------------------------
      * The following are Maven specific parameters, rather than specificlly
      * options that the ANTLR tool can use.
@@ -268,16 +213,6 @@ public class Antlr4Mojo
 
             // Flags
             //
-            log.debug("ANTLR: report              : " + report);
-            log.debug("ANTLR: printGrammar        : " + printGrammar);
-            log.debug("ANTLR: debug               : " + debug);
-            log.debug("ANTLR: profile             : " + profile);
-            log.debug("ANTLR: atn                 : " + atn);
-            log.debug("ANTLR: trace               : " + trace);
-            log.debug("ANTLR: messageFormat       : " + messageFormat);
-            log.debug("ANTLR: maxSwitchCaseLabels : " + maxSwitchCaseLabels);
-            log.debug("ANTLR: minSwitchAlts       : " + minSwitchAlts);
-            log.debug("ANTLR: verbose             : " + verbose);
         }
 
         // Ensure that the output directory path is all in tact so that
@@ -306,21 +241,9 @@ public class Antlr4Mojo
         // Next we need to set the options given to us in the pom into the
         // tool instance we have created.
         //
-		if (debug) {
-			args.add("-debug");
-		}
 		if (atn) {
 			args.add("-atn");
 		}
-		if (profile) {
-			args.add("-profile");
-		}
-		if (report) {
-			args.add("-report");
-		}
-		if (printGrammar) {
-			args.add("-print");
-		}
 		if (verbose_dfa) {
 			args.add("-Xverbose-dfa");
 		}
@@ -331,9 +254,6 @@ public class Antlr4Mojo
 		if (force_atn) {
 			args.add("-Xforce-atn");
 		}
-		if (abstract_recognizer) {
-			args.add("-abstract");
-		}
 
         try {
 
@@ -395,9 +315,6 @@ public class Antlr4Mojo
 			};
 			tool.addListener(new Antlr4ErrorLog(log));
 
-			// we set some options directly
-			tool.trace = trace;
-
 			// Where do we want ANTLR to produce its output? (Base directory)
 			//
 			if (log.isDebugEnabled())

From b68779432e10329a544681a74b4d18c385c174e8 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:10:09 -0600
Subject: [PATCH 12/35] Fix exception specification

---
 .../main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index e190720bd..6bd279e2e 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -32,8 +32,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.antlr.mojo.antlr4;
 
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
 import org.antlr.v4.Tool;
 import org.antlr.v4.codegen.CodeGenerator;
 import org.antlr.v4.tool.Grammar;
@@ -266,10 +264,6 @@ public class Antlr4Mojo
             log.error(ie);
             throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze");
 
-        } catch (Exception e) {
-
-            getLog().error(e);
-            throw new MojoExecutionException(e.getMessage());
         }
 
 		// Create an instance of the ANTLR 4 build tool
@@ -374,13 +368,10 @@ public class Antlr4Mojo
      *
      * @param sourceDirectory
      * @param outputDirectory
-     * @throws antlr.TokenStreamException
-     * @throws antlr.RecognitionException
-     * @throws java.io.IOException
      * @throws org.codehaus.plexus.compiler.util.scan.InclusionScanException
      */
     private void processGrammarFiles(List<String> args, File sourceDirectory, File outputDirectory)
-            throws TokenStreamException, RecognitionException, IOException, InclusionScanException {
+        throws InclusionScanException {
         // Which files under the source set should we be looking for as grammar files
         //
         SourceMapping mapping = new SuffixMapping("g4", Collections.<String>emptySet());

From 1bbbf1c0a70d64492beeab63408dcb9a457e32b0 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:13:58 -0600
Subject: [PATCH 13/35] Refactor anonymous class to inner class

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 83 ++++++++++---------
 1 file changed, 44 insertions(+), 39 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 6bd279e2e..8d5263d40 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -269,45 +269,7 @@ public class Antlr4Mojo
 		// Create an instance of the ANTLR 4 build tool
 		//
 		try {
-			tool = new Tool(args.toArray(new String[args.size()])) {
-
-				@Override
-				public void process(Grammar g, boolean gencode) {
-					getLog().info("Processing grammar: " + g.fileName);
-					super.process(g, gencode);
-				}
-
-				@Override
-				public Writer getOutputFileWriter(Grammar g, String fileName) throws IOException {
-					if (outputDirectory == null) {
-						return new StringWriter();
-					}
-					// output directory is a function of where the grammar file lives
-					// for subdir/T.g4, you get subdir here.  Well, depends on -o etc...
-					// But, if this is a .tokens file, then we force the output to
-					// be the base output directory (or current directory if there is not a -o)
-					//
-					File outputDir;
-					if ( fileName.endsWith(CodeGenerator.VOCAB_FILE_EXTENSION) ) {
-						outputDir = new File(outputDirectory);
-					}
-					else {
-						outputDir = getOutputDirectory(g.fileName);
-					}
-
-					File outputFile = new File(outputDir, fileName);
-					if (!outputDir.exists()) {
-						outputDir.mkdirs();
-					}
-
-					URI relativePath = project.getBasedir().toURI().relativize(outputFile.toURI());
-					getLog().info("  Writing file: " + relativePath);
-					FileWriter fw = new FileWriter(outputFile);
-					return new BufferedWriter(fw);
-				}
-
-			};
-			tool.addListener(new Antlr4ErrorLog(log));
+			tool = new CustomTool(args.toArray(new String[args.size()]));
 
 			// Where do we want ANTLR to produce its output? (Base directory)
 			//
@@ -462,4 +424,47 @@ public class Antlr4Mojo
 
         return unprefixedGrammarFileName.getParent() + File.separator;
     }
+
+	private final class CustomTool extends Tool {
+
+		public CustomTool(String[] args) {
+			super(args);
+			addListener(new Antlr4ErrorLog(getLog()));
+		}
+
+		@Override
+		public void process(Grammar g, boolean gencode) {
+			getLog().info("Processing grammar: " + g.fileName);
+			super.process(g, gencode);
+		}
+
+		@Override
+		public Writer getOutputFileWriter(Grammar g, String fileName) throws IOException {
+			if (outputDirectory == null) {
+				return new StringWriter();
+			}
+			// output directory is a function of where the grammar file lives
+			// for subdir/T.g4, you get subdir here.  Well, depends on -o etc...
+			// But, if this is a .tokens file, then we force the output to
+			// be the base output directory (or current directory if there is not a -o)
+			//
+			File outputDir;
+			if ( fileName.endsWith(CodeGenerator.VOCAB_FILE_EXTENSION) ) {
+				outputDir = new File(outputDirectory);
+			}
+			else {
+				outputDir = getOutputDirectory(g.fileName);
+			}
+
+			File outputFile = new File(outputDir, fileName);
+			if (!outputDir.exists()) {
+				outputDir.mkdirs();
+			}
+
+			URI relativePath = project.getBasedir().toURI().relativize(outputFile.toURI());
+			getLog().info("  Writing file: " + relativePath);
+			FileWriter fw = new FileWriter(outputFile);
+			return new BufferedWriter(fw);
+		}
+	}
 }

From b9c7e2075ebd239eb6a9ce5a18f771aad549d9fb Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:18:49 -0600
Subject: [PATCH 14/35] Copyright formatting

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 8d5263d40..c60305839 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -2,30 +2,30 @@
  [The "BSD license"]
  Copyright (c) 2012 Terence Parr
  Copyright (c) 2012 Sam Harwell
-All rights reserved.
+ All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 /* ========================================================================
  * This is the definitive ANTLR4 Mojo set. All other sets are belong to us.

From c4f4f60d593374d2eadbf1602dad6b87853b1757 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:28:31 -0600
Subject: [PATCH 15/35] Extract method getCommandArguments

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 65 ++++++++++---------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index c60305839..5c3b5c2ec 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -222,36 +222,7 @@ public class Antlr4Mojo
             outputDir.mkdirs();
         }
 
-		List<String> args = new ArrayList<String>();
-
-		if (getOutputDirectory() != null) {
-			args.add("-o");
-			args.add(outputDir.getAbsolutePath());
-		}
-
-		// Where do we want ANTLR to look for .tokens and import grammars?
-		//
-		if (getLibDirectory() != null && getLibDirectory().exists()) {
-			args.add("-lib");
-			args.add(libDirectory.getAbsolutePath());
-		}
-
-        // Next we need to set the options given to us in the pom into the
-        // tool instance we have created.
-        //
-		if (atn) {
-			args.add("-atn");
-		}
-		if (verbose_dfa) {
-			args.add("-Xverbose-dfa");
-		}
-		if (messageFormat != null && !"".equals(messageFormat)) {
-			args.add("-message-format");
-			args.add(messageFormat);
-		}
-		if (force_atn) {
-			args.add("-Xforce-atn");
-		}
+		List<String> args = getCommandArguments();
 
         try {
 
@@ -325,6 +296,40 @@ public class Antlr4Mojo
 
     }
 
+	private List<String> getCommandArguments() {
+		List<String> args = new ArrayList<String>();
+
+		if (getOutputDirectory() != null) {
+			args.add("-o");
+			args.add(outputDirectory.getAbsolutePath());
+		}
+
+		// Where do we want ANTLR to look for .tokens and import grammars?
+		//
+		if (getLibDirectory() != null && getLibDirectory().exists()) {
+			args.add("-lib");
+			args.add(libDirectory.getAbsolutePath());
+		}
+
+        // Next we need to set the options given to us in the pom into the
+        // tool instance we have created.
+        //
+		if (atn) {
+			args.add("-atn");
+		}
+		if (verbose_dfa) {
+			args.add("-Xverbose-dfa");
+		}
+		if (messageFormat != null && !"".equals(messageFormat)) {
+			args.add("-message-format");
+			args.add(messageFormat);
+		}
+		if (force_atn) {
+			args.add("-Xforce-atn");
+		}
+
+		return args;
+	}
 
     /**
      *

From 924186ad46fed0554b59f1c19e064070e29c8952 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:43:51 -0600
Subject: [PATCH 16/35] Updated spelling in comments, remove irrelevant
 comments, updated whitespace

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 77 +++++--------------
 1 file changed, 19 insertions(+), 58 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 5c3b5c2ec..6600adbd7 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -27,9 +27,6 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* ========================================================================
- * This is the definitive ANTLR4 Mojo set. All other sets are belong to us.
- */
 package org.antlr.mojo.antlr4;
 
 import org.antlr.v4.Tool;
@@ -66,7 +63,7 @@ import java.util.Set;
 /**
  * Goal that picks up all the ANTLR grammars in a project and moves those that
  * are required for generation of the compilable sources into the location
- * that we use to compile them, such as target/generated-sources/antlr4 ...
+ * that we use to compile them, such as {@code target/generated-sources/antlr4}.
  * 
  * @author Sam Harwell
  */
@@ -75,12 +72,12 @@ import java.util.Set;
 	defaultPhase = LifecyclePhase.PROCESS_SOURCES,
 	requiresDependencyResolution = ResolutionScope.COMPILE,
 	requiresProject = true)
-public class Antlr4Mojo
-        extends AbstractMojo {
+public class Antlr4Mojo extends AbstractMojo {
 
     // First, let's deal with the options that the ANTLR tool itself
     // can be configured by.
     //
+
     /**
      * If set to true then the ANTLR tool will generate a description of the atn
      * for each rule in <a href="http://www.graphviz.org">Dot format</a>
@@ -103,6 +100,7 @@ public class Antlr4Mojo
      * The following are Maven specific parameters, rather than specificlly
      * options that the ANTLR tool can use.
      */
+
     /**
      * Provides an explicit list of all the grammars that should
      * be included in the generate phase of the plugin. Note that the plugin
@@ -166,6 +164,7 @@ public class Antlr4Mojo
     void addSourceRoot(File outputDir) {
         project.addCompileSourceRoot(outputDir.getPath());
     }
+
     /**
      * An instance of the ANTLR tool build
      */
@@ -175,12 +174,11 @@ public class Antlr4Mojo
      * The main entry point for this Mojo, it is responsible for converting
      * ANTLR 4.x grammars into the target language specified by the grammar.
      * 
-     * @throws org.apache.maven.plugin.MojoExecutionException When something is disvocered such as a missing source
-     * @throws org.apache.maven.plugin.MojoFailureException When something really bad happesn such as not being able to create the ANTLR Tool
+     * @throws MojoExecutionException When something is discovered such as a missing source
+     * @throws MojoFailureException When something really bad happens such as not being able to create the ANTLR Tool
      */
     @Override
-    public void execute()
-            throws MojoExecutionException, MojoFailureException {
+    public void execute() throws MojoExecutionException, MojoFailureException {
 
         Log log = getLog();
 
@@ -222,40 +220,29 @@ public class Antlr4Mojo
             outputDir.mkdirs();
         }
 
+		// Now pick up all the files and process them with the Tool
+		//
+
 		List<String> args = getCommandArguments();
 
         try {
-
-            // Now pick up all the files and process them with the Tool
-            //
             processGrammarFiles(args, sourceDirectory, outputDirectory);
-
         } catch (InclusionScanException ie) {
-
             log.error(ie);
             throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze");
-
         }
 
 		// Create an instance of the ANTLR 4 build tool
-		//
 		try {
 			tool = new CustomTool(args.toArray(new String[args.size()]));
 
 			// Where do we want ANTLR to produce its output? (Base directory)
-			//
 			if (log.isDebugEnabled())
 			{
 				log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
 			}
 
-			// Tell ANTLR that we always want the output files to be produced in the output directory
-			// using the same relative path as the input file was to the input directory.
-			//
-//			tool.setForceRelativeOutput(true);
-
 			// Set working directory for ANTLR to be the base source directory
-			//
 			tool.inputDirectory = sourceDirectory;
 
 			if (!sourceDirectory.exists()) {
@@ -271,7 +258,6 @@ public class Antlr4Mojo
 
         } catch (Exception e) {
             log.error("The attempt to create the ANTLR 4 build tool failed, see exception report for details", e);
-
             throw new MojoFailureException("Jim failed you!");
         }
 
@@ -279,21 +265,14 @@ public class Antlr4Mojo
 
         // If any of the grammar files caused errors but did nto throw exceptions
         // then we should have accumulated errors in the counts
-        //
         if (tool.getNumErrors() > 0) {
             throw new MojoExecutionException("ANTLR 4 caught " + tool.getNumErrors() + " build errors.");
         }
 
-        // All looks good, so we need to tel Maven about the sources that
-        // we just created.
-        //
         if (project != null) {
-            // Tell Maven that there are some new source files underneath
-            // the output directory.
-            //
+            // Tell Maven that there are some new source files underneath the output directory.
             addSourceRoot(this.getOutputDirectory());
         }
-
     }
 
 	private List<String> getCommandArguments() {
@@ -305,7 +284,6 @@ public class Antlr4Mojo
 		}
 
 		// Where do we want ANTLR to look for .tokens and import grammars?
-		//
 		if (getLibDirectory() != null && getLibDirectory().exists()) {
 			args.add("-lib");
 			args.add(libDirectory.getAbsolutePath());
@@ -313,7 +291,6 @@ public class Antlr4Mojo
 
         // Next we need to set the options given to us in the pom into the
         // tool instance we have created.
-        //
 		if (atn) {
 			args.add("-atn");
 		}
@@ -340,21 +317,17 @@ public class Antlr4Mojo
     private void processGrammarFiles(List<String> args, File sourceDirectory, File outputDirectory)
         throws InclusionScanException {
         // Which files under the source set should we be looking for as grammar files
-        //
         SourceMapping mapping = new SuffixMapping("g4", Collections.<String>emptySet());
 
         // What are the sets of includes (defaulted or otherwise).
-        //
         Set<String> includes = getIncludesPatterns();
 
         // Now, to the excludes, we need to add the imports directory
-        // as this is autoscanned for importd grammars and so is auto-excluded from the
-        // set of gramamr fiels we shuold be analyzing.
-        //
+        // as this is autoscanned for imported grammars and so is auto-excluded from the
+        // set of grammar fields we should be analyzing.
         excludes.add("imports/**");
 
         SourceInclusionScanner scan = new SimpleSourceInclusionScanner(includes, excludes);
-
         scan.addSourceMapping(mapping);
         Set<?> grammarFiles = scan.getIncludedSources(sourceDirectory, null);
 
@@ -363,14 +336,8 @@ public class Antlr4Mojo
                 getLog().info("No grammars to process");
             }
         } else {
-
-            // Tell the ANTLR tool that we want sorted build mode
-            //
-//            tool.setMake(true);
-
             // Iterate each grammar file we were given and add it into the tool's list of
             // grammars to process.
-            //
             for (Object grammarObject : grammarFiles) {
 				if (!(grammarObject instanceof File)) {
 					getLog().error(String.format("Expected %s from %s.getIncludedSources, found %s.",
@@ -384,20 +351,14 @@ public class Antlr4Mojo
                     getLog().debug("Grammar file '" + grammarFile.getPath() + "' detected.");
                 }
 
-
                 String relPath = findSourceSubdir(sourceDirectory, grammarFile.getPath()) + grammarFile.getName();
-
                 if (getLog().isDebugEnabled()) {
                     getLog().debug("  ... relative path is: " + relPath);
                 }
 
 				args.add(relPath);
-
             }
-
         }
-
-
     }
 
     public Set<String> getIncludesPatterns() {
@@ -408,11 +369,11 @@ public class Antlr4Mojo
     }
 
     /**
-     * Given the source directory File object and the full PATH to a
-     * grammar, produce the path to the named grammar file in relative
-     * terms to the sourceDirectory. This will then allow ANTLR to
-     * produce output relative to the base of the output directory and
-     * reflect the input organization of the grammar files.
+     * Given the source directory File object and the full PATH to a grammar,
+     * produce the path to the named grammar file in relative terms to the
+     * {@code sourceDirectory}. This will then allow ANTLR to produce output
+     * relative to the base of the output directory and reflect the input
+     * organization of the grammar files.
      *
      * @param sourceDirectory The source directory File object
      * @param grammarFileName The full path to the input grammar file

From 762fd6f32013dcb7c8532e2d68f21b8204cc36c3 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:52:25 -0600
Subject: [PATCH 17/35] Move source directory existence check earlier

---
 .../java/org/antlr/mojo/antlr4/Antlr4Mojo.java  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 6600adbd7..c65f91d3f 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -211,6 +211,11 @@ public class Antlr4Mojo extends AbstractMojo {
             //
         }
 
+		if (!sourceDirectory.exists()) {
+			log.info("No ANTLR 4 grammars to compile in " + sourceDirectory.getAbsolutePath());
+			return;
+		}
+
         // Ensure that the output directory path is all in tact so that
         // ANTLR can just write into it.
         //
@@ -245,17 +250,9 @@ public class Antlr4Mojo extends AbstractMojo {
 			// Set working directory for ANTLR to be the base source directory
 			tool.inputDirectory = sourceDirectory;
 
-			if (!sourceDirectory.exists()) {
-				if (log.isInfoEnabled()) {
-					log.info("No ANTLR 4 grammars to compile in " + sourceDirectory.getAbsolutePath());
-				}
-				return;
-			} else {
-				if (log.isInfoEnabled()) {
-					log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
-				}
+			if (log.isInfoEnabled()) {
+				log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
 			}
-
         } catch (Exception e) {
             log.error("The attempt to create the ANTLR 4 build tool failed, see exception report for details", e);
             throw new MojoFailureException("Jim failed you!");

From f22bc338370bf642301b406043a5736f5df361f8 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 13:56:04 -0600
Subject: [PATCH 18/35] Improved use of generics

---
 .../main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index c65f91d3f..9f746a744 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -326,7 +326,7 @@ public class Antlr4Mojo extends AbstractMojo {
 
         SourceInclusionScanner scan = new SimpleSourceInclusionScanner(includes, excludes);
         scan.addSourceMapping(mapping);
-        Set<?> grammarFiles = scan.getIncludedSources(sourceDirectory, null);
+        Set<File> grammarFiles = scan.getIncludedSources(sourceDirectory, null);
 
         if (grammarFiles.isEmpty()) {
             if (getLog().isInfoEnabled()) {
@@ -335,15 +335,7 @@ public class Antlr4Mojo extends AbstractMojo {
         } else {
             // Iterate each grammar file we were given and add it into the tool's list of
             // grammars to process.
-            for (Object grammarObject : grammarFiles) {
-				if (!(grammarObject instanceof File)) {
-					getLog().error(String.format("Expected %s from %s.getIncludedSources, found %s.",
-						File.class.getName(),
-						grammarObject != null ? grammarObject.getClass().getName() : "null"));
-				}
-
-				File grammarFile = (File)grammarObject;
-
+            for (File grammarFile : grammarFiles) {
                 if (getLog().isDebugEnabled()) {
                     getLog().debug("Grammar file '" + grammarFile.getPath() + "' detected.");
                 }

From e537351840dbaa51fb2aca18067db0f30d0df846 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 14:03:39 -0600
Subject: [PATCH 19/35] Reorder call sequence

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 9f746a744..e0c27571f 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -237,27 +237,25 @@ public class Antlr4Mojo extends AbstractMojo {
             throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze");
         }
 
-		// Create an instance of the ANTLR 4 build tool
+		if (log.isDebugEnabled()) {
+			log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
+		}
+
+		if (log.isInfoEnabled()) {
+			log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
+		}
+
 		try {
+			// Create an instance of the ANTLR 4 build tool
 			tool = new CustomTool(args.toArray(new String[args.size()]));
-
-			// Where do we want ANTLR to produce its output? (Base directory)
-			if (log.isDebugEnabled())
-			{
-				log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
-			}
-
-			// Set working directory for ANTLR to be the base source directory
-			tool.inputDirectory = sourceDirectory;
-
-			if (log.isInfoEnabled()) {
-				log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
-			}
         } catch (Exception e) {
             log.error("The attempt to create the ANTLR 4 build tool failed, see exception report for details", e);
             throw new MojoFailureException("Jim failed you!");
         }
 
+		// Set working directory for ANTLR to be the base source directory
+		tool.inputDirectory = sourceDirectory;
+
 		tool.processGrammarsOnCommandLine();
 
         // If any of the grammar files caused errors but did nto throw exceptions

From 124f5eb30da63e05066596284eee828e884569ff Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 14:06:53 -0600
Subject: [PATCH 20/35] Remove unnecessary calls to isDebugEnabled and
 isInfoEnabled

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index e0c27571f..65e69634d 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -237,14 +237,8 @@ public class Antlr4Mojo extends AbstractMojo {
             throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze");
         }
 
-		if (log.isDebugEnabled()) {
-			log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
-		}
-
-		if (log.isInfoEnabled()) {
-			log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
-		}
-
+		log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
+		log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
 		try {
 			// Create an instance of the ANTLR 4 build tool
 			tool = new CustomTool(args.toArray(new String[args.size()]));
@@ -327,21 +321,15 @@ public class Antlr4Mojo extends AbstractMojo {
         Set<File> grammarFiles = scan.getIncludedSources(sourceDirectory, null);
 
         if (grammarFiles.isEmpty()) {
-            if (getLog().isInfoEnabled()) {
-                getLog().info("No grammars to process");
-            }
+            getLog().info("No grammars to process");
         } else {
             // Iterate each grammar file we were given and add it into the tool's list of
             // grammars to process.
             for (File grammarFile : grammarFiles) {
-                if (getLog().isDebugEnabled()) {
-                    getLog().debug("Grammar file '" + grammarFile.getPath() + "' detected.");
-                }
+                getLog().debug("Grammar file '" + grammarFile.getPath() + "' detected.");
 
                 String relPath = findSourceSubdir(sourceDirectory, grammarFile.getPath()) + grammarFile.getName();
-                if (getLog().isDebugEnabled()) {
-                    getLog().debug("  ... relative path is: " + relPath);
-                }
+                getLog().debug("  ... relative path is: " + relPath);
 
 				args.add(relPath);
             }

From 9be06f92e7592466c4f499559dc6527394c4d022 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 14:08:05 -0600
Subject: [PATCH 21/35] Use isDirectory() instead of exists()

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 65e69634d..887ddf0f1 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -211,7 +211,7 @@ public class Antlr4Mojo extends AbstractMojo {
             //
         }
 
-		if (!sourceDirectory.exists()) {
+		if (!sourceDirectory.isDirectory()) {
 			log.info("No ANTLR 4 grammars to compile in " + sourceDirectory.getAbsolutePath());
 			return;
 		}
@@ -273,7 +273,7 @@ public class Antlr4Mojo extends AbstractMojo {
 		}
 
 		// Where do we want ANTLR to look for .tokens and import grammars?
-		if (getLibDirectory() != null && getLibDirectory().exists()) {
+		if (getLibDirectory() != null && getLibDirectory().isDirectory()) {
 			args.add("-lib");
 			args.add(libDirectory.getAbsolutePath());
 		}

From 3664f18ff42a7e56207365e72e0a4a09d0f121ab Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 14:39:28 -0600
Subject: [PATCH 22/35] Initialize exceptions with better message and set the
 inner exception

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 887ddf0f1..bdce60296 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -234,7 +234,7 @@ public class Antlr4Mojo extends AbstractMojo {
             processGrammarFiles(args, sourceDirectory, outputDirectory);
         } catch (InclusionScanException ie) {
             log.error(ie);
-            throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze");
+            throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze", ie);
         }
 
 		log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
@@ -244,7 +244,7 @@ public class Antlr4Mojo extends AbstractMojo {
 			tool = new CustomTool(args.toArray(new String[args.size()]));
         } catch (Exception e) {
             log.error("The attempt to create the ANTLR 4 build tool failed, see exception report for details", e);
-            throw new MojoFailureException("Jim failed you!");
+            throw new MojoFailureException("Error creating an instanceof the ANTLR tool.", e);
         }
 
 		// Set working directory for ANTLR to be the base source directory

From 7b321f80cb5b07b0235e4235ffdbd2e894c31397 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 14:44:46 -0600
Subject: [PATCH 23/35] Remove the message format option (eventually it should
 just use one that works with Maven)

---
 .../main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index bdce60296..2c2197348 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -84,13 +84,6 @@ public class Antlr4Mojo extends AbstractMojo {
      */
     @Parameter(defaultValue = "false")
     protected boolean atn;
-    /**
-     * If this parameter is set, it indicates that any warning or error messages returned
-     * by ANLTR, shoould be formatted in the specified way. Currently, ANTLR suports the
-     * built-in formats of antlr, gnu and vs2005.
-     */
-    @Parameter(defaultValue = "antlr")
-    protected String messageFormat;
 
 	protected boolean verbose_dfa;
 
@@ -286,10 +279,6 @@ public class Antlr4Mojo extends AbstractMojo {
 		if (verbose_dfa) {
 			args.add("-Xverbose-dfa");
 		}
-		if (messageFormat != null && !"".equals(messageFormat)) {
-			args.add("-message-format");
-			args.add(messageFormat);
-		}
 		if (force_atn) {
 			args.add("-Xforce-atn");
 		}

From ed8f980368dd8804cc336cf21dca93445aeebd30 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:28:11 -0600
Subject: [PATCH 24/35] Updated comments

---
 .../main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 2c2197348..890458b6e 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -119,14 +119,13 @@ public class Antlr4Mojo extends AbstractMojo {
      */
     @Parameter(property = "project", required = true, readonly = true)
     protected MavenProject project;
+
     /**
-     * Specifies the Antlr directory containing grammar files. For
-     * antlr version 4.x we default this to a directory in the tree
-     * called antlr4 because the antlr3 directory is occupied by version
-     * 3.x grammars.
+     * Specifies the Antlr directory containing grammar files.
      */
 	@Parameter(defaultValue = "${basedir}/src/main/antlr4", required = true)
     private File sourceDirectory;
+
     /**
      * Location for generated Java files. For antlr version 4.x we default
      * this to a directory in the tree called antlr4 because the antlr
@@ -134,10 +133,9 @@ public class Antlr4Mojo extends AbstractMojo {
      */
 	@Parameter(defaultValue = "${project.build.directory}/generated-sources/antlr4", required = true)
     private File outputDirectory;
+
     /**
-     * Location for imported token files, e.g. <code>.tokens</code> and imported grammars.
-     * Note that ANTLR will not try to process grammars that it finds to be imported
-     * into other grammars (in the same processing session).
+     * Specify location of grammars and tokens files.
      */
 	@Parameter(defaultValue = "${basedir}/src/main/antlr4/imports")
     private File libDirectory;

From 5ed1a6aebf84d7ff1abd59423c2dcae02996e028 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:29:42 -0600
Subject: [PATCH 25/35] Mark verbose_dfa and force_atn with @Parameter

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 890458b6e..1fac5d2a7 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -85,8 +85,16 @@ public class Antlr4Mojo extends AbstractMojo {
     @Parameter(defaultValue = "false")
     protected boolean atn;
 
+	/**
+	 * add config set to DFA states
+	 */
+	@Parameter(defaultValue = "false")
 	protected boolean verbose_dfa;
 
+	/**
+	 * use the ATN simulator for all predictions
+	 */
+	@Parameter(defaultValue = "false")
 	protected boolean force_atn;
 
     /* --------------------------------------------------------------------

From 37e67f4224690a34553756de32b8b2a3e810426c Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:30:12 -0600
Subject: [PATCH 26/35] Support the -listener and -visitor options

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 1fac5d2a7..8e7d8184a 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -85,6 +85,18 @@ public class Antlr4Mojo extends AbstractMojo {
     @Parameter(defaultValue = "false")
     protected boolean atn;
 
+	/**
+	 * generate parse tree listener (default)
+	 */
+	@Parameter(defaultValue = "true")
+	protected boolean listener;
+
+	/**
+	 * generate parse tree visitor
+	 */
+	@Parameter(defaultValue = "false")
+	protected boolean visitor;
+
 	/**
 	 * add config set to DFA states
 	 */
@@ -282,9 +294,25 @@ public class Antlr4Mojo extends AbstractMojo {
 		if (atn) {
 			args.add("-atn");
 		}
+
+		if (listener) {
+			args.add("-listener");
+		}
+		else {
+			args.add("-no-listener");
+		}
+
+		if (visitor) {
+			args.add("-visitor");
+		}
+		else {
+			args.add("-no-visitor");
+		}
+
 		if (verbose_dfa) {
 			args.add("-Xverbose-dfa");
 		}
+
 		if (force_atn) {
 			args.add("-Xforce-atn");
 		}

From 41361b65e3d413957b8ad1bce7528860622f044a Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:40:39 -0600
Subject: [PATCH 27/35] Rename the force_atn parameter to forceATN

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 8e7d8184a..19a347677 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -107,7 +107,7 @@ public class Antlr4Mojo extends AbstractMojo {
 	 * use the ATN simulator for all predictions
 	 */
 	@Parameter(defaultValue = "false")
-	protected boolean force_atn;
+	protected boolean forceATN;
 
     /* --------------------------------------------------------------------
      * The following are Maven specific parameters, rather than specificlly
@@ -313,7 +313,7 @@ public class Antlr4Mojo extends AbstractMojo {
 			args.add("-Xverbose-dfa");
 		}
 
-		if (force_atn) {
+		if (forceATN) {
 			args.add("-Xforce-atn");
 		}
 

From 3fa5af33e2f351afe377ee6a2dcbd7e7519179c1 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:40:51 -0600
Subject: [PATCH 28/35] Updated comments

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 19a347677..53d90f252 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -141,15 +141,13 @@ public class Antlr4Mojo extends AbstractMojo {
     protected MavenProject project;
 
     /**
-     * Specifies the Antlr directory containing grammar files.
+     * Specifies the ANTLR directory containing grammar files.
      */
 	@Parameter(defaultValue = "${basedir}/src/main/antlr4", required = true)
     private File sourceDirectory;
 
     /**
-     * Location for generated Java files. For antlr version 4.x we default
-     * this to a directory in the tree called antlr4 because the antlr
-     * directory is occupied by version 2.x grammars.
+     * Specify output directory where the Java files are generated.
      */
 	@Parameter(defaultValue = "${project.build.directory}/generated-sources/antlr4", required = true)
     private File outputDirectory;

From 5711ca4dbf7366661dd57510486854e6f7f1fc79 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:47:37 -0600
Subject: [PATCH 29/35] Set the -package flag according to source grammar file
 locations within the directory structure

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 99 +++++++++++++------
 1 file changed, 69 insertions(+), 30 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 53d90f252..c0991c102 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -31,6 +31,8 @@ package org.antlr.mojo.antlr4;
 
 import org.antlr.v4.Tool;
 import org.antlr.v4.codegen.CodeGenerator;
+import org.antlr.v4.runtime.misc.MultiMap;
+import org.antlr.v4.runtime.misc.Utils;
 import org.antlr.v4.tool.Grammar;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -55,9 +57,11 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -237,10 +241,10 @@ public class Antlr4Mojo extends AbstractMojo {
 		// Now pick up all the files and process them with the Tool
 		//
 
-		List<String> args = getCommandArguments();
-
+		List<List<String>> argumentSets;
         try {
-            processGrammarFiles(args, sourceDirectory, outputDirectory);
+			List<String> args = getCommandArguments();
+            argumentSets = processGrammarFiles(args, sourceDirectory, outputDirectory);
         } catch (InclusionScanException ie) {
             log.error(ie);
             throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze", ie);
@@ -248,24 +252,26 @@ public class Antlr4Mojo extends AbstractMojo {
 
 		log.debug("Output directory base will be " + outputDirectory.getAbsolutePath());
 		log.info("ANTLR 4: Processing source directory " + sourceDirectory.getAbsolutePath());
-		try {
-			// Create an instance of the ANTLR 4 build tool
-			tool = new CustomTool(args.toArray(new String[args.size()]));
-        } catch (Exception e) {
-            log.error("The attempt to create the ANTLR 4 build tool failed, see exception report for details", e);
-            throw new MojoFailureException("Error creating an instanceof the ANTLR tool.", e);
-        }
+		for (List<String> args : argumentSets) {
+			try {
+				// Create an instance of the ANTLR 4 build tool
+				tool = new CustomTool(args.toArray(new String[args.size()]));
+			} catch (Exception e) {
+				log.error("The attempt to create the ANTLR 4 build tool failed, see exception report for details", e);
+				throw new MojoFailureException("Error creating an instanceof the ANTLR tool.", e);
+			}
 
-		// Set working directory for ANTLR to be the base source directory
-		tool.inputDirectory = sourceDirectory;
+			// Set working directory for ANTLR to be the base source directory
+			tool.inputDirectory = sourceDirectory;
 
-		tool.processGrammarsOnCommandLine();
+			tool.processGrammarsOnCommandLine();
 
-        // If any of the grammar files caused errors but did nto throw exceptions
-        // then we should have accumulated errors in the counts
-        if (tool.getNumErrors() > 0) {
-            throw new MojoExecutionException("ANTLR 4 caught " + tool.getNumErrors() + " build errors.");
-        }
+			// If any of the grammar files caused errors but did nto throw exceptions
+			// then we should have accumulated errors in the counts
+			if (tool.getNumErrors() > 0) {
+				throw new MojoExecutionException("ANTLR 4 caught " + tool.getNumErrors() + " build errors.");
+			}
+		}
 
         if (project != null) {
             // Tell Maven that there are some new source files underneath the output directory.
@@ -324,7 +330,7 @@ public class Antlr4Mojo extends AbstractMojo {
      * @param outputDirectory
      * @throws org.codehaus.plexus.compiler.util.scan.InclusionScanException
      */
-    private void processGrammarFiles(List<String> args, File sourceDirectory, File outputDirectory)
+    private List<List<String>> processGrammarFiles(List<String> args, File sourceDirectory, File outputDirectory)
         throws InclusionScanException {
         // Which files under the source set should we be looking for as grammar files
         SourceMapping mapping = new SuffixMapping("g4", Collections.<String>emptySet());
@@ -343,19 +349,52 @@ public class Antlr4Mojo extends AbstractMojo {
 
         if (grammarFiles.isEmpty()) {
             getLog().info("No grammars to process");
-        } else {
-            // Iterate each grammar file we were given and add it into the tool's list of
-            // grammars to process.
-            for (File grammarFile : grammarFiles) {
-                getLog().debug("Grammar file '" + grammarFile.getPath() + "' detected.");
+			return Collections.emptyList();
+		}
 
-                String relPath = findSourceSubdir(sourceDirectory, grammarFile.getPath()) + grammarFile.getName();
-                getLog().debug("  ... relative path is: " + relPath);
+		MultiMap<String, File> grammarFileByFolder = new MultiMap<String, File>();
+		// Iterate each grammar file we were given and add it into the tool's list of
+		// grammars to process.
+		for (File grammarFile : grammarFiles) {
+			getLog().debug("Grammar file '" + grammarFile.getPath() + "' detected.");
 
-				args.add(relPath);
-            }
-        }
-    }
+			String relPathBase = findSourceSubdir(sourceDirectory, grammarFile.getPath());
+			String relPath = relPathBase + grammarFile.getName();
+			getLog().debug("  ... relative path is: " + relPath);
+
+			grammarFileByFolder.map(relPathBase, grammarFile);
+		}
+
+		List<List<String>> result = new ArrayList<List<String>>();
+		for (Map.Entry<String, List<File>> entry : grammarFileByFolder.entrySet()) {
+			List<String> folderArgs = new ArrayList<String>(args);
+			if (!folderArgs.contains("-package")) {
+				folderArgs.add("-package");
+				folderArgs.add(getPackageName(entry.getKey()));
+			}
+
+			for (File file : entry.getValue()) {
+				folderArgs.add(entry.getKey() + file.getName());
+			}
+
+			result.add(folderArgs);
+		}
+
+		return result;
+	}
+
+	private static String getPackageName(String relativeFolderPath) {
+		if (relativeFolderPath.contains("..")) {
+			throw new UnsupportedOperationException("Cannot handle relative paths containing '..'");
+		}
+
+		List<String> parts = new ArrayList<String>(Arrays.asList(relativeFolderPath.split("[/\\\\\\.]+")));
+		while (parts.remove("")) {
+			// intentionally blank
+		}
+
+		return Utils.join(parts.iterator(), ".");
+	}
 
     public Set<String> getIncludesPatterns() {
         if (includes == null || includes.isEmpty()) {

From 6b3bfdd9d8f249ec2b7257505d3bfcde6f8d08c9 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:50:19 -0600
Subject: [PATCH 30/35] Remove unused parameter, and @NotNull annotation

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index c0991c102..f4b40fb4d 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -32,6 +32,7 @@ package org.antlr.mojo.antlr4;
 import org.antlr.v4.Tool;
 import org.antlr.v4.codegen.CodeGenerator;
 import org.antlr.v4.runtime.misc.MultiMap;
+import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.misc.Utils;
 import org.antlr.v4.tool.Grammar;
 import org.apache.maven.plugin.AbstractMojo;
@@ -244,7 +245,7 @@ public class Antlr4Mojo extends AbstractMojo {
 		List<List<String>> argumentSets;
         try {
 			List<String> args = getCommandArguments();
-            argumentSets = processGrammarFiles(args, sourceDirectory, outputDirectory);
+            argumentSets = processGrammarFiles(args, sourceDirectory);
         } catch (InclusionScanException ie) {
             log.error(ie);
             throw new MojoExecutionException("Fatal error occured while evaluating the names of the grammar files to analyze", ie);
@@ -327,11 +328,10 @@ public class Antlr4Mojo extends AbstractMojo {
     /**
      *
      * @param sourceDirectory
-     * @param outputDirectory
      * @throws org.codehaus.plexus.compiler.util.scan.InclusionScanException
      */
-    private List<List<String>> processGrammarFiles(List<String> args, File sourceDirectory, File outputDirectory)
-        throws InclusionScanException {
+    @NotNull
+    private List<List<String>> processGrammarFiles(List<String> args, File sourceDirectory) throws InclusionScanException {
         // Which files under the source set should we be looking for as grammar files
         SourceMapping mapping = new SuffixMapping("g4", Collections.<String>emptySet());
 

From 747e65a92cd0dbafc34eb8edd9fd6a586c7c5bc4 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:54:36 -0600
Subject: [PATCH 31/35] Add the encoding and treatWarningsAsErrors parameters

---
 .../org/antlr/mojo/antlr4/Antlr4Mojo.java     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index f4b40fb4d..000f9a3cc 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -90,6 +90,12 @@ public class Antlr4Mojo extends AbstractMojo {
     @Parameter(defaultValue = "false")
     protected boolean atn;
 
+	/**
+	 * specify grammar file encoding; e.g., euc-jp
+	 */
+	@Parameter
+	protected String encoding;
+
 	/**
 	 * generate parse tree listener (default)
 	 */
@@ -102,6 +108,12 @@ public class Antlr4Mojo extends AbstractMojo {
 	@Parameter(defaultValue = "false")
 	protected boolean visitor;
 
+	/**
+	 * treat warnings as errors
+	 */
+	@Parameter(defaultValue = "false")
+	protected boolean treatWarningsAsErrors;
+
 	/**
 	 * add config set to DFA states
 	 */
@@ -300,6 +312,11 @@ public class Antlr4Mojo extends AbstractMojo {
 			args.add("-atn");
 		}
 
+		if (encoding != null && !encoding.isEmpty()) {
+			args.add("-encoding");
+			args.add(encoding);
+		}
+
 		if (listener) {
 			args.add("-listener");
 		}
@@ -314,6 +331,10 @@ public class Antlr4Mojo extends AbstractMojo {
 			args.add("-no-visitor");
 		}
 
+		if (treatWarningsAsErrors) {
+			args.add("-Werror");
+		}
+
 		if (verbose_dfa) {
 			args.add("-Xverbose-dfa");
 		}

From 52498a75f2f1b1c8b12663a3b16e78e60722344c Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 15:58:29 -0600
Subject: [PATCH 32/35] Specify property names to make it easier to override
 options passed to ANTLR

---
 .../main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index 000f9a3cc..d4649d21d 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -87,7 +87,7 @@ public class Antlr4Mojo extends AbstractMojo {
      * If set to true then the ANTLR tool will generate a description of the atn
      * for each rule in <a href="http://www.graphviz.org">Dot format</a>
      */
-    @Parameter(defaultValue = "false")
+    @Parameter(property = "antlr4.atn", defaultValue = "false")
     protected boolean atn;
 
 	/**
@@ -99,19 +99,19 @@ public class Antlr4Mojo extends AbstractMojo {
 	/**
 	 * generate parse tree listener (default)
 	 */
-	@Parameter(defaultValue = "true")
+	@Parameter(property = "antlr4.listener", defaultValue = "true")
 	protected boolean listener;
 
 	/**
 	 * generate parse tree visitor
 	 */
-	@Parameter(defaultValue = "false")
+	@Parameter(property = "antlr4.visitor", defaultValue = "false")
 	protected boolean visitor;
 
 	/**
 	 * treat warnings as errors
 	 */
-	@Parameter(defaultValue = "false")
+	@Parameter(property = "antlr4.treatWarningsAsErrors", defaultValue = "false")
 	protected boolean treatWarningsAsErrors;
 
 	/**
@@ -123,7 +123,7 @@ public class Antlr4Mojo extends AbstractMojo {
 	/**
 	 * use the ATN simulator for all predictions
 	 */
-	@Parameter(defaultValue = "false")
+	@Parameter(property = "antlr4.forceATN", defaultValue = "false")
 	protected boolean forceATN;
 
     /* --------------------------------------------------------------------

From a3e3cf21cb42e207cc6cd59599fd582e65650ca2 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 16:01:22 -0600
Subject: [PATCH 33/35] Support the -Doption=value syntax for overriding
 grammar options

---
 .../java/org/antlr/mojo/antlr4/Antlr4Mojo.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index d4649d21d..ba0ae79ab 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -126,6 +126,14 @@ public class Antlr4Mojo extends AbstractMojo {
 	@Parameter(property = "antlr4.forceATN", defaultValue = "false")
 	protected boolean forceATN;
 
+	/**
+	 * A list of grammar options to explicitly specify to the tool. These
+	 * options are passed to the tool using the
+	 * <code>-D&lt;option&gt;=&lt;value&gt;</code> syntax.
+	 */
+	@Parameter
+	protected Map<String, String> options;
+
     /* --------------------------------------------------------------------
      * The following are Maven specific parameters, rather than specificlly
      * options that the ANTLR tool can use.
@@ -343,6 +351,12 @@ public class Antlr4Mojo extends AbstractMojo {
 			args.add("-Xforce-atn");
 		}
 
+		if (options != null) {
+			for (Map.Entry<String, String> option : options.entrySet()) {
+				args.add(String.format("-D%s=%s", option.getKey(), option.getValue()));
+			}
+		}
+
 		return args;
 	}
 

From f08b3ed9e528ab7f16505c8073d7fdb3b34cac16 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 16:01:44 -0600
Subject: [PATCH 34/35] Reduce log message verbosity

---
 .../src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index ba0ae79ab..c15bd84af 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -498,7 +498,7 @@ public class Antlr4Mojo extends AbstractMojo {
 			}
 
 			URI relativePath = project.getBasedir().toURI().relativize(outputFile.toURI());
-			getLog().info("  Writing file: " + relativePath);
+			getLog().debug("  Writing file: " + relativePath);
 			FileWriter fw = new FileWriter(outputFile);
 			return new BufferedWriter(fw);
 		}

From ec31c1bd68754d3bf776dcb55e475a10df6c0993 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Sat, 1 Dec 2012 16:03:53 -0600
Subject: [PATCH 35/35] Support specifying arbitrary command line arguments

---
 .../main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
index c15bd84af..09c468ffa 100644
--- a/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
+++ b/antlr4-maven-plugin/src/main/java/org/antlr/mojo/antlr4/Antlr4Mojo.java
@@ -134,6 +134,12 @@ public class Antlr4Mojo extends AbstractMojo {
 	@Parameter
 	protected Map<String, String> options;
 
+	/**
+	 * A list of additional command line arguments to pass to the ANTLR tool.
+	 */
+	@Parameter
+	protected List<String> arguments;
+
     /* --------------------------------------------------------------------
      * The following are Maven specific parameters, rather than specificlly
      * options that the ANTLR tool can use.
@@ -357,6 +363,10 @@ public class Antlr4Mojo extends AbstractMojo {
 			}
 		}
 
+		if (arguments != null) {
+			args.addAll(arguments);
+		}
+
 		return args;
 	}