From 16e59ea9949d6434c21db743d60b67f905f3c5d1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 27 Sep 2021 17:18:48 +1300
Subject: [PATCH] Add module-info via multi-version jar

Removes Automatic-Module-Name manifest entry and replaces it with module-info via multi-version jar
---
 pom.xml                         | 31 ++++++++++++++++++++-----------
 src/main/java9/module-info.java |  4 ++++
 2 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java9/module-info.java

diff --git a/pom.xml b/pom.xml
index fca2082..22c8403 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,17 +91,6 @@
     </resources>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Automatic-Module-Name>jakarta.inject</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -160,6 +149,26 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                   </execution>
               </executions>
           </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.RC1</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <jvmVersion>9</jvmVersion>
+              <module>
+                <moduleInfoFile>src/main/java9/module-info.java</moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
new file mode 100644
index 0000000..1706967
--- /dev/null
+++ b/src/main/java9/module-info.java
@@ -0,0 +1,4 @@
+module jakarta.inject {
+
+    exports jakarta.inject;
+}
\ No newline at end of file