Manual merge of #547

FasterXML · Feb 28, 2025 · 50a6b05 · 50a6b05
1 parent 379d059
commit 50a6b05
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/csv/pom.xml b/csv/pom.xml
@@ -57,12 +57,12 @@ abstractions.
         <!-- Inherited from oss-base. Generate PackageVersion.java.-->
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
-        <executions>
-          <execution>
-            <id>process-packageVersion</id>
-            <phase>generate-sources</phase>
-          </execution>
-        </executions>
+      </plugin>
+      <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
+      <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
+      <plugin>
+        <groupId>org.gradlex</groupId>
+        <artifactId>gradle-module-metadata-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/pom.xml b/pom.xml
@@ -108,14 +108,6 @@
         </plugin>
       </plugins>
     </pluginManagement>
-
-    <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
-    <plugins>
-      <plugin>
-        <groupId>de.jjohannes</groupId>
-        <artifactId>gradle-module-metadata-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
   </build>
 
 </project>
diff --git a/properties/pom.xml b/properties/pom.xml
@@ -47,12 +47,12 @@ configuration files as if there was implied nesting structure (by default using
         <!-- Inherited from oss-base. Generate PackageVersion.java.-->
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
-        <executions>
-          <execution>
-            <id>process-packageVersion</id>
-            <phase>generate-sources</phase>
-          </execution>
-        </executions>
+      </plugin>
+      <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
+      <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
+      <plugin>
+        <groupId>org.gradlex</groupId>
+        <artifactId>gradle-module-metadata-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/toml/pom.xml b/toml/pom.xml
@@ -51,12 +51,6 @@
                 <!-- Inherited from oss-base. Generate PackageVersion.java.-->
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <executions>
-                    <execution>
-                        <id>process-packageVersion</id>
-                        <phase>generate-sources</phase>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>de.jflex</groupId>
@@ -76,6 +70,12 @@
                     <skeleton>${project.basedir}/src/main/jflex/skeleton-toml</skeleton>
                 </configuration>
             </plugin>
+            <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
+            <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
+            <plugin>
+                <groupId>org.gradlex</groupId>
+                <artifactId>gradle-module-metadata-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/yaml/pom.xml b/yaml/pom.xml
@@ -57,12 +57,12 @@
         <!-- Inherited from oss-base. Generate PackageVersion.java.-->
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
-        <executions>
-          <execution>
-            <id>process-packageVersion</id>
-            <phase>generate-sources</phase>
-          </execution>
-        </executions>
+      </plugin>
+      <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
+      <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
+      <plugin>
+        <groupId>org.gradlex</groupId>
+        <artifactId>gradle-module-metadata-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>