Repository: zeppelin Updated Branches: refs/heads/branch-0.7 759f3fa6e -> 2256f31e8
ZEPPELIN-1977. spark 2.1 uses a more recent commons-lang3 ### What is this PR for? The issue is that spark 2.1 use `commons-lang3` 3.5 while `zeppelin-interpreter` use 3.4. We can not just upgrade `commons-lang3` to 3.5, as it just make spark 2.1 work, but would fail other versions of spark. This PR remove `commons-lang3` from zeppelin-interpreter. We should keep zeppelin-interpreter's dependencies as minimum as possible. We can remove other dependencies (like `commons-lang`) from `zeppelin-interpreter` in a followup PR. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1977 ### How should this be tested? Tested manually  on 3 versions of spark (2.1, 2.0.2, 1.6.2) ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <[email protected]> Closes #1910 from zjffdu/ZEPPELIN-1977 and squashes the following commits: 8bac97f [Jeff Zhang] ZEPPELIN-1977. spark 2.1 uses a more recent commons-lang3 (cherry picked from commit 88a905caf2043d12a85462940c451b424d218dba) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2256f31e Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2256f31e Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2256f31e Branch: refs/heads/branch-0.7 Commit: 2256f31e81de13ebf43475c897eac548f638083b Parents: 759f3fa Author: Jeff Zhang <[email protected]> Authored: Wed Jan 18 15:10:07 2017 +0800 Committer: Lee moon soo <[email protected]> Committed: Thu Jan 19 19:52:54 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/zeppelin/livy/BaseLivyInterprereter.java | 2 +- .../org/apache/zeppelin/livy/LivySparkSQLInterpreter.java | 2 +- markdown/pom.xml | 7 +++++++ .../main/java/org/apache/zeppelin/pig/BasePigInterpreter.java | 2 +- pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java | 4 ++-- .../java/org/apache/zeppelin/pig/PigQueryInterpreter.java | 6 +++--- pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java | 4 ++-- shell/pom.xml | 7 +++++++ zeppelin-interpreter/pom.xml | 7 ------- .../src/main/java/org/apache/zeppelin/dep/Booter.java | 2 +- .../src/main/java/org/apache/zeppelin/dep/Repository.java | 2 +- zeppelin-server/pom.xml | 4 ++++ zeppelin-zengine/pom.xml | 7 +++++++ 13 files changed, 37 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java ---------------------------------------------------------------------- diff --git a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java index f0591fd..56b068d 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java @@ -20,7 +20,7 @@ package org.apache.zeppelin.livy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.zeppelin.interpreter.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java ---------------------------------------------------------------------- diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java index 471d199..3d1a606 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java @@ -17,7 +17,7 @@ package org.apache.zeppelin.livy; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.scheduler.Scheduler; import org.apache.zeppelin.scheduler.SchedulerFactory; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/markdown/pom.xml ---------------------------------------------------------------------- diff --git a/markdown/pom.xml b/markdown/pom.xml index 73629d7..179d0bd 100644 --- a/markdown/pom.xml +++ b/markdown/pom.xml @@ -33,6 +33,7 @@ <name>Zeppelin: Markdown interpreter</name> <properties> + <commons.lang3.version>3.4</commons.lang3.version> <markdown4j.version>2.2-cj-1.0</markdown4j.version> <pegdown.version>1.6.0</pegdown.version> </properties> @@ -68,6 +69,12 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons.lang3.version}</version> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java index a9bb2ce..1fb2a69 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java @@ -17,7 +17,7 @@ package org.apache.zeppelin.pig; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.pig.PigServer; import org.apache.pig.backend.BackendException; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java index 0b50c67..973397c 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java @@ -18,8 +18,8 @@ package org.apache.zeppelin.pig; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.pig.PigServer; import org.apache.pig.impl.logicalLayer.FrontendException; import org.apache.pig.tools.pigstats.*; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java index 5e968d6..566b536 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java @@ -19,8 +19,8 @@ package org.apache.zeppelin.pig; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.pig.PigServer; import org.apache.pig.data.Tuple; import org.apache.pig.impl.logicalLayer.FrontendException; @@ -114,7 +114,7 @@ public class PigQueryInterpreter extends BasePigInterpreter { resultBuilder.append("\n"); firstRow = false; } - resultBuilder.append(StringUtils.join(tuple, "\t")); + resultBuilder.append(StringUtils.join(tuple.iterator(), "\t")); resultBuilder.append("\n"); } if (index >= maxResult && iter.hasNext()) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java b/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java index 3398281..43687a5 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java @@ -19,8 +19,8 @@ package org.apache.zeppelin.pig; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.pig.PigRunner; import org.apache.pig.backend.hadoop.executionengine.tez.TezExecType; import org.apache.pig.tools.pigstats.InputStats; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index 79cfd92..418cf5c 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -34,6 +34,7 @@ <properties> <!--library versions --> + <commons.lang3.version>3.4</commons.lang3.version> <commons.exec.version>1.3</commons.exec.version> </properties> @@ -62,6 +63,12 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons.lang3.version}</version> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/zeppelin-interpreter/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index 9fbf7a1..34cf182 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -37,7 +37,6 @@ <properties> <!--library versions--> - <commons.lang3.version>3.4</commons.lang3.version> <commons.pool2.version>2.3</commons.pool2.version> <commons.exec.version>1.3</commons.exec.version> <maven.plugin.api.version>3.0</maven.plugin.api.version> @@ -88,12 +87,6 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> - </dependency> - <!-- Aether :: maven dependency resolution --> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Booter.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Booter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Booter.java index f96963b..0fd0ea2 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Booter.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Booter.java @@ -17,7 +17,7 @@ package org.apache.zeppelin.dep; -import org.apache.commons.lang3.Validate; +import org.apache.commons.lang.Validate; import org.apache.maven.repository.internal.MavenRepositorySystemSession; import org.sonatype.aether.RepositorySystem; import org.sonatype.aether.RepositorySystemSession; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java index 34fe4f0..86f39bd 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java @@ -16,7 +16,7 @@ */ package org.apache.zeppelin.dep; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang.StringUtils.isNotBlank; import org.sonatype.aether.repository.Authentication; import org.sonatype.aether.repository.Proxy; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 6503e66..bacbca3 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -380,6 +380,10 @@ <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2256f31e/zeppelin-zengine/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index d620512..87d2f13 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -36,6 +36,7 @@ <properties> <!--library versions--> + <commons.lang3.version>3.4</commons.lang3.version> <commons.vfs2.version>2.0</commons.vfs2.version> <aws.sdk.s3.version>1.10.62</aws.sdk.s3.version> <azure.storage.version>4.0.0</azure.storage.version> @@ -277,6 +278,12 @@ <version>${jetty.version}</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons.lang3.version}</version> + </dependency> </dependencies> <build>
