diff --git a/angular/pom.xml b/angular/pom.xml index df4e83c0356..021139db599 100644 --- a/angular/pom.xml +++ b/angular/pom.xml @@ -53,6 +53,23 @@ slf4j-log4j12 + + commons-logging + commons-logging + + + + org.apache.commons + commons-lang3 + 3.4 + + + + commons-io + commons-io + 2.4 + + junit junit diff --git a/bin/interpreter.sh b/bin/interpreter.sh index a69a4e994fd..4606ed34231 100755 --- a/bin/interpreter.sh +++ b/bin/interpreter.sh @@ -79,6 +79,9 @@ fi # add test classes for unittest if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" ]]; then ZEPPELIN_INTP_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" + if [[ -n "${ZEPPELIN_ZENGINE_TEST}" ]]; then + addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" + fi fi addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-api/target" diff --git a/markdown/pom.xml b/markdown/pom.xml index d5fe9a3cc78..55535a699cd 100644 --- a/markdown/pom.xml +++ b/markdown/pom.xml @@ -80,6 +80,11 @@ 2.4 + + commons-logging + commons-logging + + junit junit diff --git a/python/pom.xml b/python/pom.xml index 5c7059d78ee..8fed0c911b8 100644 --- a/python/pom.xml +++ b/python/pom.xml @@ -35,17 +35,11 @@ python 0.10.7 - 1.4.0 + 1.15.0 python-interpreter-with-py4j - - ${project.groupId} - zeppelin-interpreter - ${project.version} - - org.apache.commons commons-exec @@ -68,6 +62,26 @@ slf4j-log4j12 + + commons-logging + commons-logging + + + + commons-lang + commons-lang + + + + commons-io + commons-io + + + + commons-codec + commons-codec + + io.grpc grpc-netty diff --git a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java index 4b6bfdb7bb2..28e6270598f 100644 --- a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java +++ b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java @@ -214,7 +214,7 @@ public void testGrpcFrameSize() throws InterpreterException, IOException { List interpreterResultMessages = context.out.toInterpreterResultMessage(); assertEquals(1, interpreterResultMessages.size()); - assertTrue(interpreterResultMessages.get(0).getData().contains("exceeds maximum: 3000")); + assertTrue(interpreterResultMessages.get(0).getData().contains("exceeds maximum size 3000")); // next call continue work result = interpreter.interpret("print(1)", context); diff --git a/python/src/test/resources/log4j.properties b/python/src/test/resources/log4j.properties index 8993ff2854d..2933a6408b8 100644 --- a/python/src/test/resources/log4j.properties +++ b/python/src/test/resources/log4j.properties @@ -24,4 +24,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n -log4j.logger.org.apache.zeppelin.python=DEBUG +log4j.logger.org.apache.zeppelin.python=INFO diff --git a/shell/pom.xml b/shell/pom.xml index c702b9f6d31..98b8a830dc5 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -58,6 +58,11 @@ slf4j-log4j12 + + commons-logging + commons-logging + + org.apache.commons commons-exec diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml index a7dbce6d436..daf801fcdd2 100644 --- a/spark/interpreter/pom.xml +++ b/spark/interpreter/pom.xml @@ -292,6 +292,11 @@ ${commons.exec.version} + + commons-logging + commons-logging + + org.scala-lang scala-library diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml index 94ed3a29ecc..25463b3f1bd 100644 --- a/zeppelin-integration/pom.xml +++ b/zeppelin-integration/pom.xml @@ -44,7 +44,7 @@ 3.8.1 - 3.4 + 3.7 2.16 diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml index efd3186255d..032fcb56e49 100644 --- a/zeppelin-interpreter-parent/pom.xml +++ b/zeppelin-interpreter-parent/pom.xml @@ -128,13 +128,13 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - true - - + + + + + + + diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index efc11b4f85a..22a029e8bf2 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -45,10 +45,9 @@ 1.0 2.12.1 3.0.0-rc4 - 4.1.11.Final 3.1.1 20.0 - 3.4 + 3.7 2.3 @@ -60,34 +59,6 @@ atomix ${atomix.version} - - io.netty - netty-transport - - - io.netty - netty-codec - - - io.netty - netty-handler - - - io.netty - netty-common - - - io.netty - netty-buffer - - - io.netty - netty-transport-native-epoll - - - io.netty - netty-transport-native-unix-common - org.apache.commons commons-math3 @@ -115,49 +86,6 @@ ${atomix.version} - - io.netty - netty-transport - ${atomix.netty.version} - - - - io.netty - netty-codec - ${atomix.netty.version} - - - - io.netty - netty-handler - ${atomix.netty.version} - - - - io.netty - netty-common - ${atomix.netty.version} - - - - io.netty - netty-buffer - ${atomix.netty.version} - - - - io.netty - netty-transport-native-epoll - linux-x86_64 - ${atomix.netty.version} - - - - io.netty - netty-transport-native-unix-common - ${atomix.netty.version} - - org.apache.commons commons-math3 diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index 9f0e13bd4d5..8e67dc1ee25 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -37,7 +37,7 @@ 2.7.3 - 3.4 + 3.7 1.5.2 2.2.1 5.3.1 @@ -127,12 +127,6 @@ gson - - com.google.guava - guava - 20.0 - - org.apache.lucene lucene-core @@ -258,6 +252,9 @@ ${project.build.directory}/tmp + + 1 + @@ -357,87 +354,103 @@ com.google.guava guava - - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - tests - test - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-client - - - com.sun.jersey - jersey-server - - - javax.servlet - servlet-api - - - org.apache.avro - avro - - - org.apache.jackrabbit - jackrabbit-webdav - - - io.netty - netty - - commons-httpclient - commons-httpclient - - - org.eclipse.jgit - org.eclipse.jgit - - - com.jcraft - jsch + com.google.code.findbugs + jsr305 org.apache.commons - commons-compress - - - xml-apis - xml-apis - - - xerces - xercesImpl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - com.google.guava - guava + commons-math3 + + org.apache.hadoop + hadoop-common + ${hadoop.version} + tests + test + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-server + + + javax.servlet + servlet-api + + + org.apache.avro + avro + + + org.apache.jackrabbit + jackrabbit-webdav + + + io.netty + netty + + + commons-httpclient + commons-httpclient + + + org.eclipse.jgit + org.eclipse.jgit + + + com.jcraft + jsch + + + org.apache.commons + commons-compress + + + xml-apis + xml-apis + + + xerces + xercesImpl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + com.google.guava + guava + + + com.google.code.findbugs + jsr305 + + + org.apache.commons + commons-math3 + + + + org.apache.hadoop hadoop-hdfs @@ -588,29 +601,10 @@ ${project.version} test + - com.google.protobuf - protobuf-java - - - com.google.protobuf - protobuf-java-util - - - com.google.guava - guava - - - com.google.errorprone - error_prone_annotations - - - io.grpc - grpc-context - - - com.google.api.grpc - proto-google-common-protos + org.apache.zeppelin + zeppelin-python diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java index ee9f15cb787..d9000318dd7 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterResourcePool.java @@ -25,6 +25,8 @@ import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; import org.apache.zeppelin.resource.Resource; import org.apache.zeppelin.resource.ResourcePool; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Properties; @@ -32,6 +34,8 @@ public class MockInterpreterResourcePool extends Interpreter { + private static final Logger LOGGER = LoggerFactory.getLogger(MockInterpreterResourcePool.class); + AtomicInteger numWatch = new AtomicInteger(0); public MockInterpreterResourcePool(Properties property) { @@ -86,11 +90,14 @@ public InterpreterResult interpret(String st, InterpreterContext context) { ret = resourcePool.getAll(); } else if (cmd.equals("invoke")) { Resource resource = resourcePool.get(noteId, paragraphId, name); + LOGGER.info("Resource: " + resource); if (stmt.length >=4) { Resource res = resource.invokeMethod(value, null, null, stmt[3]); + LOGGER.info("After invokeMethod: " + resource); ret = res.get(); } else { ret = resource.invokeMethod(value, null, null); + LOGGER.info("After invokeMethod: " + ret); } } @@ -119,7 +126,7 @@ public int getProgress(InterpreterContext context) { @Override public List completion(String buf, int cursor, - InterpreterContext interpreterContext) { + InterpreterContext interpreterContext) { return null; } } diff --git a/zeppelin-zengine/src/test/resources/commons-logging-1.1.1.jar b/zeppelin-zengine/src/test/resources/commons-logging-1.1.1.jar new file mode 100644 index 00000000000..1deef144cb1 Binary files /dev/null and b/zeppelin-zengine/src/test/resources/commons-logging-1.1.1.jar differ diff --git a/zeppelin-zengine/src/test/resources/gson-2.2.jar b/zeppelin-zengine/src/test/resources/gson-2.2.jar new file mode 100644 index 00000000000..e0576b4b5cb Binary files /dev/null and b/zeppelin-zengine/src/test/resources/gson-2.2.jar differ diff --git a/zeppelin-zengine/src/test/resources/log4j-1.2.17.jar b/zeppelin-zengine/src/test/resources/log4j-1.2.17.jar new file mode 100644 index 00000000000..1d425cf7d7e Binary files /dev/null and b/zeppelin-zengine/src/test/resources/log4j-1.2.17.jar differ diff --git a/zeppelin-zengine/src/test/resources/log4j.properties b/zeppelin-zengine/src/test/resources/log4j.properties index 843d41593e5..fd9771cb474 100644 --- a/zeppelin-zengine/src/test/resources/log4j.properties +++ b/zeppelin-zengine/src/test/resources/log4j.properties @@ -47,4 +47,4 @@ log4j.logger.org.apache.zeppelin.plugin=DEBUG log4j.logger.org.apache.zeppelin.spark=DEBUG log4j.logger.org.apache.zeppelin.python=DEBUG -log4j.logger.org.quartz.core=DEBUG +log4j.logger.org.apache.zeppelin.interpreter=DEBUG diff --git a/zeppelin-zengine/src/test/resources/slf4j-api-1.7.10.jar b/zeppelin-zengine/src/test/resources/slf4j-api-1.7.10.jar new file mode 100644 index 00000000000..744e9ec5b0d Binary files /dev/null and b/zeppelin-zengine/src/test/resources/slf4j-api-1.7.10.jar differ diff --git a/zeppelin-zengine/src/test/resources/slf4j-log4j12-1.7.10.jar b/zeppelin-zengine/src/test/resources/slf4j-log4j12-1.7.10.jar new file mode 100644 index 00000000000..957b2b158a8 Binary files /dev/null and b/zeppelin-zengine/src/test/resources/slf4j-log4j12-1.7.10.jar differ