From 7e33491cf50eff5c50208a56dcc706f8aeb9ee39 Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Mon, 20 Feb 2023 18:41:02 +0100
Subject: [PATCH 1/5] 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>

From bae4b5f3d124305e2527affd4ebe88e108d55d32 Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Mon, 20 Feb 2023 20:55:03 +0100
Subject: [PATCH 2/5] Configure CI to run with Java 11

---
 .circleci/config.yml | 16 +++++++++-------
 pom.xml              |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f48e6ed0..e3e16d351 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ executors:
     parameters:
       version:
         description: 'jdk version to use'
-        default: '8.0'
+        default: '11.0'
         type: string
     docker:
       - image: cimg/openjdk:<<parameters.version>>
@@ -101,7 +101,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '8.0'
+        default: '11.0'
         type: string
     executor:
       name: java
@@ -120,8 +120,11 @@ jobs:
           key: feign-dependencies-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
+          # Do not generale module-info when running tests
+          # because one of the current JDK targets is 8
+          # Moditect requires 11 as a minimum
           command: |
-            ./mvnw -ntp -B test
+            ./mvnw -ntp -B test -Dmoditect.skip=true
       - verify-formatting
   android-test:
     # These next lines define the Android machine image executor:  https://circleci.com/docs/2.0/executor-types/
@@ -140,7 +143,7 @@ jobs:
     parameters:
       jdk:
         description: 'jdk version to use'
-        default: '8.0'
+        default: '11.0'
         type: string
     executor:
       name: java
@@ -217,10 +220,9 @@ workflows:
           filters:
             <<: *master-only
       - deploy:
-          jdk: '8.0'
+          jdk: '11.0'
           name: 'deploy snapshot'
           requires:
-            - 'jdk 8'
             - 'jdk 11'
             - 'jdk 17'
           context: Sonatype
@@ -239,7 +241,7 @@ workflows:
   release:
     jobs:
       - deploy:
-          jdk: '8.0'
+          jdk: '11.0'
           name: 'release to maven central'
           context: Sonatype
           filters:
diff --git a/pom.xml b/pom.xml
index 69e09b05e..aa88d2a2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -816,6 +816,9 @@
         <module>java11</module>
         <module>jakarta</module>
       </modules>
+      <properties>
+        <maven.compiler.release>8</maven.compiler.release>
+      </properties>
     </profile>
 
     <profile>

From 55bfd2d6156c38f778308876e2664f87608e9ba2 Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Sat, 25 Feb 2023 12:32:16 +0100
Subject: [PATCH 3/5] Configure moditect for all modules, enable only on those
 that required it

---
 annotation-error-decoder/pom.xml | 10 +---------
 core/pom.xml                     |  5 +----
 dropwizard-metrics4/pom.xml      | 10 +---------
 dropwizard-metrics5/pom.xml      | 10 +---------
 googlehttpclient/pom.xml         | 10 +---------
 gson/pom.xml                     | 10 +---------
 hc5/pom.xml                      | 10 +---------
 httpclient/pom.xml               | 10 +---------
 jackson-jr/pom.xml               | 10 +---------
 jackson/pom.xml                  | 10 +---------
 jakarta/pom.xml                  | 10 +---------
 java11/pom.xml                   |  5 +----
 jaxrs/pom.xml                    |  5 +----
 json/pom.xml                     | 10 +---------
 kotlin/pom.xml                   |  5 +----
 micrometer/pom.xml               |  5 +----
 mock/pom.xml                     | 10 +---------
 okhttp/pom.xml                   | 10 +---------
 pom.xml                          |  7 +++++++
 reactive/pom.xml                 | 10 +---------
 sax/pom.xml                      | 10 +---------
 slf4j/pom.xml                    | 10 +---------
 spring4/pom.xml                  | 11 +----------
 23 files changed, 29 insertions(+), 174 deletions(-)

diff --git a/annotation-error-decoder/pom.xml b/annotation-error-decoder/pom.xml
index 44cb71599..af9c957db 100644
--- a/annotation-error-decoder/pom.xml
+++ b/annotation-error-decoder/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -50,13 +51,4 @@
       <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 0f53df19d..38f99229c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -73,10 +74,6 @@
 
   <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 0013ee451..b63cc9e15 100644
--- a/dropwizard-metrics4/pom.xml
+++ b/dropwizard-metrics4/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -56,13 +57,4 @@
       <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 bc518414c..567aa8559 100644
--- a/dropwizard-metrics5/pom.xml
+++ b/dropwizard-metrics5/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -56,13 +57,4 @@
       <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 5551cdbe5..9b6cf50f6 100644
--- a/googlehttpclient/pom.xml
+++ b/googlehttpclient/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -55,13 +56,4 @@
       <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 7ecf2ddea..61bd47751 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -49,13 +50,4 @@
       <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 28780b6f7..e7c862557 100644
--- a/hc5/pom.xml
+++ b/hc5/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -68,13 +69,4 @@
       <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 0e39c82db..203354afe 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -75,13 +76,4 @@
       <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-jr/pom.xml b/jackson-jr/pom.xml
index 4ef9baa91..fa2b6e566 100644
--- a/jackson-jr/pom.xml
+++ b/jackson-jr/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -55,13 +56,4 @@
       <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 b83ffec26..2cd0fcccf 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -50,13 +51,4 @@
       <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 af6f7315d..925d0a93b 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <main.java.version>11</main.java.version>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -64,13 +65,4 @@
       <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 c22d3b9a2..5dbad0a02 100644
--- a/java11/pom.xml
+++ b/java11/pom.xml
@@ -31,6 +31,7 @@
     <main.java.version>11</main.java.version>
     <main.signature.artifact>java18</main.signature.artifact>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
   </properties>
@@ -68,10 +69,6 @@
 
   <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/jaxrs/pom.xml b/jaxrs/pom.xml
index 915677ef1..342b9b6fa 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -60,10 +61,6 @@
 
   <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 8d78e5c97..f10906ae7 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -63,13 +64,4 @@
       <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 5395ada34..6f5e9189b 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
     <kotlin.version>1.8.10</kotlin.version>
     <kotlinx.coroutines.version>1.6.4</kotlinx.coroutines.version>
   </properties>
@@ -79,10 +80,6 @@
 
   <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 55b3ab876..a318ce400 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
     <micrometer.version>1.10.4</micrometer.version>
   </properties>
 
@@ -72,10 +73,6 @@
 
   <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 394869bf9..ec310ec8e 100644
--- a/mock/pom.xml
+++ b/mock/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -48,13 +49,4 @@
       <scope>test</scope>
     </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 b6f379ef8..890ddd4fc 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -61,13 +62,4 @@
       <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 acc64ffbb..f5d95cdcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 
+    <moditect.skip>true</moditect.skip>
     <!-- specifying jvm arguments -->
     <jvm.options>-Duser.language=en</jvm.options>
 
@@ -473,6 +474,7 @@
                 <goal>add-module-info</goal>
               </goals>
               <configuration>
+                <skip>${moditect.skip}</skip>
                 <overwriteExistingFiles>true</overwriteExistingFiles>
                 <module>
                   <moduleInfo>
@@ -528,6 +530,11 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
+
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <inherited>true</inherited>
diff --git a/reactive/pom.xml b/reactive/pom.xml
index 4afdb3de6..a00278aac 100644
--- a/reactive/pom.xml
+++ b/reactive/pom.xml
@@ -28,6 +28,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
     <reactor.version>3.5.2</reactor.version>
     <reactive.streams.version>1.0.4</reactive.streams.version>
     <reactivex.version>2.2.21</reactivex.version>
@@ -94,13 +95,4 @@
       <scope>test</scope>
     </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 00503678d..e6f6f5fcc 100644
--- a/sax/pom.xml
+++ b/sax/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -44,13 +45,4 @@
       <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 ea633378b..7916081fc 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -57,13 +58,4 @@
       <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 361d3a551..dd3c1d82c 100644
--- a/spring4/pom.xml
+++ b/spring4/pom.xml
@@ -29,7 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-
+    <moditect.skip>false</moditect.skip>
     <spring.version>4.3.30.RELEASE</spring.version>
   </properties>
 
@@ -61,13 +61,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
 </project>

From 1233651091ac2698d943dc8683594157e8a01aad Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Sat, 25 Feb 2023 21:32:28 +0100
Subject: [PATCH 4/5] Do not skip moditect when running tests

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 908adc6ac..45a2b8eed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,7 +94,7 @@ jobs:
           # because one of the current JDK targets is 8
           # Moditect requires 11 as a minimum
           command: |
-            ./mvnw -ntp -B test -Dmoditect.skip=true
+            ./mvnw -ntp -B test
       - verify-formatting
 
   deploy:

From a60cbe8c5b4d483b91aa99c1f1c7348d85b23588 Mon Sep 17 00:00:00 2001
From: Marvin Froeder <velobr@gmail.com>
Date: Mon, 27 Feb 2023 09:28:58 +1300
Subject: [PATCH 5/5] Only skip modules that don't work with moditect plugin

---
 .circleci/config.yml             |  3 --
 annotation-error-decoder/pom.xml |  1 -
 apt-test-generator/pom.xml       |  2 ++
 benchmark/pom.xml                |  2 ++
 core/pom.xml                     |  1 -
 dropwizard-metrics4/pom.xml      |  1 -
 dropwizard-metrics5/pom.xml      |  1 -
 googlehttpclient/pom.xml         |  1 -
 gson/pom.xml                     |  1 -
 hc5/pom.xml                      |  1 -
 httpclient/pom.xml               |  1 -
 jackson-jaxb/pom.xml             | 36 +++++--------------
 jackson-jr/pom.xml               |  1 -
 jackson/pom.xml                  |  1 -
 jakarta/pom.xml                  |  1 -
 java11/pom.xml                   |  1 -
 jaxb/pom.xml                     | 19 +++-------
 jaxrs/pom.xml                    |  1 -
 jaxrs2/pom.xml                   |  7 ++--
 json/pom.xml                     |  1 -
 kotlin/pom.xml                   |  1 -
 micrometer/pom.xml               |  1 -
 mock/pom.xml                     |  2 +-
 okhttp/pom.xml                   |  1 -
 pom.xml                          |  2 +-
 reactive/pom.xml                 |  2 +-
 ribbon/pom.xml                   |  2 ++
 sax/pom.xml                      |  1 -
 slf4j/pom.xml                    |  1 -
 soap/pom.xml                     | 60 +++++++++++++-------------------
 spring4/pom.xml                  |  3 +-
 31 files changed, 51 insertions(+), 108 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 45a2b8eed..928fd9bfe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -90,9 +90,6 @@ jobs:
           key: feign-dependencies-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
-          # Do not generale module-info when running tests
-          # because one of the current JDK targets is 8
-          # Moditect requires 11 as a minimum
           command: |
             ./mvnw -ntp -B test
       - verify-formatting
diff --git a/annotation-error-decoder/pom.xml b/annotation-error-decoder/pom.xml
index af9c957db..6606c90e6 100644
--- a/annotation-error-decoder/pom.xml
+++ b/annotation-error-decoder/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/apt-test-generator/pom.xml b/apt-test-generator/pom.xml
index 250d0b527..ee0f731ec 100644
--- a/apt-test-generator/pom.xml
+++ b/apt-test-generator/pom.xml
@@ -30,6 +30,8 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 2d954caa2..bee272b25 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -32,6 +32,8 @@
     <rx.java.version>1.3.8</rx.java.version>
     <netty.version>4.1.89.Final</netty.version>
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <dependencyManagement>
diff --git a/core/pom.xml b/core/pom.xml
index 38f99229c..4ffb995de 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/dropwizard-metrics4/pom.xml b/dropwizard-metrics4/pom.xml
index b63cc9e15..448be6aa7 100644
--- a/dropwizard-metrics4/pom.xml
+++ b/dropwizard-metrics4/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/dropwizard-metrics5/pom.xml b/dropwizard-metrics5/pom.xml
index 567aa8559..688a0eef3 100644
--- a/dropwizard-metrics5/pom.xml
+++ b/dropwizard-metrics5/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/googlehttpclient/pom.xml b/googlehttpclient/pom.xml
index 9b6cf50f6..e6303482b 100644
--- a/googlehttpclient/pom.xml
+++ b/googlehttpclient/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/gson/pom.xml b/gson/pom.xml
index 61bd47751..5183a0c65 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/hc5/pom.xml b/hc5/pom.xml
index e7c862557..0f0d99350 100644
--- a/hc5/pom.xml
+++ b/hc5/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 203354afe..23d640434 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/jackson-jaxb/pom.xml b/jackson-jaxb/pom.xml
index bd48b52f2..77df882d7 100644
--- a/jackson-jaxb/pom.xml
+++ b/jackson-jaxb/pom.xml
@@ -29,6 +29,8 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <dependencies>
@@ -76,33 +78,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-  </dependencies>
 
-  <profiles>
-    <profile>
-      <id>java11</id>
-      <activation>
-        <jdk>11</jdk>
-      </activation>
-
-      <!--
-        JAXB was removed from java SDK on JEP 320
-        http://openjdk.java.net/jeps/320
-       -->
-      <dependencies>
-        <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>2.3.1</version>
-        </dependency>
-        <dependency>
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>jaxb-runtime</artifactId>
-          <version>2.4.0-b180830.0438</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>
diff --git a/jackson-jr/pom.xml b/jackson-jr/pom.xml
index fa2b6e566..984ac586f 100644
--- a/jackson-jr/pom.xml
+++ b/jackson-jr/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 2cd0fcccf..7cc81aa83 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
index 925d0a93b..ee4732883 100644
--- a/jakarta/pom.xml
+++ b/jakarta/pom.xml
@@ -30,7 +30,6 @@
   <properties>
     <main.java.version>11</main.java.version>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/java11/pom.xml b/java11/pom.xml
index 5dbad0a02..7ef03a868 100644
--- a/java11/pom.xml
+++ b/java11/pom.xml
@@ -31,7 +31,6 @@
     <main.java.version>11</main.java.version>
     <main.signature.artifact>java18</main.signature.artifact>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
   </properties>
diff --git a/jaxb/pom.xml b/jaxb/pom.xml
index a761e8de5..da08c7161 100644
--- a/jaxb/pom.xml
+++ b/jaxb/pom.xml
@@ -48,21 +48,12 @@
       <artifactId>jaxb-api</artifactId>
       <version>2.3.1</version>
     </dependency>
+
+    <!-- JAXB RI -->
     <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.4.0-b180830.0438</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-core</artifactId>
-      <version>4.0.2</version>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 342b9b6fa..cc34932b2 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/jaxrs2/pom.xml b/jaxrs2/pom.xml
index db2c6394c..16d2274ea 100644
--- a/jaxrs2/pom.xml
+++ b/jaxrs2/pom.xml
@@ -28,12 +28,9 @@
   <description>Feign JAX-RS 2</description>
 
   <properties>
-    <!-- override default bytecode version for src/main from parent pom -->
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/json/pom.xml b/json/pom.xml
index f10906ae7..76e1ccbcf 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index 6f5e9189b..e8deac4e4 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
     <kotlin.version>1.8.10</kotlin.version>
     <kotlinx.coroutines.version>1.6.4</kotlinx.coroutines.version>
   </properties>
diff --git a/micrometer/pom.xml b/micrometer/pom.xml
index a318ce400..c61fad759 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
     <micrometer.version>1.10.4</micrometer.version>
   </properties>
 
diff --git a/mock/pom.xml b/mock/pom.xml
index ec310ec8e..1208ba61a 100644
--- a/mock/pom.xml
+++ b/mock/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
@@ -49,4 +48,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
 </project>
diff --git a/okhttp/pom.xml b/okhttp/pom.xml
index 890ddd4fc..c9955f482 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index f5d95cdcb..eb6d67ede 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 
-    <moditect.skip>true</moditect.skip>
+    <moditect.skip>false</moditect.skip>
     <!-- specifying jvm arguments -->
     <jvm.options>-Duser.language=en</jvm.options>
 
diff --git a/reactive/pom.xml b/reactive/pom.xml
index a00278aac..782b292a2 100644
--- a/reactive/pom.xml
+++ b/reactive/pom.xml
@@ -28,7 +28,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
     <reactor.version>3.5.2</reactor.version>
     <reactive.streams.version>1.0.4</reactive.streams.version>
     <reactivex.version>2.2.21</reactivex.version>
@@ -95,4 +94,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
 </project>
diff --git a/ribbon/pom.xml b/ribbon/pom.xml
index 6891d6349..6b299b152 100644
--- a/ribbon/pom.xml
+++ b/ribbon/pom.xml
@@ -30,6 +30,8 @@
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
     <ribbon-version>2.7.18</ribbon-version>
+
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <dependencyManagement>
diff --git a/sax/pom.xml b/sax/pom.xml
index e6f6f5fcc..049c858c6 100644
--- a/sax/pom.xml
+++ b/sax/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
index 7916081fc..836c415d0 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
   </properties>
 
   <dependencies>
diff --git a/soap/pom.xml b/soap/pom.xml
index 1374726c4..8c703f42f 100644
--- a/soap/pom.xml
+++ b/soap/pom.xml
@@ -29,6 +29,8 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <dependencies>
@@ -48,42 +50,28 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-  </dependencies>
 
-  <profiles>
-    <profile>
-      <activation>
-        <jdk>[11,]</jdk>
-      </activation>
-
-      <!--
-        JAX-WS was removed from java SDK on JEP 320
-        http://openjdk.java.net/jeps/320
-       -->
-      <dependencies>
-        <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>2.3.1</version>
-        </dependency>
-        <dependency>
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>jaxb-runtime</artifactId>
-          <version>2.4.0-b180830.0438</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.xml.ws</groupId>
-          <artifactId>jaxws-api</artifactId>
-          <version>2.3.1</version>
-        </dependency>
-        <dependency>
-          <groupId>com.sun.xml.messaging.saaj</groupId>
-          <artifactId>saaj-impl</artifactId>
-          <version>1.5.1</version>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>javax.xml.ws</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <version>2.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.messaging.saaj</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.3.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>
diff --git a/spring4/pom.xml b/spring4/pom.xml
index dd3c1d82c..bf07ae9eb 100644
--- a/spring4/pom.xml
+++ b/spring4/pom.xml
@@ -29,7 +29,7 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <moditect.skip>false</moditect.skip>
+
     <spring.version>4.3.30.RELEASE</spring.version>
   </properties>
 
@@ -61,4 +61,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
 </project>