From 657bbeb127ddf3da3834d7e3ba5479db0a1f3a85 Mon Sep 17 00:00:00 2001
From: Davide Angelocola <dfa1@users.noreply.github.com>
Date: Sat, 30 May 2026 18:58:31 +0200
Subject: [PATCH] [Java] add module-info.java for JPMS support

- module-info.java in src/main/java9/ (Multi-Release JAR approach)
- pom.xml jdk9 profile: second compiler execution for java9 sources
  (--release 9, multiReleaseOutput=true)
- bundle plugin: Multi-Release: true manifest entry
- add default-testCompile execution to jdk9 profile (was missing, causing
javac to fall back to source/target 6). Add release=8 to javadoc plugin
to avoid module-mode detection bug in maven-javadoc-plugin 3.3.0 with
multi-release jars.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 java/pom.xml                         | 49 ++++++++++++++++++++++++----
 java/src/main/java9/module-info.java |  4 +++
 2 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 java/src/main/java9/module-info.java

diff --git a/java/pom.xml b/java/pom.xml
index 76db28f8e3..e95027b77c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -85,6 +85,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>3.3.0</version>
         <configuration>
+          <release>8</release>
           <additionalparam>-Xdoclint:none</additionalparam>
           <additionalOptions>-Xdoclint:none</additionalOptions>
         </configuration>
@@ -102,6 +103,11 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <version>5.1.2</version>
         <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Multi-Release>true</Multi-Release>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
@@ -157,14 +163,43 @@
         <plugins>
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <release>8</release>
-              <testExcludes>
-                <testExclude>MyGame/Example/MonsterStorageGrpc.java</testExclude>
-                <testExclude>MyGame/OtherNameSpace/TableBT.java</testExclude>
-              </testExcludes>
-            </configuration>
             <version>3.8.1</version>
+            <executions>
+              <execution>
+                <id>default-compile</id>
+                <configuration>
+                  <release>8</release>
+                  <testExcludes>
+                    <testExclude>MyGame/Example/MonsterStorageGrpc.java</testExclude>
+                    <testExclude>MyGame/OtherNameSpace/TableBT.java</testExclude>
+                  </testExcludes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>default-testCompile</id>
+                <configuration>
+                  <release>8</release>
+                  <testExcludes>
+                    <testExclude>MyGame/Example/MonsterStorageGrpc.java</testExclude>
+                    <testExclude>MyGame/OtherNameSpace/TableBT.java</testExclude>
+                  </testExcludes>
+                </configuration>
+              </execution>
+              <execution>
+                <id>compile-java9</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <release>9</release>
+                  <compileSourceRoots>
+                    <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                  </compileSourceRoots>
+                  <multiReleaseOutput>true</multiReleaseOutput>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
diff --git a/java/src/main/java9/module-info.java b/java/src/main/java9/module-info.java
new file mode 100644
index 0000000000..2b565d80f0
--- /dev/null
+++ b/java/src/main/java9/module-info.java
@@ -0,0 +1,4 @@
+module com.google.flatbuffers {
+    exports com.google.flatbuffers;
+    exports com.google.flatbuffers.reflection;
+}