From 8a076ded94c2bd6b58cdcbb355e3f837a46e58f4 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Fri, 5 Jul 2024 08:33:49 -0500
Subject: [PATCH] More fixes for module mode

---
 annotations/src/main/java/module-info.java                   | 2 +-
 processor/pom.xml                                            | 1 -
 .../jboss/logging/processor/apt/MessageInterfaceFactory.java | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/annotations/src/main/java/module-info.java b/annotations/src/main/java/module-info.java
index 85aee83..3b87880 100644
--- a/annotations/src/main/java/module-info.java
+++ b/annotations/src/main/java/module-info.java
@@ -1,4 +1,4 @@
 module org.jboss.logging.annotations {
-    requires static org.jboss.logging;
+    requires org.jboss.logging;
     exports org.jboss.logging.annotations;
 }
diff --git a/processor/pom.xml b/processor/pom.xml
index d5f097f..c04e713 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -48,7 +48,6 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/processor/src/main/java/org/jboss/logging/processor/apt/MessageInterfaceFactory.java b/processor/src/main/java/org/jboss/logging/processor/apt/MessageInterfaceFactory.java
index 849c928..2087bfa 100644
--- a/processor/src/main/java/org/jboss/logging/processor/apt/MessageInterfaceFactory.java
+++ b/processor/src/main/java/org/jboss/logging/processor/apt/MessageInterfaceFactory.java
@@ -143,8 +143,9 @@ private AptMessageInterface(final TypeElement interfaceElement, final Processing
                 // Determine the type for the generated annotation
                 final ModuleElement moduleElement = processingEnv.getElementUtils()
                         .getModuleElement(Generated.class.getModule().getName());
-                this.generatedAnnotation = processingEnv.getElementUtils().getTypeElement(moduleElement,
-                        Generated.class.getName());
+                this.generatedAnnotation = moduleElement == null
+                        ? processingEnv.getElementUtils().getTypeElement(Generated.class.getName())
+                        : processingEnv.getElementUtils().getTypeElement(moduleElement, Generated.class.getName());
             } else {
                 this.generatedAnnotation = null;
             }