From f985a567c9a9dda719662fa0f4fc2535c8092327 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 21 May 2024 12:57:38 -0500
Subject: [PATCH] Ensure that module the descriptor is properly indexed and
 versioned

---
 pom.xml                        | 31 +++++++++++++++++++++++++++++++
 src/main/java/module-info.java |  4 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab67793..9f1f695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>${java.home}/bin/jar</executable>
+                            <arguments>
+                                <argument>--update</argument>
+                                <argument>--file</argument>
+                                <argument>${project.build.directory}/${project.artifactId}-${project.version}.jar</argument>
+                                <argument>--module-version</argument>
+                                <argument>${project.version}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index ad7fdac..969401b 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,10 +1,10 @@
 module io.github.dmlloyd.classfile {
     exports io.github.dmlloyd.classfile;
     exports io.github.dmlloyd.classfile.attribute;
+    exports io.github.dmlloyd.classfile.components;
+    exports io.github.dmlloyd.classfile.constantpool;
     exports io.github.dmlloyd.classfile.extras;
     exports io.github.dmlloyd.classfile.extras.constant;
     exports io.github.dmlloyd.classfile.extras.reflect;
-    exports io.github.dmlloyd.classfile.components;
-    exports io.github.dmlloyd.classfile.constantpool;
     exports io.github.dmlloyd.classfile.instruction;
 }