From bac0dd4e08b8d689786ce8b2f2d18713b71f8bab Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Mon, 20 Feb 2023 18:41:02 +0100
Subject: [PATCH] Adds explicit module descriptors to a subset of modules
 (#1943)

Fixes #1357
---
 annotation-error-decoder/pom.xml |  9 +++++++++
 core/pom.xml                     |  4 ++++
 dropwizard-metrics4/pom.xml      |  9 +++++++++
 dropwizard-metrics5/pom.xml      |  9 +++++++++
 googlehttpclient/pom.xml         |  9 +++++++++
 gson/pom.xml                     |  9 +++++++++
 hc5/pom.xml                      |  9 +++++++++
 httpclient/pom.xml               |  9 +++++++++
 jackson-jaxb/pom.xml             |  1 +
 jackson-jr/pom.xml               |  9 +++++++++
 jackson/pom.xml                  |  9 +++++++++
 jakarta/pom.xml                  |  9 +++++++++
 java11/pom.xml                   |  4 ++++
 jaxb/pom.xml                     |  9 +++++++++
 jaxrs/pom.xml                    |  4 ++++
 json/pom.xml                     |  9 +++++++++
 kotlin/pom.xml                   |  4 ++++
 micrometer/pom.xml               |  4 ++++
 mock/pom.xml                     |  8 ++++++++
 okhttp/pom.xml                   |  9 +++++++++
 pom.xml                          | 31 +++++++++++++++++++++++++++++++
 reactive/pom.xml                 |  8 ++++++++
 sax/pom.xml                      |  9 +++++++++
 slf4j/pom.xml                    |  9 +++++++++
 spring4/pom.xml                  |  8 ++++++++
 25 files changed, 211 insertions(+)

diff --git a/annotation-error-decoder/pom.xml b/annotation-error-decoder/pom.xml
index 6606c90e6..44cb71599 100644
--- a/annotation-error-decoder/pom.xml
+++ b/annotation-error-decoder/pom.xml
@@ -50,4 +50,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index 4ffb995de..0f53df19d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -73,6 +73,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
diff --git a/dropwizard-metrics4/pom.xml b/dropwizard-metrics4/pom.xml
index 855d1c4b9..fd1022042 100644
--- a/dropwizard-metrics4/pom.xml
+++ b/dropwizard-metrics4/pom.xml
@@ -56,4 +56,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/dropwizard-metrics5/pom.xml b/dropwizard-metrics5/pom.xml
index 688a0eef3..bc518414c 100644
--- a/dropwizard-metrics5/pom.xml
+++ b/dropwizard-metrics5/pom.xml
@@ -56,4 +56,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/googlehttpclient/pom.xml b/googlehttpclient/pom.xml
index e6303482b..5551cdbe5 100644
--- a/googlehttpclient/pom.xml
+++ b/googlehttpclient/pom.xml
@@ -55,4 +55,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/gson/pom.xml b/gson/pom.xml
index 5183a0c65..7ecf2ddea 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -49,4 +49,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/hc5/pom.xml b/hc5/pom.xml
index 0f0d99350..28780b6f7 100644
--- a/hc5/pom.xml
+++ b/hc5/pom.xml
@@ -68,4 +68,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 23d640434..0e39c82db 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -75,4 +75,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jackson-jaxb/pom.xml b/jackson-jaxb/pom.xml
index 69c1aaf6f..bd48b52f2 100644
--- a/jackson-jaxb/pom.xml
+++ b/jackson-jaxb/pom.xml
@@ -80,6 +80,7 @@
 
   <profiles>
     <profile>
+      <id>java11</id>
       <activation>
         <jdk>11</jdk>
       </activation>
diff --git a/jackson-jr/pom.xml b/jackson-jr/pom.xml
index 984ac586f..4ef9baa91 100644
--- a/jackson-jr/pom.xml
+++ b/jackson-jr/pom.xml
@@ -55,4 +55,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 7cc81aa83..b83ffec26 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -50,4 +50,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
index dc746d0d6..52dd52c49 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -63,4 +63,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java11/pom.xml b/java11/pom.xml
index 7ef03a868..c22d3b9a2 100644
--- a/java11/pom.xml
+++ b/java11/pom.xml
@@ -68,6 +68,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
diff --git a/jaxb/pom.xml b/jaxb/pom.xml
index b097e6211..98822ebec 100644
--- a/jaxb/pom.xml
+++ b/jaxb/pom.xml
@@ -45,6 +45,15 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>java11</id>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index cc34932b2..915677ef1 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -60,6 +60,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
diff --git a/json/pom.xml b/json/pom.xml
index 76e1ccbcf..8d78e5c97 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -63,4 +63,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index e8deac4e4..5395ada34 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -79,6 +79,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
diff --git a/micrometer/pom.xml b/micrometer/pom.xml
index c61fad759..55b3ab876 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -72,6 +72,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
diff --git a/mock/pom.xml b/mock/pom.xml
index 1208ba61a..394869bf9 100644
--- a/mock/pom.xml
+++ b/mock/pom.xml
@@ -49,4 +49,12 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/okhttp/pom.xml b/okhttp/pom.xml
index c9955f482..b6f379ef8 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -61,4 +61,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index f4b344f23..69e09b05e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
     <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
     <maven-deploy-plugin.version>3.1.0</maven-deploy-plugin.version>
     <docker-maven-plugin.version>1.2.2</docker-maven-plugin.version>
+    <moditect-maven-plugin.version>1.0.0.RC2</moditect-maven-plugin.version>
   </properties>
   <url>https://github.com/openfeign/feign</url>
   <inceptionYear>2012</inceptionYear>
@@ -455,6 +456,36 @@
             </dependency>
           </dependencies>
         </plugin>
+
+        <plugin>
+          <groupId>org.moditect</groupId>
+          <artifactId>moditect-maven-plugin</artifactId>
+          <version>${moditect-maven-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>add-module-infos</id>
+              <phase>package</phase>
+              <goals>
+                <goal>add-module-info</goal>
+              </goals>
+              <configuration>
+                <overwriteExistingFiles>true</overwriteExistingFiles>
+                <module>
+                  <moduleInfo>
+                    <!-- module name will be derived from filename -->
+                    <!-- export everything -->
+                    <exports>*;</exports>
+                    <!-- declare services consumed by the artifact -->
+                    <addServiceUses>true</addServiceUses>
+                  </moduleInfo>
+                </module>
+                <jdepsExtraArgs>
+                  <arg>--multi-release=9</arg>
+                </jdepsExtraArgs>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
 
diff --git a/reactive/pom.xml b/reactive/pom.xml
index 782b292a2..4afdb3de6 100644
--- a/reactive/pom.xml
+++ b/reactive/pom.xml
@@ -95,4 +95,12 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/sax/pom.xml b/sax/pom.xml
index 049c858c6..00503678d 100644
--- a/sax/pom.xml
+++ b/sax/pom.xml
@@ -44,4 +44,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
index 836c415d0..ea633378b 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -57,4 +57,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/spring4/pom.xml b/spring4/pom.xml
index bf07ae9eb..361d3a551 100644
--- a/spring4/pom.xml
+++ b/spring4/pom.xml
@@ -62,4 +62,12 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>