From 95f9b9a5ac6dba43b6213d83c7db56f832f635b0 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 19 Nov 2024 10:30:37 -0600
Subject: [PATCH] Switch to formal module descriptor

---
 pom.xml                        | 14 --------------
 src/main/java/module-info.java | 12 ++++++++++++
 src/main/java/module-info.yml  | 17 -----------------
 3 files changed, 12 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/module-info.java
 delete mode 100644 src/main/java/module-info.yml

diff --git a/pom.xml b/pom.xml
index 81e3da13..632c1eba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,20 +279,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-                <version>${version.module-info}</version>
-                <executions>
-                    <execution>
-                        <id>module-info</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <!-- Do not compress JAR, for faster startup times -->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 00000000..4da2c3f9
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,12 @@
+module org.jboss.logmanager {
+    requires java.logging;
+    requires io.smallrye.common.constraint;
+    requires io.smallrye.common.cpu;
+    requires io.smallrye.common.expression;
+    requires io.smallrye.common.net;
+    requires io.smallrye.common.os;
+    requires io.smallrye.common.ref;
+    requires static java.xml;
+    requires static jakarta.json;
+    requires static org.jboss.modules;
+}
diff --git a/src/main/java/module-info.yml b/src/main/java/module-info.yml
deleted file mode 100644
index 9afa413c..00000000
--- a/src/main/java/module-info.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: org.jboss.logmanager
-
-requires:
-  - module: java.logging
-    transitive: true
-  - module: java.xml
-    static: true
-  - module: jakarta.json
-    static: true
-  - module: io.smallrye.common.constraint
-  - module: io.smallrye.common.cpu
-  - module: io.smallrye.common.expression
-  - module: io.smallrye.common.net
-  - module: io.smallrye.common.os
-  - module: io.smallrye.common.ref
-  - module: org.jboss.modules
-    static: true