From 9a4c0b17a5ce73b826d286d30a0444b13cc5af05 Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Sat, 6 Nov 2021 17:38:19 +0100
Subject: [PATCH] Put module-info.class into Multi-Release JAR folder

---
 gson/bnd.bnd |  6 ++++++
 gson/pom.xml |  1 +
 pom.xml      | 45 +++++++++++++++++++++++++--------------------
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/gson/bnd.bnd b/gson/bnd.bnd
index 07746f0a48..5237831fc8 100644
--- a/gson/bnd.bnd
+++ b/gson/bnd.bnd
@@ -17,3 +17,9 @@ Import-Package: sun.misc;resolution:=optional, *
     com.google.gson.annotations,\
     com.google.gson.reflect,\
     com.google.gson.stream
+
+# Ignore error about module-info.class being in wrong directory
+# See related https://issues.apache.org/jira/browse/FELIX-5592 (but that is for different plugin)
+# and https://github.com/bndtools/bnd/issues/2227
+-fixupmessages:\
+    "Classes found in the wrong directory: \\{META-INF/versions/9/module-info\\.class=module-info\\}";is:=warning
diff --git a/gson/pom.xml b/gson/pom.xml
index d9d37baa33..0671c5b79f 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -59,6 +59,7 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <!-- Use existing manifest generated by BND plugin -->
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
diff --git a/pom.xml b/pom.xml
index d0d45be9a1..c9e6294ba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.6</java.version>
+    <javaVersion>1.6</javaVersion>
   </properties>
 
   <scm>
@@ -70,30 +70,32 @@
               <id>default-compile</id>
               <configuration>
                 <jdkToolchain>
-                  <version>9</version>
+                  <version>[1.5,9)</version>
                 </jdkToolchain>
-                <release>9</release>
+                <source>${javaVersion}</source>
+                <target>${javaVersion}</target>
+                <excludes>
+                  <exclude>module-info.java</exclude>
+                </excludes>
               </configuration>
             </execution>
             <execution>
-              <id>base-compile</id>
+              <id>java-9-compile</id>
               <goals>
                 <goal>compile</goal>
               </goals>
               <configuration>
-                <excludes>
-                  <exclude>module-info.java</exclude>
-                </excludes>
+                <jdkToolchain>
+                  <version>9</version>
+                </jdkToolchain>
+                <release>9</release>
+                <includes>
+                  <include>module-info.java</include>
+                </includes>
+                <multiReleaseOutput>true</multiReleaseOutput>
               </configuration>
             </execution>
           </executions>
-          <configuration>
-            <jdkToolchain>
-              <version>[1.5,9)</version>
-            </jdkToolchain>
-            <source>1.6</source>
-            <target>1.6</target>
-          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -104,12 +106,15 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>5.1.2</version>
-          <inherited>true</inherited>
+          <configuration>
+            <archive>
+              <manifestEntries>
+                <!-- Mark the JAR as Multi-Release JAR because module-info.class 
+                  is in version specific folder -->
+                <Multi-Release>true</Multi-Release>
+              </manifestEntries>
+            </archive>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>