More fixes for module mode

jboss-logging · Jul 5, 2024 · 8a076de · 8a076de
1 parent 0dca8ee
commit 8a076de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;
             }