Skip to content

Exclude Guava from the compile classpath #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdblue merged 2 commits into from
May 29, 2020
Merged

Exclude Guava from the compile classpath #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24371ba
Exclude Guava from the compile classpath.
rdblue May 29, 2020
47b40d0
Allow Guava in iceberg-spark compile classpath.
rdblue May 29, 2020
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
9 changes: 9 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ subprojects {

configurations {
testCompile.extendsFrom compileOnly

compileClasspath {
Copy link
Contributor

@massdosage massdosage Jun 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is better than enforcing the exclusion via Checkstyle as this will now be evident at compile time rather than when building the project. Nice.

// do not exclude Guava so the bundle project can reference classes.
Copy link
Contributor

@rdsr rdsr May 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: slight rewording? . Exclude guava from iceberg modules except ... ?

Copy link
Contributor

@massdosage massdosage Jun 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

// 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'
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/BaseFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -33,6 +30,9 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/GenericDataFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/GenericDeleteFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down