From 37be1bbb1c6adbae84387395958356aebcd51d51 Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Sun, 2 Jan 2022 11:35:59 -0800
Subject: [PATCH 1/2] no need for plugin in runtime, always gen svg from dot
 for javadoc, gen 1.8 not 1.7 doc for runtime. Gen 11 for tool.

---
 runtime/Java/pom.xml | 19 +------------------
 tool/pom.xml         |  6 +++---
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 6048cd0f8f..78eacc5a53 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -46,7 +46,6 @@
 				<version>1.0</version>
 				<executions>
 					<execution>
-						<phase>deploy</phase>
 						<goals>
 							<goal>dot</goal>
 						</goals>
@@ -63,7 +62,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.3.1</version>
 				<configuration>
-					<javadocVersion>1.7</javadocVersion>
+					<javadocVersion>1.8</javadocVersion>
 					<failOnError>false</failOnError>
 				</configuration>
 				<executions>
@@ -74,22 +73,6 @@
 					</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>
diff --git a/tool/pom.xml b/tool/pom.xml
index 97587fa5e0..09489aedcd 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -77,7 +77,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.3.1</version>
 				<configuration>
-					<javadocVersion>1.7</javadocVersion>
+					<javadocVersion>11</javadocVersion>
 					<failOnError>false</failOnError>
 				</configuration>
 				<executions>
@@ -180,8 +180,8 @@
 							<target>${basedir}/target/generated-sources/tool/src/org/antlr/v4/unicode/UnicodeData.java</target>
 							<controller>
 								<className>org.antlr.v4.unicode.UnicodeDataTemplateController</className>
-								<sourceVersion>1.7</sourceVersion>
-								<targetVersion>1.7</targetVersion>
+								<sourceVersion>11</sourceVersion>
+								<targetVersion>11</targetVersion>
 								<method>getProperties</method>
 							</controller>
 						</template>

From aa4e40cd0f77b8dd90265bf63b1445336bc0366f Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Sun, 2 Jan 2022 11:36:27 -0800
Subject: [PATCH 2/2] tweak doc for 1.8 runtime.  Test rig should gen 1.8 not
 1.7

---
 doc/java-target.md                                            | 4 ++--
 .../test/org/antlr/v4/test/runtime/java/BaseJavaTest.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/java-target.md b/doc/java-target.md
index eb73a3d6f1..2e6c791cfd 100644
--- a/doc/java-target.md
+++ b/doc/java-target.md
@@ -150,8 +150,8 @@ Edit the pom.xml file. Now we need to extensively modify the pom.xml file. The f
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <!-- Plugin to compile the g4 files ahead of the java files
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
index c8f02775ba..de192d5a8e 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/BaseJavaTest.java
@@ -133,7 +133,7 @@ protected boolean compile(String... fileNames) {
 			fileManager.getJavaFileObjectsFromFiles(files);
 
 		Iterable<String> compileOptions =
-			Arrays.asList("-g", "-source", "1.7", "-target", "1.7", "-implicit:class", "-Xlint:-options", "-d", getTempDirPath(), "-cp", getTempDirPath() + PATH_SEP + CLASSPATH);
+			Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", getTempDirPath(), "-cp", getTempDirPath() + PATH_SEP + CLASSPATH);
 
 		JavaCompiler.CompilationTask task =
 			compiler.getTask(null, fileManager, null, compileOptions, null,