You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yu...@apache.org on 2022/10/01 03:17:53 UTC

[hudi] branch release-0.12.1 updated: [HUDI-4957] Shade JOL in bundles to fix NoClassDefFoundError:GraphLayout (#6839)

This is an automated email from the ASF dual-hosted git repository.

yuzhaojing pushed a commit to branch release-0.12.1
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/release-0.12.1 by this push:
     new 7f73dcd8c3 [HUDI-4957] Shade JOL in bundles to fix NoClassDefFoundError:GraphLayout (#6839)
7f73dcd8c3 is described below

commit 7f73dcd8c3e999cdd1f5164c06987f69d5313a20
Author: Sagar Sumit <sa...@gmail.com>
AuthorDate: Sat Oct 1 01:24:16 2022 +0530

    [HUDI-4957] Shade JOL in bundles to fix NoClassDefFoundError:GraphLayout (#6839)
---
 packaging/hudi-aws-bundle/pom.xml             | 5 +++++
 packaging/hudi-datahub-sync-bundle/pom.xml    | 5 +++++
 packaging/hudi-gcp-bundle/pom.xml             | 5 +++++
 packaging/hudi-timeline-server-bundle/pom.xml | 5 +++++
 packaging/hudi-utilities-slim-bundle/pom.xml  | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/packaging/hudi-aws-bundle/pom.xml b/packaging/hudi-aws-bundle/pom.xml
index 2673ce9312..174d036998 100644
--- a/packaging/hudi-aws-bundle/pom.xml
+++ b/packaging/hudi-aws-bundle/pom.xml
@@ -99,6 +99,7 @@
                                     <include>org.apache.hbase.thirdparty:hbase-shaded-netty</include>
                                     <include>org.apache.hbase.thirdparty:hbase-shaded-protobuf</include>
                                     <include>org.apache.htrace:htrace-core4</include>
+                                    <include>org.openjdk.jol:jol-core</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
@@ -145,6 +146,10 @@
                                     <pattern>com.codahale.metrics.</pattern>
                                     <shadedPattern>org.apache.hudi.com.codahale.metrics.</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.openjdk.jol.</pattern>
+                                    <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
+                                </relocation>
                                 <!-- The classes below in org.apache.hadoop.metrics2 package come from
                                 hbase-hadoop-compat and hbase-hadoop2-compat, which have to be shaded one by one,
                                 instead of shading all classes under org.apache.hadoop.metrics2 including ones
diff --git a/packaging/hudi-datahub-sync-bundle/pom.xml b/packaging/hudi-datahub-sync-bundle/pom.xml
index d6459c57ff..c02bebe0e6 100644
--- a/packaging/hudi-datahub-sync-bundle/pom.xml
+++ b/packaging/hudi-datahub-sync-bundle/pom.xml
@@ -95,6 +95,7 @@
                   <include>org.apache.httpcomponents:httpclient</include>
                   <include>org.apache.httpcomponents:httpasyncclient</include>
                   <include>org.apache.httpcomponents:httpcore-nio</include>
+                  <include>org.openjdk.jol:jol-core</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -129,6 +130,10 @@
                   <pattern>org.objenesis.</pattern>
                   <shadedPattern>org.apache.hudi.org.objenesis.</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.openjdk.jol.</pattern>
+                  <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
+                </relocation>
                 <!-- The classes below in org.apache.hadoop.metrics2 package come from
                 hbase-hadoop-compat and hbase-hadoop2-compat, which have to be shaded one by one,
                 instead of shading all classes under org.apache.hadoop.metrics2 including ones
diff --git a/packaging/hudi-gcp-bundle/pom.xml b/packaging/hudi-gcp-bundle/pom.xml
index 5e99b482ce..979d45e968 100644
--- a/packaging/hudi-gcp-bundle/pom.xml
+++ b/packaging/hudi-gcp-bundle/pom.xml
@@ -114,6 +114,7 @@
                   <include>org.apache.hbase.thirdparty:hbase-shaded-netty</include>
                   <include>org.apache.hbase.thirdparty:hbase-shaded-protobuf</include>
                   <include>org.apache.htrace:htrace-core4</include>
+                  <include>org.openjdk.jol:jol-core</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -148,6 +149,10 @@
                   <pattern>org.objenesis.</pattern>
                   <shadedPattern>org.apache.hudi.org.objenesis.</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.openjdk.jol.</pattern>
+                  <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
+                </relocation>
                 <!-- The classes below in org.apache.hadoop.metrics2 package come from
                 hbase-hadoop-compat and hbase-hadoop2-compat, which have to be shaded one by one,
                 instead of shading all classes under org.apache.hadoop.metrics2 including ones
diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml
index 103033ece8..8957f8000b 100644
--- a/packaging/hudi-timeline-server-bundle/pom.xml
+++ b/packaging/hudi-timeline-server-bundle/pom.xml
@@ -212,6 +212,7 @@
                       <include>commons-io:commons-io</include>
                       <include>log4j:log4j</include>
                       <include>org.objenesis:objenesis</include>
+                      <include>org.openjdk.jol:jol-core</include>
                   </includes>
                 </artifactSet>
                 <relocations>
@@ -234,6 +235,10 @@
                         <pattern>org.apache.htrace.</pattern>
                         <shadedPattern>org.apache.hudi.org.apache.htrace.</shadedPattern>
                     </relocation>
+                    <relocation>
+                        <pattern>org.openjdk.jol.</pattern>
+                        <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
+                    </relocation>
                     <!-- The classes below in org.apache.hadoop.metrics2 package come from
                 hbase-hadoop-compat and hbase-hadoop2-compat, which have to be shaded one by one,
                 instead of shading all classes under org.apache.hadoop.metrics2 including ones
diff --git a/packaging/hudi-utilities-slim-bundle/pom.xml b/packaging/hudi-utilities-slim-bundle/pom.xml
index 2290ca6880..f1a3367f9b 100644
--- a/packaging/hudi-utilities-slim-bundle/pom.xml
+++ b/packaging/hudi-utilities-slim-bundle/pom.xml
@@ -150,6 +150,7 @@
                   <include>org.apache.curator:curator-recipes</include>
                   <include>commons-codec:commons-codec</include>
                   <include>commons-io:commons-io</include>
+                  <include>org.openjdk.jol:jol-core</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -215,6 +216,10 @@
                   <pattern>org.eclipse.jetty.</pattern>
                   <shadedPattern>org.apache.hudi.org.eclipse.jetty.</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.openjdk.jol.</pattern>
+                  <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
+                </relocation>
                 <!-- The classes below in org.apache.hadoop.metrics2 package come from
                 hbase-hadoop-compat and hbase-hadoop2-compat, which have to be shaded one by one,
                 instead of shading all classes under org.apache.hadoop.metrics2 including ones