Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZEPPELIN-1977. spark 2.1 uses a more recent commons-lang3

Browse source
This commit is contained in:
Jeff Zhang 2017-01-18 15:10:07 +08:00
parent 8daf325639
commit 8bac97fcb5
13 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java
View file

@ -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;

2
livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
View file

@ -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;

7
markdown/pom.xml
View file

@ -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>
@ -67,6 +68,12 @@
<version>${pegdown.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

2
pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java
View file

@ -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;

4
pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java
View file

@ -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.*;

6
pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java
View file

@ -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()) {

4
pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java
View file

@ -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;

7
shell/pom.xml
View file

@ -34,6 +34,7 @@
<properties>
<!--library versions -->
<commons.lang3.version>3.4</commons.lang3.version>
<commons.exec.version>1.3</commons.exec.version>
</properties>
@ -61,6 +62,12 @@
<version>${commons.exec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

7
zeppelin-interpreter/pom.xml
View file

@ -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>

2
zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Booter.java
View file

@ -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;

2
zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Repository.java
View file

@ -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;

4
zeppelin-server/pom.xml
View file

@ -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>

7
zeppelin-zengine/pom.xml
View file

@ -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>