Skip to content

Commit 1baacaa

Browse files
committed
fix(build): add enforcer ignores for iceberg-spark-runtime shaded classes
1 parent 3af0b12 commit 1baacaa

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,13 +1167,26 @@ under the License.
11671167
<ignoreClass>com.google.thirdparty.publicsuffix.PublicSuffixType</ignoreClass>
11681168
</ignoreClasses>
11691169
</dependency>
1170-
<!-- Iceberg uber jar bundles jetbrains annotations -->
1170+
<!-- Iceberg uber jar bundles jetbrains annotations and other shaded classes -->
11711171
<dependency>
11721172
<groupId>org.apache.iceberg</groupId>
11731173
<artifactId>*</artifactId>
11741174
<ignoreClasses>
11751175
<ignoreClass>org.jetbrains.annotations.*</ignoreClass>
11761176
<ignoreClass>org.intellij.lang.annotations.*</ignoreClass>
1177+
<!-- iceberg-spark-runtime shades Spark SQL classes -->
1178+
<ignoreClass>org.apache.spark.sql.execution.datasources.v2.ReplaceDataExec</ignoreClass>
1179+
<ignoreClass>org.apache.spark.sql.execution.datasources.v2.ReplaceDataExec$</ignoreClass>
1180+
<!-- iceberg-spark-runtime shades yetus audience-annotations -->
1181+
<ignoreClass>org.apache.yetus.audience.*</ignoreClass>
1182+
</ignoreClasses>
1183+
</dependency>
1184+
<!-- yetus annotations also conflict with iceberg-spark-runtime -->
1185+
<dependency>
1186+
<groupId>org.apache.yetus</groupId>
1187+
<artifactId>audience-annotations</artifactId>
1188+
<ignoreClasses>
1189+
<ignoreClass>org.apache.yetus.audience.*</ignoreClass>
11771190
</ignoreClasses>
11781191
</dependency>
11791192
</dependencies>

0 commit comments

Comments
 (0)