You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2019/05/22 04:44:47 UTC
[zeppelin] branch master updated: ZEPPELIN-4153. Move
zeppelin-interpreter-api jar out of interpreter jar
This is an automated email from the ASF dual-hosted git repository.
zjffdu 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 ecb59de ZEPPELIN-4153. Move zeppelin-interpreter-api jar out of interpreter jar
ecb59de is described below
commit ecb59de25b6722e2dd7d2905365fe773b6e33434
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Tue May 14 23:10:18 2019 +0800
ZEPPELIN-4153. Move zeppelin-interpreter-api jar out of interpreter jar
### What is this PR for?
This PR is to move zeppelin-interpreter-api jar out of interpreter jar, and put it under folder ${ZEPPELIN_HOME}/interpreter which is shared between all interpreters.
### What type of PR is it?
[Improvement]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-4153
### How should this be tested?
* CI pass
### 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 <zj...@apache.org>
Closes #3361 from zjffdu/ZEPPELIN-4153 and squashes the following commits:
4491b0c0f [Jeff Zhang] address comment for pom file of cassandra
e12563dc2 [Jeff Zhang] [ZEPPELIN-4153]. Move zeppelin-interpreter-api jar out of interpreter jar
---
bin/interpreter.sh | 3 +-
cassandra/pom.xml | 6 ++
python/pom.xml | 5 ++
spark/interpreter/pom.xml | 120 +-----------------------------------
zeppelin-interpreter-api/pom.xml | 20 ++++++
zeppelin-interpreter-parent/pom.xml | 6 ++
6 files changed, 41 insertions(+), 119 deletions(-)
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 0bbfd0c..1ad7b1d 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -69,7 +69,8 @@ fi
. "${bin}/common.sh"
-ZEPPELIN_INTP_CLASSPATH="${CLASSPATH}"
+ZEPPELIN_INTERPRETER_API_JAR=$(find "${ZEPPELIN_HOME}/interpreter" -name 'zeppelin-interpreter-api-*.jar')
+ZEPPELIN_INTP_CLASSPATH="${CLASSPATH}:${ZEPPELIN_INTERPRETER_API_JAR}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 8e6b708..80a0658 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -59,6 +59,12 @@
<artifactId>zeppelin-interpreter</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/python/pom.xml b/python/pom.xml
index 2700cba..d2eb09d 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -190,6 +190,11 @@
<resource>reference.conf</resource>
</transformer>
</transformers>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+ </excludes>
+ </artifactSet>
<outputFile>${project.build.directory}/../../interpreter/python/${interpreter.jar.name}-${project.version}.jar</outputFile>
</configuration>
<executions>
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index d32e3bd..72f00ae 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -157,124 +157,7 @@
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- Aether :: maven dependency resolution -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.plugin.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${aether.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>${aether.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>${aether.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
- <version>${maven.aeither.provider.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-file</artifactId>
- <version>${aether.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <version>${aether.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>${wagon.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>${wagon.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-shared</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <version>${wagon.version}</version>
- <exclusions>
- </exclusions>
- </dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
@@ -497,6 +380,7 @@
<exclude>org.scala-lang:scala-reflect</exclude>
<exclude>commons-lang:commons-lang</exclude>
<exclude>org.apache.commons:commons-compress</exclude>
+ <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
</excludes>
</artifactSet>
diff --git a/zeppelin-interpreter-api/pom.xml b/zeppelin-interpreter-api/pom.xml
index 10baa92..6476c11 100644
--- a/zeppelin-interpreter-api/pom.xml
+++ b/zeppelin-interpreter-api/pom.xml
@@ -149,6 +149,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>copy-to-interpreter</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo>ANT TASK - copying files....</echo>
+ <copy todir="${project.basedir}/../interpreter" overwrite="true" flatten="true">
+ <fileset dir="${project.build.directory}" includes="zeppelin-interpreter-api-*.jar" >
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml
index 0045eec..eaf7a33 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -100,6 +100,7 @@
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
+ <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
</excludes>
</filter>
</filters>
@@ -109,6 +110,11 @@
<resource>reference.conf</resource>
</transformer>
</transformers>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.zeppelin:zeppelin-interpreter-api</exclude>
+ </excludes>
+ </artifactSet>
<outputFile>${project.basedir}/../interpreter/${interpreter.name}/${project.artifactId}-${project.version}.jar</outputFile>
</configuration>
<executions>