This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new ebb03865f2 [ZEPPELIN-5980] Merge zeppelin-display into
spark-interperter (#4692)
ebb03865f2 is described below
commit ebb03865f28a32a8b28dea0f494c5081b7803e40
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Nov 20 16:14:08 2023 +0800
[ZEPPELIN-5980] Merge zeppelin-display into spark-interperter (#4692)
* [ZEPPELIN-5980] Merge zeppelin-display into spark-interperter
* scalatest 3.0.9 to support scala 2.13
* nit
* scalatest 3.2.15
* scalatest 3.2.0-SNAP10
* scalatest 3.2.15
* fix scala 2.13 compile
---
cassandra/pom.xml | 6 +-
.../zeppelin/cassandra/BoundValuesParserTest.scala | 8 +-
.../zeppelin/cassandra/CqlFormatterTest.scala | 8 +-
.../zeppelin/cassandra/EnhancedSessionTest.scala | 4 +-
.../zeppelin/cassandra/ParagraphParserTest.scala | 15 +-
pom.xml | 5 +-
spark/interpreter/pom.xml | 119 +++++++++++----
.../display/angular/AbstractAngularElem.scala | 0
.../display/angular/AbstractAngularModel.scala | 0
.../angular/notebookscope/AngularElem.scala | 4 +-
.../angular/notebookscope/AngularModel.scala | 0
.../angular/paragraphscope/AngularElem.scala | 4 +-
.../angular/paragraphscope/AngularModel.scala | 0
.../display/angular/AbstractAngularElemTest.scala | 10 +-
.../display/angular/AbstractAngularModelTest.scala | 11 +-
.../angular/notebookscope/AngularElemTest.scala | 0
.../angular/notebookscope/AngularModelTest.scala | 0
.../angular/paragraphscope/AngularElemTest.scala | 0
.../angular/paragraphscope/AngularModelTest.scala | 0
zeppelin-display/pom.xml | 170 ---------------------
20 files changed, 128 insertions(+), 236 deletions(-)
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 661796795d..7166d749ed 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -39,12 +39,10 @@
<!-- test library versions -->
<jna.version>5.12.1</jna.version>
<cassandra.unit.version>4.3.1.0</cassandra.unit.version>
- <scalecheck.version>1.17.0</scalecheck.version>
<scala.version>${scala.2.12.version}</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.parser.combinators>1.1.2</scala.parser.combinators>
- <cassandra.scalatest.version>3.2.0-SNAP10</cassandra.scalatest.version>
<interpreter.name>cassandra</interpreter.name>
</properties>
@@ -127,14 +125,14 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
- <version>${cassandra.scalatest.version}</version>
+ <version>${scalatest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.binary.version}</artifactId>
- <version>${scalecheck.version}</version>
+ <version>${scalacheck.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/BoundValuesParserTest.scala
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/BoundValuesParserTest.scala
index de14c880d5..b8ed391c7c 100644
---
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/BoundValuesParserTest.scala
+++
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/BoundValuesParserTest.scala
@@ -16,11 +16,11 @@
*/
package org.apache.zeppelin.cassandra
-import org.scalatest.{Matchers, BeforeAndAfterEach, FlatSpec}
+import org.scalatest.BeforeAndAfterEach
+import org.scalatest.flatspec._
+import org.scalatest.matchers.should.Matchers._
-class BoundValuesParserTest extends FlatSpec
-with BeforeAndAfterEach
-with Matchers {
+class BoundValuesParserTest extends AnyFlatSpec with BeforeAndAfterEach {
val parser = new BoundValuesParser
diff --git
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/CqlFormatterTest.scala
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/CqlFormatterTest.scala
index bf86227929..3b0ae8f465 100644
---
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/CqlFormatterTest.scala
+++
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/CqlFormatterTest.scala
@@ -23,13 +23,13 @@ import java.util.Properties
import com.datastax.oss.driver.api.core.`type`.DataTypes
import com.datastax.oss.driver.api.core.`type`.codec.registry.CodecRegistry
-import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
+import org.scalatest.BeforeAndAfterEach
+import org.scalatest.flatspec._
+import org.scalatest.matchers.should.Matchers._
import scala.collection.JavaConverters._
-class CqlFormatterTest extends FlatSpec
- with BeforeAndAfterEach
- with Matchers {
+class CqlFormatterTest extends AnyFlatSpec with BeforeAndAfterEach {
val longVal: java.lang.Long = java.lang.Long.valueOf(12345678901L)
val floatVal: java.lang.Float = java.lang.Float.valueOf(123.456789f)
diff --git
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/EnhancedSessionTest.scala
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/EnhancedSessionTest.scala
index 006fc144b2..2dcfe7e4e3 100644
---
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/EnhancedSessionTest.scala
+++
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/EnhancedSessionTest.scala
@@ -18,9 +18,9 @@
package org.apache.zeppelin.cassandra
import com.datastax.oss.driver.api.core.cql.{BatchStatement, BatchType,
SimpleStatement}
-import org.scalatest.FlatSpec
+import org.scalatest.flatspec._
-class EnhancedSessionTest extends FlatSpec {
+class EnhancedSessionTest extends AnyFlatSpec {
"Query" should "be detected as DDL for create" in {
assertResult(true){
diff --git
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala
index f5cb574f44..794547f80f 100644
---
a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala
+++
b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala
@@ -19,19 +19,16 @@ package org.apache.zeppelin.cassandra
import com.datastax.oss.driver.api.core.{ConsistencyLevel, CqlSession}
import com.datastax.oss.driver.api.core.cql.{BatchType, PreparedStatement}
import org.apache.zeppelin.interpreter.InterpreterException
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
+import org.mockito.Mockito
+import org.scalatest.BeforeAndAfterEach
+import org.scalatest.flatspec._
+import org.scalatest.matchers.should.Matchers._
import org.apache.zeppelin.cassandra.ParagraphParser._
import org.apache.zeppelin.cassandra.TextBlockHierarchy._
-import scala.Option
+class ParagraphParserTest extends AnyFlatSpec with BeforeAndAfterEach {
-class ParagraphParserTest extends FlatSpec
- with BeforeAndAfterEach
- with Matchers
- with MockitoSugar {
-
- val session: CqlSession = mock[CqlSession]
+ val session: CqlSession = Mockito.mock[CqlSession](classOf[CqlSession])
val preparedStatements:collection.mutable.Map[String,PreparedStatement] =
collection.mutable.Map()
val parser: ParagraphParser = new ParagraphParser()
diff --git a/pom.xml b/pom.xml
index 78bf511664..d3463a4c35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,6 @@
<module>zeppelin-interpreter</module>
<module>zeppelin-interpreter-shaded</module>
<module>zeppelin-zengine</module>
- <module>zeppelin-display</module>
<module>rlang</module>
<module>zeppelin-jupyter-interpreter</module>
<module>zeppelin-jupyter-interpreter-shaded</module>
@@ -106,8 +105,8 @@
<scala.binary.version>2.11</scala.binary.version>
<scala.2.11.version>2.11.12</scala.2.11.version>
<scala.2.12.version>2.12.17</scala.2.12.version>
- <scalatest.version>3.0.7</scalatest.version>
- <scalacheck.version>1.12.5</scalacheck.version>
+ <scalatest.version>3.2.15</scalatest.version>
+ <scalacheck.version>1.17.0</scalacheck.version>
<!-- frontend maven plugin related versions-->
<node.version>v12.3.1</node.version>
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index 32a8eee144..7ce325716b 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -66,19 +66,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-display</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <!-- use scala-xml from spark -->
- <exclusion>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-xml_${scala.binary.version}</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>spark3-shims</artifactId>
@@ -217,7 +204,7 @@
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
@@ -312,6 +299,19 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_${spark.scala.binary.version}</artifactId>
+ <version>${scalatest.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scalacheck</groupId>
+ <artifactId>scalacheck_${spark.scala.binary.version}</artifactId>
+ <version>${scalacheck.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -484,7 +484,86 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <argLine>-Xmx2048m</argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>eclipse-add-source</id>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scala-compile-first</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scala-test-compile-first</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <scalaVersion>${spark.scala.version}</scalaVersion>
+ <args>
+ <arg>-unchecked</arg>
+ <arg>-deprecation</arg>
+ <arg>-feature</arg>
+ <arg>-nobootcp</arg>
+ </args>
+ <jvmArgs>
+ <jvmArg>-Xms1024m</jvmArg>
+ <jvmArg>-Xmx1024m</jvmArg>
+ <jvmArg>-XX:MaxMetaspaceSize=${MaxMetaspace}</jvmArg>
+ </jvmArgs>
+ <javacArgs>
+ <javacArg>-source</javacArg>
+ <javacArg>${java.version}</javacArg>
+ <javacArg>-target</javacArg>
+ <javacArg>${java.version}</javacArg>
+ <javacArg>-Xlint:all,-serial,-path,-options</javacArg>
+ </javacArgs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+
+
<outputDirectory>target/scala-${spark.scala.binary.version}/classes</outputDirectory>
+
<testOutputDirectory>target/scala-${spark.scala.binary.version}/test-classes</testOutputDirectory>
</build>
<profiles>
@@ -514,9 +593,6 @@
<profile>
<id>spark-3.5</id>
<properties>
- <datanucleus.core.version>4.1.17</datanucleus.core.version>
- <datanucleus.rdbms.version>4.1.19</datanucleus.rdbms.version>
- <datanucleus.apijdo.version>4.2.4</datanucleus.apijdo.version>
<spark.version>3.5.0</spark.version>
<protobuf.version>3.21.12</protobuf.version>
<py4j.version>0.10.9.7</py4j.version>
@@ -529,9 +605,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <datanucleus.core.version>4.1.17</datanucleus.core.version>
- <datanucleus.rdbms.version>4.1.19</datanucleus.rdbms.version>
- <datanucleus.apijdo.version>4.2.4</datanucleus.apijdo.version>
<spark.version>3.4.1</spark.version>
<protobuf.version>3.21.12</protobuf.version>
<py4j.version>0.10.9.7</py4j.version>
@@ -541,9 +614,6 @@
<profile>
<id>spark-3.3</id>
<properties>
- <datanucleus.core.version>4.1.17</datanucleus.core.version>
- <datanucleus.rdbms.version>4.1.19</datanucleus.rdbms.version>
- <datanucleus.apijdo.version>4.2.4</datanucleus.apijdo.version>
<spark.version>3.3.3</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<py4j.version>0.10.9.5</py4j.version>
@@ -553,9 +623,6 @@
<profile>
<id>spark-3.2</id>
<properties>
- <datanucleus.core.version>4.1.17</datanucleus.core.version>
- <datanucleus.rdbms.version>4.1.19</datanucleus.rdbms.version>
- <datanucleus.apijdo.version>4.2.4</datanucleus.apijdo.version>
<spark.version>3.2.4</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<py4j.version>0.10.9.5</py4j.version>
diff --git
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularElem.scala
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularElem.scala
similarity index 100%
rename from
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularElem.scala
rename to
spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularElem.scala
diff --git
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularModel.scala
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularModel.scala
similarity index 100%
rename from
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularModel.scala
rename to
spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularModel.scala
diff --git
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
similarity index 95%
rename from
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
rename to
spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
index 53dac43fcd..8fd3164720 100644
---
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
+++
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
@@ -21,7 +21,7 @@ import org.apache.zeppelin.display.angular.AbstractAngularElem
import org.apache.zeppelin.display.{angular, AngularObject}
import org.apache.zeppelin.interpreter.InterpreterContext
-import scala.collection.JavaConversions
+import scala.collection.JavaConverters._
import scala.xml._
/**
@@ -77,7 +77,7 @@ object AngularElem {
val ic = InterpreterContext.get
val registry = ic.getAngularObjectRegistry
- JavaConversions.asScalaBuffer(registry.getAll(ic.getNoteId,
null)).foreach(ao =>
+ registry.getAll(ic.getNoteId, null).asScala.foreach(ao =>
registry.remove(ao.getName, ao.getNoteId, null)
)
}
diff --git
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModel.scala
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModel.scala
similarity index 100%
rename from
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModel.scala
rename to
spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModel.scala
diff --git
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
similarity index 95%
rename from
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
rename to
spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
index bc0501755f..e424202a5c 100644
---
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
+++
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
@@ -22,7 +22,7 @@ import org.apache.zeppelin.display.angular.AbstractAngularElem
import org.apache.zeppelin.display.{angular, AngularObject}
import org.apache.zeppelin.interpreter.InterpreterContext
-import scala.collection.JavaConversions
+import scala.collection.JavaConverters._
import scala.xml._
/**
@@ -79,7 +79,7 @@ object AngularElem {
val ic = InterpreterContext.get
val registry = ic.getAngularObjectRegistry
- JavaConversions.asScalaBuffer(registry.getAll(ic.getNoteId,
ic.getParagraphId)).foreach(ao =>
+ registry.getAll(ic.getNoteId, ic.getParagraphId).asScala.foreach(ao =>
registry.remove(ao.getName, ao.getNoteId, ao.getParagraphId)
)
}
diff --git
a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModel.scala
b/spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModel.scala
similarity index 100%
rename from
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModel.scala
rename to
spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModel.scala
diff --git
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
similarity index 94%
rename from
zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
rename to
spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
index d1b2aea524..5b61729039 100644
---
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
+++
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
@@ -17,20 +17,20 @@
package org.apache.zeppelin.display.angular
import java.io.{ByteArrayOutputStream, PrintStream}
-import java.util
-import org.apache.zeppelin.display.{AngularObject, AngularObjectRegistry, GUI}
+import org.apache.zeppelin.display.{AngularObject, AngularObjectRegistry}
import org.apache.zeppelin.interpreter._
-import org.apache.zeppelin.user.AuthenticationInfo
+import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach}
import org.scalatest.concurrent.Eventually
+import org.scalatest.flatspec._
+import org.scalatest.matchers.should.Matchers._
import org.scalatest.time.{Seconds, Span}
-import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers}
/**
* Test
*/
trait AbstractAngularElemTest
- extends FlatSpec with BeforeAndAfter with BeforeAndAfterEach with Eventually
with Matchers {
+ extends AnyFlatSpec with BeforeAndAfter with BeforeAndAfterEach with
Eventually {
override def beforeEach() {
val intpGroup = new InterpreterGroup()
diff --git
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
similarity index 89%
rename from
zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
rename to
spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
index 4f3193c7f6..6573d46312 100644
---
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
+++
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
@@ -16,17 +16,18 @@
*/
package org.apache.zeppelin.display.angular
-import org.apache.zeppelin.display.{AngularObjectRegistry, GUI}
+import org.apache.zeppelin.display.AngularObjectRegistry
import org.apache.zeppelin.interpreter._
-import org.apache.zeppelin.user.AuthenticationInfo
+import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach}
import org.scalatest.concurrent.Eventually
-import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers}
+import org.scalatest.flatspec._
+import org.scalatest.matchers.should.Matchers._
/**
* Abstract Test for AngularModel
*/
-trait AbstractAngularModelTest extends FlatSpec
-with BeforeAndAfter with BeforeAndAfterEach with Eventually with Matchers {
+trait AbstractAngularModelTest extends AnyFlatSpec
+with BeforeAndAfter with BeforeAndAfterEach with Eventually {
override def beforeEach() {
val intpGroup = new InterpreterGroup()
val context = InterpreterContext.builder
diff --git
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElemTest.scala
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElemTest.scala
similarity index 100%
rename from
zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElemTest.scala
rename to
spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElemTest.scala
diff --git
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModelTest.scala
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModelTest.scala
similarity index 100%
rename from
zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModelTest.scala
rename to
spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModelTest.scala
diff --git
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElemTest.scala
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElemTest.scala
similarity index 100%
rename from
zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElemTest.scala
rename to
spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElemTest.scala
diff --git
a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModelTest.scala
b/spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModelTest.scala
similarity index 100%
rename from
zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModelTest.scala
rename to
spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModelTest.scala
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
deleted file mode 100644
index 20a36e7fdd..0000000000
--- a/zeppelin-display/pom.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>zeppelin</artifactId>
- <groupId>org.apache.zeppelin</groupId>
- <version>0.11.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>zeppelin-display</artifactId>
- <packaging>jar</packaging>
- <name>Zeppelin: Display system apis</name>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scalap</artifactId>
- <version>${scala.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>zeppelin-interpreter</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-xml_${scala.binary.version}</artifactId>
- <version>1.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest_${scala.binary.version}</artifactId>
- <version>${scalatest.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <argLine>-Xmx2048m</argLine>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>eclipse-add-source</id>
- <goals>
- <goal>add-source</goal>
- </goals>
- </execution>
- <execution>
- <id>scala-compile-first</id>
- <phase>process-resources</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>scala-test-compile-first</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <args>
- <arg>-unchecked</arg>
- <arg>-deprecation</arg>
- <arg>-feature</arg>
- <arg>-language:implicitConversions</arg>
- <arg>-nobootcp</arg>
- </args>
- <jvmArgs>
- <jvmArg>-Xms1024m</jvmArg>
- <jvmArg>-Xmx1024m</jvmArg>
- <jvmArg>-XX:MaxMetaspaceSize=${MaxMetaspace}</jvmArg>
- </jvmArgs>
- <javacArgs>
- <javacArg>-source</javacArg>
- <javacArg>${java.version}</javacArg>
- <javacArg>-target</javacArg>
- <javacArg>${java.version}</javacArg>
- <javacArg>-Xlint:all,-serial,-path,-options</javacArg>
- </javacArgs>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>test</id>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
