This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 201f8bf Exclude Guava from the compile classpath (#1079)
201f8bf is described below
commit 201f8bf0e5084daa9fcc1e8418762ecb10967036
Author: Ryan Blue <[email protected]>
AuthorDate: Fri May 29 14:51:29 2020 -0700
Exclude Guava from the compile classpath (#1079)
---
build.gradle | 9 +++++++++
core/src/main/java/org/apache/iceberg/BaseFile.java | 6 +++---
core/src/main/java/org/apache/iceberg/GenericDataFile.java | 2 +-
core/src/main/java/org/apache/iceberg/GenericDeleteFile.java | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0208727..95872a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,6 +59,15 @@ subprojects {
configurations {
testCompile.extendsFrom compileOnly
+
+ compileClasspath {
+ // do not exclude Guava so the bundle project can reference classes.
+ // the Spark module is also excluded because this breaks the Scala
compiler
+ if (project.name != 'iceberg-bundled-guava' && project.name !=
'iceberg-spark') {
+ exclude group: 'com.google.guava', module: 'guava'
+ }
+ }
+
all {
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
exclude group: 'org.mortbay.jetty'
diff --git a/core/src/main/java/org/apache/iceberg/BaseFile.java
b/core/src/main/java/org/apache/iceberg/BaseFile.java
index 7b03418..ba03afe 100644
--- a/core/src/main/java/org/apache/iceberg/BaseFile.java
+++ b/core/src/main/java/org/apache/iceberg/BaseFile.java
@@ -19,9 +19,6 @@
package org.apache.iceberg;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.Arrays;
@@ -33,6 +30,9 @@ import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.specific.SpecificData;
import org.apache.iceberg.avro.AvroSchemaUtil;
+import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.ByteBuffers;
diff --git a/core/src/main/java/org/apache/iceberg/GenericDataFile.java
b/core/src/main/java/org/apache/iceberg/GenericDataFile.java
index 4e86587..716bdf3 100644
--- a/core/src/main/java/org/apache/iceberg/GenericDataFile.java
+++ b/core/src/main/java/org/apache/iceberg/GenericDataFile.java
@@ -19,11 +19,11 @@
package org.apache.iceberg;
-import com.google.common.collect.ImmutableMap;
import java.nio.ByteBuffer;
import java.util.List;
import org.apache.avro.Schema;
import org.apache.iceberg.avro.AvroSchemaUtil;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.types.Types;
class GenericDataFile extends BaseFile<DataFile> implements DataFile {
diff --git a/core/src/main/java/org/apache/iceberg/GenericDeleteFile.java
b/core/src/main/java/org/apache/iceberg/GenericDeleteFile.java
index f4a28d0..426360f 100644
--- a/core/src/main/java/org/apache/iceberg/GenericDeleteFile.java
+++ b/core/src/main/java/org/apache/iceberg/GenericDeleteFile.java
@@ -20,10 +20,10 @@
package org.apache.iceberg;
-import com.google.common.collect.ImmutableMap;
import java.nio.ByteBuffer;
import org.apache.avro.Schema;
import org.apache.iceberg.avro.AvroSchemaUtil;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.types.Types;
class GenericDeleteFile extends BaseFile<DeleteFile> implements DeleteFile {
