From 8223147914d2868e1136c55b7a419c777889487c Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 18 May 2023 13:24:46 -0700
Subject: [PATCH] Manual merge of pom.xml changes wrt #1028 to master as well

---
 pom.xml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c433ee96d..7608037db8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,22 +139,6 @@ tools.jackson.core.*;version=${project.version}
         <artifactId>build-helper-maven-plugin</artifactId>
       </plugin>
 
-      <plugin>
-        <groupId>de.jjohannes</groupId>
-        <artifactId>gradle-module-metadata-maven-plugin</artifactId>
-	<!-- 27-Apr-2023, tatu: [core#999]: Need to exclude shaded FDP
-	   dependency from GMM
-	  -->
-	<configuration>
-          <removedDependencies>
-            <dependency>
-              <groupId>ch.randelshofer</groupId>
-              <artifactId>fastdoubleparser</artifactId>
-            </dependency>
-          </removedDependencies>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -213,6 +197,21 @@ tools.jackson.core.*;version=${project.version}
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>de.jjohannes</groupId>
+        <artifactId>gradle-module-metadata-maven-plugin</artifactId>
+	<!-- 27-Apr-2023, tatu: [core#999]: Need to exclude shaded FDP
+	   dependency from GMM
+	  -->
+	<configuration>
+          <removedDependencies>
+            <dependency>
+              <groupId>ch.randelshofer</groupId>
+              <artifactId>fastdoubleparser</artifactId>
+            </dependency>
+          </removedDependencies>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>