From 378a18e38b844d1b49917d3aa3d80aa5aa26bcb7 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 5 Mar 2024 11:09:11 -0600
Subject: [PATCH] Introduce module descriptor

Fixes #103
---
 pom.xml                                          | 16 +++++++++++++++-
 src/main/java/module-info.yml                    | 12 ++++++++++++
 .../wildfly/common/_private/CommonMessages.java  |  4 +++-
 src/main/java/org/wildfly/common/ref/Log.java    |  4 +++-
 src/main/java/org/wildfly/common/xml/Log.java    |  3 ++-
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/module-info.yml

diff --git a/pom.xml b/pom.xml
index 63699f7..02c007d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     </scm>
 
     <properties>
-        <version.org.jboss.logging.jboss-logging>3.5.3.Final</version.org.jboss.logging.jboss-logging>
+        <version.org.jboss.logging.jboss-logging>3.6.0.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.logging.jboss-logging-tools>2.2.1.Final</version.org.jboss.logging.jboss-logging-tools>
         <version.io.smallrye.common.smallrye-common>2.4.0</version.io.smallrye.common.smallrye-common>
 
@@ -146,6 +146,20 @@
                     <doclint>none</doclint>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.github.dmlloyd.module-info</groupId>
+                <artifactId>module-info</artifactId>
+                <version>2.1</version>
+                <executions>
+                    <execution>
+                        <id>module-info</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/src/main/java/module-info.yml b/src/main/java/module-info.yml
new file mode 100644
index 0000000..7b02221
--- /dev/null
+++ b/src/main/java/module-info.yml
@@ -0,0 +1,12 @@
+name: org.wildfly.common
+
+requires:
+  - module: java.sql
+  - module: java.transaction.xa
+  - module: java.xml
+  - 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.logging
diff --git a/src/main/java/org/wildfly/common/_private/CommonMessages.java b/src/main/java/org/wildfly/common/_private/CommonMessages.java
index 1c13424..6d3a5b4 100644
--- a/src/main/java/org/wildfly/common/_private/CommonMessages.java
+++ b/src/main/java/org/wildfly/common/_private/CommonMessages.java
@@ -18,6 +18,8 @@
 
 package org.wildfly.common._private;
 
+import static java.lang.invoke.MethodHandles.lookup;
+
 import java.io.IOException;
 import java.security.Permission;
 import java.security.PrivilegedActionException;
@@ -33,7 +35,7 @@
  */
 @MessageBundle(projectCode = "COM", length = 5)
 public interface CommonMessages {
-    CommonMessages msg = Messages.getBundle(CommonMessages.class);
+    CommonMessages msg = Messages.getBundle(lookup(), CommonMessages.class);
 
     // simple validation
 
diff --git a/src/main/java/org/wildfly/common/ref/Log.java b/src/main/java/org/wildfly/common/ref/Log.java
index 6dcc63b..b8ce223 100644
--- a/src/main/java/org/wildfly/common/ref/Log.java
+++ b/src/main/java/org/wildfly/common/ref/Log.java
@@ -18,6 +18,8 @@
 
 package org.wildfly.common.ref;
 
+import static java.lang.invoke.MethodHandles.lookup;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
@@ -29,7 +31,7 @@
  */
 @MessageLogger(projectCode = "COM", length = 5)
 interface Log {
-    Log log = Logger.getMessageLogger(Log.class, "org.wildfly.common.ref");
+    Log log = Logger.getMessageLogger(lookup(), Log.class, "org.wildfly.common.ref");
 
     // 3000-3099 reserved for reference queue logging
 
diff --git a/src/main/java/org/wildfly/common/xml/Log.java b/src/main/java/org/wildfly/common/xml/Log.java
index a60bb53..eb7cc63 100644
--- a/src/main/java/org/wildfly/common/xml/Log.java
+++ b/src/main/java/org/wildfly/common/xml/Log.java
@@ -18,6 +18,7 @@
 
 package org.wildfly.common.xml;
 
+import static java.lang.invoke.MethodHandles.lookup;
 import static org.jboss.logging.Logger.Level.WARN;
 
 import org.jboss.logging.BasicLogger;
@@ -30,7 +31,7 @@
 @MessageLogger(projectCode = "COM", length = 5)
 interface Log extends BasicLogger {
 
-    Log XML_FACTORY_LOGGER = Logger.getMessageLogger(Log.class, "org.wildfly.common.xml");
+    Log XML_FACTORY_LOGGER = Logger.getMessageLogger(lookup(), Log.class, "org.wildfly.common.xml");
 
     // 3100-3199 reserved for xml factory logging
     @LogMessage(level = WARN)