From 574dcf920c4677513f6fdc8d441bb42827afa5a2 Mon Sep 17 00:00:00 2001
From: Cory Locklear <corylocklear@gmail.com>
Date: Fri, 3 Jul 2020 19:22:52 -0400
Subject: [PATCH] [MINOR] Relocate jetty during shading/packaging for
 Databricks runtime (#1781)

---
 packaging/hudi-spark-bundle/pom.xml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
index 2cc31cb2b..e0e60a972 100644
--- a/packaging/hudi-spark-bundle/pom.xml
+++ b/packaging/hudi-spark-bundle/pom.xml
@@ -52,10 +52,9 @@
               <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
               </dependencyReducedPomLocation>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
-                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"></transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-                    <addHeader>true</addHeader>
+                  <addHeader>true</addHeader>
                 </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
                   <resource>META-INF/LICENSE</resource>
@@ -142,9 +141,13 @@
                   <pattern>org.apache.commons.codec.</pattern>
                   <shadedPattern>org.apache.hudi.org.apache.commons.codec.</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.eclipse.jetty.</pattern>
+                  <shadedPattern>org.apache.hudi.org.apache.jetty.</shadedPattern>
+                </relocation>
                 <!-- TODO: Revisit GH ISSUE #533 & PR#633-->
               </relocations>
-             <filters>
+              <filters>
                 <filter>
                   <artifact>*:*</artifact>
                   <excludes>
@@ -161,14 +164,14 @@
         </executions>
       </plugin>
     </plugins>
-     <resources>
-       <resource>
-         <directory>src/main/resources</directory>
-       </resource>
-       <resource>
-         <directory>src/test/resources</directory>
-       </resource>
-     </resources>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/test/resources</directory>
+      </resource>
+    </resources>
   </build>
 
   <dependencies>