Manual pom.xml merge from #1562

Author: cowtowncoder

pom.xml

@@ -184,33 +184,6 @@ tools.jackson.core.*;version=${project.version}
         <artifactId>cyclonedx-maven-plugin</artifactId>
       </plugin>
 
-      <!-- 10-Jan-2025, tatu: [core#1380] Still need to use Moditect to
-         work around bug/misfeature of maven-shade-plugin where it absolutely
-         removes root-level `module-info.class`. So use Moditect to put it back
-         (but from diff place than with Jackson 2.x)
-        -->
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-module-infos</id>
-            <phase>package</phase>
-            <goals>
-              <goal>add-module-info</goal>
-            </goals>
-            <configuration>
-              <overwriteExistingFiles>true</overwriteExistingFiles>
-              <module>
-                <moduleInfoFile>src/main/java/module-info.java</moduleInfoFile>
-              </module>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <jvmVersion>17</jvmVersion>
-        </configuration>
-      </plugin>
       <!-- 03-Nov-2020, tatu: Add LICENSE from main level -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -305,6 +278,36 @@ tools.jackson.core.*;version=${project.version}
           </execution>
         </executions>
       </plugin>
+      <!-- 10-Jan-2025, tatu: [core#1380] Use Moditect to add `module-info.class`
+         at JAR root level. Must run AFTER shade plugin (declared after it here
+         so Maven executes it later in `package` phase) so shade cannot strip it.
+         Override parent's jvmVersion=17 via combine.self="override" so that
+         module-info.class is placed at root `/` rather than META-INF/versions/17/.
+        -->
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>src/main/java/module-info.java</moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+        <!-- Override parent's jvmVersion=17: no jvmVersion means module-info.class
+             is placed at JAR root instead of META-INF/versions/17/
+          -->
+        <configuration combine.self="override">
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.gradlex</groupId>
         <artifactId>gradle-module-metadata-maven-plugin</artifactId>
@@ -329,9 +332,10 @@ tools.jackson.core.*;version=${project.version}
               <Multi-Release>true</Multi-Release>
             </manifestEntries>
           </archive>
-          <!-- 10-Jan-2025, tatu: [core#1380] Kludgerus Maximums... must actually
-             remove `module-info.class` just so Moditect can add it in place
-             where shade plugin will not filter it out. Oy vey.
+          <!-- 10-Jan-2025, tatu: [core#1380] Exclude module-info.class from
+             initial jar so that shade plugin never sees it (shade strips
+             root-level module-info.class). Moditect re-adds it at root
+             after shade runs (see moditect plugin declaration below shade).
             -->
           <excludes>
             <exclude>module-info.class</exclude>