From 8b8b96cf7d228b92403b39494125538c006dd9ef Mon Sep 17 00:00:00 2001
From: Alexander Berdnik <alexander.berdnik@gmail.com>
Date: Thu, 23 Feb 2023 22:37:28 +0000
Subject: [PATCH 1/3] java runtime: add module-info.java and multi-release
 build to support java modules on java 9+

Signed-off-by: Alexander Berdnik <alexander.berdnik@gmail.com>
---
 runtime/Java/pom.xml               | 32 ++++++++++++++++++++++++++----
 runtime/Java/src9/module-info.java |  7 +++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 runtime/Java/src9/module-info.java

diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index fe646bf5e3..571137b09d 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -83,7 +83,6 @@
 						<phase>process-classes</phase>
 						<configuration>
 							<instructions>
-								<Automatic-Module-Name>org.antlr.antlr4.runtime</Automatic-Module-Name>
 								<Bundle-SymbolicName>org.antlr.antlr4-runtime</Bundle-SymbolicName>
 								<Import-Package>org.antlr.v4.gui;resolution:=optional, *</Import-Package>
 							</instructions>
@@ -110,10 +109,35 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>module-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <release>9</release>
+                            <compileSourceRoots>
+                                <compileSourceRoot>${project.basedir}/src9</compileSourceRoot>
+                            </compileSourceRoots>
+                            <multiReleaseOutput>true</multiReleaseOutput>
+                        </configuration>
+                    </execution>
+                </executions>
 				<configuration>
-					<release>8</release>
-					<source>1.8</source>
-					<target>1.8</target>
+
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/runtime/Java/src9/module-info.java b/runtime/Java/src9/module-info.java
new file mode 100644
index 0000000000..82011ea6cb
--- /dev/null
+++ b/runtime/Java/src9/module-info.java
@@ -0,0 +1,7 @@
+module org.antlr.antlr.runtime {
+	exports org.antlr.v4.runtime;
+	exports org.antlr.v4.runtime.atn;
+	exports org.antlr.v4.runtime.dfa;
+	exports org.antlr.v4.runtime.misc;
+	exports org.antlr.v4.runtime.tree;
+}

From fc83811b25f95963d068f94f2d975e627c623ced Mon Sep 17 00:00:00 2001
From: Alexander Berdnik <alexander.berdnik@gmail.com>
Date: Mon, 6 Mar 2023 19:39:09 +0000
Subject: [PATCH 2/3] java runtime: add multi-release entry to the manifest
 file

Signed-off-by: Alexander Berdnik <alexander.berdnik@gmail.com>
---
 runtime/Java/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index 571137b09d..f9404fcfb7 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -101,6 +101,9 @@
 						<manifest>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
+                        <manifestEntries>
+                            <Multi-Release>true</Multi-Release>
+                        </manifestEntries>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>

From dffdf0be986e7162ed2e0a038af128d9dfc9be50 Mon Sep 17 00:00:00 2001
From: Alexander Berdnik <alexander.berdnik@gmail.com>
Date: Mon, 6 Mar 2023 19:50:16 +0000
Subject: [PATCH 3/3] use release option for java 8 build

Signed-off-by: Alexander Berdnik <alexander.berdnik@gmail.com>
---
 runtime/Java/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
index f9404fcfb7..8268d9e306 100644
--- a/runtime/Java/pom.xml
+++ b/runtime/Java/pom.xml
@@ -119,8 +119,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <release>8</release>
                         </configuration>
                     </execution>