This is an automated email from the ASF dual-hosted git repository. blue pushed a commit to branch 0.9.x in repository https://gitbox.apache.org/repos/asf/iceberg.git
commit b012d67d184fb3b6597f94c9c184c3cc3d33d48a Author: Ryan Blue <[email protected]> AuthorDate: Sun Jul 26 13:48:29 2020 -0700 Fix Guava imports (#1251) --- .baseline/checkstyle/checkstyle.xml | 2 +- build.gradle | 2 ++ spark3/src/main/java/org/apache/iceberg/spark/Spark3Util.java | 2 +- spark3/src/main/java/org/apache/iceberg/spark/SparkCatalog.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 11c8841..8a64ffb 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -130,7 +130,7 @@ <message key="import.illegal" value="Must not import javafx classes because some OpenJDK builds do not include javafx."/> </module> <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package --> - <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava"/> + <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava, org.sparkproject.guava, org.glassfish.jersey.internal.guava."/> <message key="import.illegal" value="Must not import repackaged classes."/> </module> <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package --> diff --git a/build.gradle b/build.gradle index 063fbdd..1879e80 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,8 @@ subprojects { if (project.name != 'iceberg-bundled-guava') { exclude group: 'com.google.guava', module: 'guava' } + // contains a copy of Guava + exclude group: 'org.apache.spark', module: 'spark-network-common_2.12' } all { diff --git a/spark3/src/main/java/org/apache/iceberg/spark/Spark3Util.java b/spark3/src/main/java/org/apache/iceberg/spark/Spark3Util.java index a41e65f..03d39be 100644 --- a/spark3/src/main/java/org/apache/iceberg/spark/Spark3Util.java +++ b/spark3/src/main/java/org/apache/iceberg/spark/Spark3Util.java @@ -37,6 +37,7 @@ import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.relocated.com.google.common.base.Joiner; import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; import org.apache.iceberg.transforms.PartitionSpecVisitor; import org.apache.iceberg.types.Type; @@ -52,7 +53,6 @@ import org.apache.spark.sql.connector.expressions.Transform; import org.apache.spark.sql.types.IntegerType; import org.apache.spark.sql.types.LongType; import org.apache.spark.sql.util.CaseInsensitiveStringMap; -import org.sparkproject.guava.collect.ImmutableMap; public class Spark3Util { diff --git a/spark3/src/main/java/org/apache/iceberg/spark/SparkCatalog.java b/spark3/src/main/java/org/apache/iceberg/spark/SparkCatalog.java index c115b84..7100906 100644 --- a/spark3/src/main/java/org/apache/iceberg/spark/SparkCatalog.java +++ b/spark3/src/main/java/org/apache/iceberg/spark/SparkCatalog.java @@ -39,6 +39,8 @@ import org.apache.iceberg.relocated.com.google.common.base.Splitter; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.spark.source.SparkTable; import org.apache.iceberg.spark.source.StagedSparkTable; import org.apache.spark.sql.SparkSession; @@ -58,8 +60,6 @@ import org.apache.spark.sql.connector.catalog.TableChange.SetProperty; import org.apache.spark.sql.connector.expressions.Transform; import org.apache.spark.sql.types.StructType; import org.apache.spark.sql.util.CaseInsensitiveStringMap; -import org.glassfish.jersey.internal.guava.Sets; -import org.sparkproject.guava.collect.Maps; /** * A Spark TableCatalog implementation that wraps an Iceberg {@link Catalog}.
