From 54c3b1302dde3ca7c504a6b72ae806d654fd14b4 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Fri, 22 Apr 2022 10:48:36 -0500
Subject: [PATCH] Introduce module descriptors for all modules

---
 configuration/pom.xml                       |  4 ++++
 configuration/src/main/java/module-info.yml |  7 +++++++
 core/pom.xml                                |  4 ++++
 core/src/main/java/module-info.yml          | 23 +++++++++++++++++++++
 ext/pom.xml                                 |  4 ++++
 ext/src/main/java/module-info.yml           | 22 ++++++++++++++++++++
 pom.xml                                     | 17 +++++++++++++++
 7 files changed, 81 insertions(+)
 create mode 100644 configuration/src/main/java/module-info.yml
 create mode 100644 core/src/main/java/module-info.yml
 create mode 100644 ext/src/main/java/module-info.yml

diff --git a/configuration/pom.xml b/configuration/pom.xml
index 1ca7968c..9b2b05b1 100644
--- a/configuration/pom.xml
+++ b/configuration/pom.xml
@@ -74,6 +74,10 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.github.dmlloyd.module-info</groupId>
+                <artifactId>module-info</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/configuration/src/main/java/module-info.yml b/configuration/src/main/java/module-info.yml
new file mode 100644
index 00000000..c9fc8f9b
--- /dev/null
+++ b/configuration/src/main/java/module-info.yml
@@ -0,0 +1,7 @@
+name: org.jboss.logmanager.configuration
+
+requires:
+  - module: io.smallrye.common.expression
+  - module: org.jboss.logmanager
+  - module: org.jboss.modules
+    static: true
diff --git a/core/pom.xml b/core/pom.xml
index 7902d2e9..426cf915 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,6 +164,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.github.dmlloyd.module-info</groupId>
+                <artifactId>module-info</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/core/src/main/java/module-info.yml b/core/src/main/java/module-info.yml
new file mode 100644
index 00000000..3549d2b9
--- /dev/null
+++ b/core/src/main/java/module-info.yml
@@ -0,0 +1,23 @@
+name: org.jboss.logmanager
+
+opens:
+  - package: org.jboss.logmanager.errormanager
+    to:
+      - org.jboss.logmanager.configuration
+  - package: org.jboss.logmanager.filters
+    to:
+      - org.jboss.logmanager.configuration
+  - package: org.jboss.logmanager.formatters
+    to:
+     - org.jboss.logmanager.configuration
+  - package: org.jboss.logmanager.handlers
+    to:
+     - org.jboss.logmanager.configuration
+
+requires:
+  - module: io.smallrye.common.constraint
+  - module: io.smallrye.common.net
+  - module: io.smallrye.common.os
+  - module: io.smallrye.common.ref
+  - module: org.jboss.modules
+    static: true
diff --git a/ext/pom.xml b/ext/pom.xml
index 0fb7c03b..30d05ef8 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -120,6 +120,10 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.github.dmlloyd.module-info</groupId>
+                <artifactId>module-info</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/ext/src/main/java/module-info.yml b/ext/src/main/java/module-info.yml
new file mode 100644
index 00000000..69d4e789
--- /dev/null
+++ b/ext/src/main/java/module-info.yml
@@ -0,0 +1,22 @@
+name: org.jboss.logmanager.ext
+
+opens:
+  - package: org.jboss.logmanager.ext.formatters
+    to:
+     - org.jboss.logmanager.configuration
+  - package: org.jboss.logmanager.ext.handlers
+    to:
+     - org.jboss.logmanager.configuration
+
+requires:
+  - module: io.smallrye.common.constraint
+
+  - module: jakarta.json-api
+    static: true
+
+  - module: org.jboss.logging
+
+  - module: org.jboss.logmanager
+
+  - module: org.jboss.modules
+    static: true
diff --git a/pom.xml b/pom.xml
index f5032294..96a0f306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,9 @@
         <org.jboss.test.port>4560</org.jboss.test.port>
         <org.jboss.test.alt.port>14560</org.jboss.test.alt.port>
 
+        <!-- Plugin versions -->
+        <version.io.github.dmlloyd.module-info>1.2</version.io.github.dmlloyd.module-info>
+
         <skipTests>false</skipTests>
         <skipITs>${skipTests}</skipITs>
         <skipUTs>${skipTests}</skipUTs>
@@ -180,6 +183,20 @@
                         <skipTests>${skipUTs}</skipTests>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>io.github.dmlloyd.module-info</groupId>
+                    <artifactId>module-info</artifactId>
+                    <version>${version.io.github.dmlloyd.module-info}</version>
+                    <executions>
+                        <execution>
+                            <id>module-info</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>generate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>