From 85602e400157425033a39205ace53ed9e5864daa Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Fri, 31 Dec 2021 10:33:16 -0800
Subject: [PATCH 1/4] use src 11 for tool, but 8 for plugin/runtime.

---
 antlr4-maven-plugin/pom.xml | 7 +++++++
 pom.xml                     | 4 ++--
 runtime/Java/pom.xml        | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml
index eb022514d1..8db4e0ac8e 100644
--- a/antlr4-maven-plugin/pom.xml
+++ b/antlr4-maven-plugin/pom.xml
@@ -153,6 +153,13 @@
            </execution>
          </executions>
        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <release>8</release>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 1473518ed6..ca85f9580b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<antlr.testinprocess>true</antlr.testinprocess>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 	</properties>
 
 	<mailingLists>
diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 5812d2d2df..6048cd0f8f 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -122,6 +122,13 @@
 					</archive>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>8</release>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 </project>

From 2be3bea056f439799946b5804cacf26e0cdd3198 Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Fri, 31 Dec 2021 10:38:20 -0800
Subject: [PATCH 2/4] use 11 in CI builds

---
 .circleci/config.yml         | 4 ++--
 .github/workflows/macosx.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a151210081..ea0afa95de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test_tool_and_runtime_java:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:11.0
     steps:
       - checkout
       - run:
@@ -32,7 +32,7 @@ jobs:
         type: string
         default: java
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:11.0
         environment:
           MAVEN_OPTS: -Xmx512m
     resource_class: large
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 4f7d3213bf..f327a24616 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -15,10 +15,10 @@ jobs:
         TARGET: [swift, cpp]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4
       with:

From b9a6dcca1776e2f94ac707635b7f12fbf4326f22 Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Fri, 31 Dec 2021 10:38:34 -0800
Subject: [PATCH 3/4] make sure to use 8 for runtime tests

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

diff --git a/runtime-testsuite/pom.xml b/runtime-testsuite/pom.xml
index e2d4f4c0c9..50d1bed541 100644
--- a/runtime-testsuite/pom.xml
+++ b/runtime-testsuite/pom.xml
@@ -130,6 +130,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>8</release>
+                </configuration>
             </plugin>
         </plugins>
 	</build>

From 31eeb6bdb2f5fb5190a4052aa22d700181e6e59d Mon Sep 17 00:00:00 2001
From: parrt <parrt@cs.usfca.edu>
Date: Fri, 31 Dec 2021 11:37:09 -0800
Subject: [PATCH 4/4] make appveyor use jdk11, maven 3.8

---
 .appveyor/workflow.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.appveyor/workflow.yml b/.appveyor/workflow.yml
index e37957dc7b..57f7161329 100644
--- a/.appveyor/workflow.yml
+++ b/.appveyor/workflow.yml
@@ -1,4 +1,6 @@
 environment:
+  JAVA_HOME: C:\Program Files\Java\jdk11
+  MAVEN_VERSION: 3.8
   matrix:
     - job_name: java-tool-and-runtime
     - job_name: csharp-runtime