diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 656a52c90..366c65338 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -5,86 +5,117 @@
   -->
 
 <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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.antlr</groupId>
-    <artifactId>antlr4-master</artifactId>
-    <version>4.6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-  <artifactId>antlr4-runtime</artifactId>
-  <name>ANTLR 4 Runtime</name>
-  <description>The ANTLR 4 Runtime</description>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.antlr</groupId>
+		<artifactId>antlr4-master</artifactId>
+		<version>4.6-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<artifactId>antlr4-runtime</artifactId>
+	<name>ANTLR 4 Runtime</name>
+	<description>The ANTLR 4 Runtime</description>
 
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin> <!-- create src jar -->
-   				<groupId>org.apache.maven.plugins</groupId>
-   				<artifactId>maven-source-plugin</artifactId>
-   				<executions>
-   					<execution>
-   						<id>attach-sources</id>
-   						<goals>
-   							<goal>jar</goal>
-   						</goals>
-   					</execution>
-   				</executions>
-   			</plugin>
-   			<plugin> <!-- create javadoc jar -->
-   				<groupId>org.apache.maven.plugins</groupId>
-   				<artifactId>maven-javadoc-plugin</artifactId>
-   				<version>2.10.4</version>
-   				<configuration>
-   					<javadocVersion>1.7</javadocVersion>
-   				</configuration>
-   			</plugin>
-      <plugin>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr4-maven-plugin</artifactId>
-        <version>4.5.3</version> <!-- use older version to process XPathLexer.g4, avoiding cyclic build dependency -->
-        <executions>
-          <execution>
-            <id>antlr</id>
-            <configuration>
-              <sourceDirectory>src</sourceDirectory>
-            </configuration>
-            <goals>
-              <goal>antlr4</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.5.4</version>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <configuration>
-              <instructions>
-                <Bundle-SymbolicName>org.antlr.antlr4-runtime-osgi</Bundle-SymbolicName>
-              </instructions>
-            </configuration>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<properties>
+		<!-- Assumes dot is in the system path, or specified for the build. -->
+		<dot.path>dot</dot.path>
+	</properties>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin> <!-- create src jar -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>us.bryon</groupId>
+				<artifactId>graphviz-maven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>dot</goal>
+						</goals>
+						<configuration>
+							<dot>${dot.path}</dot>
+							<destdir>${project.build.directory}/apidocs</destdir>
+							<output>svg</output>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin> <!-- create javadoc jar -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<javadocVersion>1.7</javadocVersion>
+					<failOnError>false</failOnError>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.antlr</groupId>
+				<artifactId>antlr4-maven-plugin</artifactId>
+				<version>4.5.3</version> <!-- use older version to process XPathLexer.g4, avoiding cyclic build dependency -->
+				<executions>
+					<execution>
+						<id>antlr</id>
+						<configuration>
+							<sourceDirectory>src</sourceDirectory>
+						</configuration>
+						<goals>
+							<goal>antlr4</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.5.4</version>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<configuration>
+							<instructions>
+								<Bundle-SymbolicName>org.antlr.antlr4-runtime-osgi</Bundle-SymbolicName>
+							</instructions>
+						</configuration>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>