Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions xtable-utilities/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,20 @@
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-common</artifactId>
</dependency>
<!--
Hudi 1.x split the former hudi-common into hudi-common + hudi-io +
hudi-hadoop-common. xtable-core compiles against these with the Hudi
Spark bundle in provided scope (a real Spark cluster supplies them),
but the standalone utilities jar has no such runtime, so it must bundle
hudi-hadoop-common itself (hudi-io comes in transitively at runtime).
Without this, RunSync fails with NoClassDefFoundError:
org/apache/hudi/hadoop/fs/HadoopFSUtils.
-->
<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-hadoop-common</artifactId>
<version>${hudi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-java-client</artifactId>
Expand Down Expand Up @@ -232,15 +246,17 @@
<artifactId>hudi-spark${spark.version.prefix}-bundle_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-java-client</artifactId>
<scope>test</scope>
</dependency>
<!--
Hudi's ObjectSizeCalculator loads org.openjdk.jol at runtime (not only in tests),
so the bundled utilities jar must ship it. The parent dependencyManagement pins
jol-core to test scope, so override to runtime here and add it to the shaded
artifactSet below. See https://github.com/apache/incubator-xtable/issues/736.
-->
<dependency>
<groupId>org.openjdk.jol</groupId>
<artifactId>jol-core</artifactId>
<scope>test</scope>
<version>${jol.core.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

Expand Down Expand Up @@ -574,6 +590,8 @@
<include>org.apache.httpcomponents.core5:httpcore5-h2</include>
<include>org.apache.hudi:hudi-client-common</include>
<include>org.apache.hudi:hudi-common</include>
<include>org.apache.hudi:hudi-hadoop-common</include>
<include>org.apache.hudi:hudi-io</include>
<include>org.apache.hudi:hudi-java-client</include>
<include>org.apache.hudi:hudi-timeline-service</include>
<include>org.apache.iceberg:iceberg-api</include>
Expand Down Expand Up @@ -696,6 +714,7 @@
<include>org.json4s:json4s-scalap_${scala.binary.version}</include>
<include>org.lz4:lz4-java</include>
<include>org.objenesis:objenesis</include>
<include>org.openjdk.jol:jol-core</include>
<include>org.reactivestreams:reactive-streams</include>
<include>org.roaringbitmap:RoaringBitmap</include>
<include>org.roaringbitmap:shims</include>
Expand All @@ -707,6 +726,7 @@
<include>org.scala-lang.modules:scala-xml_${scala.binary.version}</include>
<include>org.slf4j:jcl-over-slf4j</include>
<include>org.slf4j:jul-to-slf4j</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-reload4j</include>
<include>org.threeten:threeten-extra</include>
<include>org.threeten:threetenbp</include>
Expand Down