From f922aa244983be16e33d33d8500caac5195288e0 Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <132913826+sfc-gh-dprzybysz@users.noreply.github.com>
Date: Thu, 1 Feb 2024 07:52:20 +0100
Subject: [PATCH] SNOW-1003783: Fix multi-release jar entries (#1621)

---
 FIPS/pom.xml                | 36 ++++++++++++--
 ci/scripts/check_content.sh |  5 ++
 pom.xml                     | 97 ++++++++++++++++---------------------
 3 files changed, 78 insertions(+), 60 deletions(-)

diff --git a/FIPS/pom.xml b/FIPS/pom.xml
index 9071dd0bd..e7b0f6ccf 100644
--- a/FIPS/pom.xml
+++ b/FIPS/pom.xml
@@ -567,10 +567,7 @@
                             <exclude>META-INF/DEPENDENCIES</exclude>
                             <exclude>META-INF/maven/**</exclude>
                             <exclude>META-INF/services/com.fasterxml.*</exclude>
-                            <!-- jackson became a multi-release JAR since 2.15.x -->
-                            <!-- will need to exclude META-INF/versions/17 and META-INF/versions/19 until we move to newer Java versions -->
-                            <exclude>META-INF/versions/17/**</exclude>
-                            <exclude>META-INF/versions/19/**</exclude>
+                            <exclude>META-INF/versions/9/module-info.*</exclude>
                             <exclude>META-INF/*.xml</exclude>
                             <exclude>META-INF/*.SF</exclude>
                             <exclude>META-INF/*.DSA</exclude>
@@ -618,6 +615,37 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <!-- relocate the META-INF/versions files manually due to the maven bug -->
+            <!-- https://issues.apache.org/jira/browse/MSHADE-406 -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>repack</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <target>
+                    <unzip dest="${project.build.directory}/relocate" src="${project.build.directory}/${project.build.finalName}.jar"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/19/${relocationBase}"/>
+                    <!-- com.fasterxml.* packages are relocated to ${relocationBase}.fasterxml.* -->
+                    <move file="${project.build.directory}/relocate/META-INF/versions/11/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/17/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/19/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/19/${relocationBase}"/>
+                    <zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/19/${relocationBase}"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/ci/scripts/check_content.sh b/ci/scripts/check_content.sh
index d2922fe7a..a9c0768b6 100755
--- a/ci/scripts/check_content.sh
+++ b/ci/scripts/check_content.sh
@@ -12,3 +12,8 @@ if jar tvf $DIR/../../target/snowflake-jdbc${package_modifier}.jar  | awk '{prin
   echo "[ERROR] JDBC jar includes class not under the snowflake namespace"
   exit 1
 fi
+
+if jar tvf $DIR/../../target/snowflake-jdbc${package_modifier}.jar  | awk '{print $8}' | grep -E "^META-INF/versions/.*.class"  | grep -v -E "^META-INF/versions/.*/(net|com)/snowflake"; then
+  echo "[ERROR] JDBC jar includes multi release classes not under the snowflake namespace"
+  exit 1
+fi
diff --git a/pom.xml b/pom.xml
index e28976451..146b1367f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,6 @@
           <sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
           <sortExecutions>true</sortExecutions>
           <sortModules>true</sortModules>
-          <sortPlugins>groupId,artifactId</sortPlugins>
           <sortProperties>true</sortProperties>
           <verifyFail>stop</verifyFail>
           <verifyFailOn>strict</verifyFailOn>
@@ -609,33 +608,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <!-- relocate the META-INF/versions files manually due to the maven bug -->
-            <!-- https://issues.apache.org/jira/browse/MSHADE-406 -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>repack</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <unzip dest="${project.build.directory}/relocate" src="${project.build.directory}/${project.build.finalName}.jar"/>
-                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
-                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
-                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
-                    <zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
-                    <delete dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
-                    <delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
-                    <delete dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <!-- google linkage checker doesn't work well with shaded jar, disable the check in this case for now -->
             <groupId>org.apache.maven.plugins</groupId>
@@ -697,7 +669,6 @@
                         <exclude>META-INF/NOTICE*</exclude>
                         <exclude>META-INF/DEPENDENCIES</exclude>
                         <exclude>META-INF/maven/**</exclude>
-                        <exclude>META-INF/services/com.fasterxml.*</exclude>
                         <exclude>META-INF/*.xml</exclude>
                         <exclude>META-INF/*.SF</exclude>
                         <exclude>META-INF/*.DSA</exclude>
@@ -781,33 +752,6 @@
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <!-- relocate the META-INF/versions files manually due to the maven bug -->
-            <!-- https://issues.apache.org/jira/browse/MSHADE-406 -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>repack</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <unzip dest="${project.build.directory}/relocate" src="${project.build.directory}/${project.build.finalName}.jar"/>
-                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
-                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
-                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
-                    <zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
-                    <delete dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
-                    <delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
-                    <delete dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <!-- google linkage checker doesn't work well with shaded jar, disable the check in this case for now -->
             <groupId>org.apache.maven.plugins</groupId>
@@ -1010,6 +954,7 @@
                         <exclude>META-INF/DEPENDENCIES</exclude>
                         <exclude>META-INF/maven/**</exclude>
                         <exclude>META-INF/services/com.fasterxml.*</exclude>
+                        <exclude>META-INF/versions/9/module-info.*</exclude>
                         <exclude>META-INF/*.xml</exclude>
                         <exclude>META-INF/*.SF</exclude>
                         <exclude>META-INF/*.DSA</exclude>
@@ -1059,6 +1004,46 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <!-- relocate the META-INF/versions files manually due to the maven bug -->
+            <!-- https://issues.apache.org/jira/browse/MSHADE-406 -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>repack</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <target>
+                    <unzip dest="${project.build.directory}/relocate" src="${project.build.directory}/${project.build.finalName}.jar"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/19/${relocationBase}"/>
+                    <!-- org.bouncycastle.* packages are relocated to ${relocationBase}.org.bouncycastle.* -->
+                    <move file="${project.build.directory}/relocate/META-INF/versions/9/org" todir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/11/org" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/15/org" todir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
+                    <!-- com.fasterxml.* packages are relocated to ${relocationBase}.fasterxml.* -->
+                    <move file="${project.build.directory}/relocate/META-INF/versions/11/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/17/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/19/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/19/${relocationBase}"/>
+                    <zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/19/${relocationBase}"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>buildnumber-maven-plugin</artifactId>