This is an automated email from the ASF dual-hosted git repository.
zhouquan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 0030a1b SUBMARINE-294. Unified submarine jar package name prefix
0030a1b is described below
commit 0030a1b71ca600e64df8eea746eb259e65151a01
Author: Xun Liu <[email protected]>
AuthorDate: Tue Nov 19 19:47:01 2019 +0800
SUBMARINE-294. Unified submarine jar package name prefix
### What is this PR for?
1. Now many submarine modules, the generated jar package, is not submarine
as the prefix of the package name, it is not easy to distinguish when packaged
and released.
So you need to use submarine as a prefix for the package name.
2. Refactoring submarine-dist module
### What type of PR is it?
Refactoring
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/SUBMARINE-294
### How should this be tested?
* [](https://travis-ci.org/liuxunorg/submarine)
### Screenshots (if appropriate)
```
|____bin
| |____common.sh
| |____submarine-daemon.sh
| |____submarine-env.sh
| |____webapps
|____conf
| |____log4j.properties
| |____log4j.properties.template
| |____submarine-env.sh.template
| |____submarine-site.xml
| |____submarine-site.xml.template
|____lib
| |____interpreter
| | |____python
| | | |____submarine-python-interpreter-0.3.0-SNAPSHOT-shade.jar
| | |____spark
| | | |____scala-2.11
| | | | |____spark-scala-2.11-0.9.0-SNAPSHOT.jar
| | | |____submarine-spark-interpreter-0.3.0-SNAPSHOT-shade.jar
| |____j2objc-annotations-1.1.jar
| |____submarine-client-0.3.0-SNAPSHOT.jar
| |____submarine-commons-cluster-0.3.0-SNAPSHOT.jar
| |____submarine-commons-runtime-0.3.0-SNAPSHOT.jar
| |____submarine-commons-utils-0.3.0-SNAPSHOT.jar
| |____submarine-server-core-0.3.0-SNAPSHOT.jar
| |____submitter
| | |____submarine-submitter-k8s-0.3.0-SNAPSHOT.jar
| | |____submarine-submitter-yarn-0.3.0-SNAPSHOT.jar
| | |____tony-core-0.3.21.jar
| |____validation-api-1.1.0.Final.jar
| |____websocket-servlet-9.4.18.v20190429.jar
|____LICENSE
|____licenses
| |____LICENSE-asm.txt
| |____LICENSE-slf4j.txt
| |____LICENSE-tony.txt
|____NOTICE
|____submarine-all-0.3.0-SNAPSHOT-hadoop-2.9.jar
|____workbench-web.war
```
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Xun Liu <[email protected]>
Closes #94 from liuxunorg/SUBMARINE-294 and squashes the following commits:
2175784 [Xun Liu] SUBMARINE-294. Unified package named submarine
---
submarine-commons/commons-cluster/pom.xml | 3 +-
submarine-commons/commons-metastore/pom.xml | 1 +
submarine-commons/commons-runtime/pom.xml | 1 +
submarine-commons/commons-utils/pom.xml | 1 +
submarine-dist/src/assembly/distribution.xml | 99 +++--
.../server-submitter/submitter-k8s/pom.xml | 17 +
.../server/submitter/k8s/K8sJobRequest.java | 2 +-
.../server/submitter/k8s/K8sJobSubmitter.java | 2 +-
.../server/submitter/k8s/K8SJobSubmitterTest.java | 17 +-
.../server-submitter/submitter-yarn/pom.xml | 1 +
.../server-submitter/submitter-yarnservice/pom.xml | 1 +
submarine-test/e2e/pom.xml | 1 +
.../interpreter/interpreter-engine/pom.xml | 1 +
.../interpreter/python-interpreter/pom.xml | 3 +-
.../interpreter/spark-interpreter/pom.xml | 455 +++++++++++----------
15 files changed, 326 insertions(+), 279 deletions(-)
diff --git a/submarine-commons/commons-cluster/pom.xml
b/submarine-commons/commons-cluster/pom.xml
index 5b46ebe..d0eb4c0 100644
--- a/submarine-commons/commons-cluster/pom.xml
+++ b/submarine-commons/commons-cluster/pom.xml
@@ -132,6 +132,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -144,7 +145,7 @@
<goal>shade</goal>
</goals>
<configuration>
-
<outputFile>target/${project.artifactId}-${project.version}-shade.jar</outputFile>
+
<outputFile>target/submarine-${artifactId}-${project.version}-shade.jar</outputFile>
<filters>
<filter>
<artifact>*:*</artifact>
diff --git a/submarine-commons/commons-metastore/pom.xml
b/submarine-commons/commons-metastore/pom.xml
index ec35cc5..81935ed 100644
--- a/submarine-commons/commons-metastore/pom.xml
+++ b/submarine-commons/commons-metastore/pom.xml
@@ -204,6 +204,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/submarine-commons/commons-runtime/pom.xml
b/submarine-commons/commons-runtime/pom.xml
index 86b5923..b443ebb 100644
--- a/submarine-commons/commons-runtime/pom.xml
+++ b/submarine-commons/commons-runtime/pom.xml
@@ -194,6 +194,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/submarine-commons/commons-utils/pom.xml
b/submarine-commons/commons-utils/pom.xml
index 73396e7..7109ee2 100644
--- a/submarine-commons/commons-utils/pom.xml
+++ b/submarine-commons/commons-utils/pom.xml
@@ -73,6 +73,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/submarine-dist/src/assembly/distribution.xml
b/submarine-dist/src/assembly/distribution.xml
index d6cb21d..ebd9794 100644
--- a/submarine-dist/src/assembly/distribution.xml
+++ b/submarine-dist/src/assembly/distribution.xml
@@ -23,47 +23,11 @@
<dependencySets>
<dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.submarine:submarine-commons</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.submarine:commons-runtime</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.submarine:submarine-client</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.submarine:server-submitter</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.submarine:submitter-yarn</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>/lib/submitter</outputDirectory>
<includes>
<include>com.linkedin.tony:tony-core</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/workbench</outputDirectory>
- <includes>
- <include>${project.groupId}:workbench-web</include>
- </includes>
- </dependencySet>
</dependencySets>
<files>
@@ -106,12 +70,61 @@
</fileSet>
<fileSet>
<directory>../submarine-workbench/workbench-web/target</directory>
- <outputDirectory>/lib/workbench</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>workbench-web.war</include>
</includes>
</fileSet>
<fileSet>
+ <directory>../submarine-commons/commons-utils/target</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>submarine-commons-utils-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../submarine-commons/commons-runtime/target</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>submarine-commons-runtime-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../submarine-commons/commons-cluster/target</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>submarine-commons-cluster-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>../submarine-server/server-submitter/submitter-k8s/target</directory>
+ <outputDirectory>/lib/submitter</outputDirectory>
+ <includes>
+ <include>submarine-submitter-k8s-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>../submarine-server/server-submitter/submitter-yarn/target</directory>
+ <outputDirectory>/lib/submitter</outputDirectory>
+ <includes>
+ <include>submarine-submitter-yarn-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>../submarine-server/server-submitter/submitter-yarnservice/target</directory>
+ <outputDirectory>/lib/submitter</outputDirectory>
+ <includes>
+
<include>submarine-submitter-yarnservice-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../submarine-client/target</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>submarine-client-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../submarine-server/server-core/target</directory>
<outputDirectory>/lib</outputDirectory>
<includes>
@@ -121,12 +134,18 @@
<fileSet>
<directory>../submarine-server/server-core/target/dependency</directory>
<outputDirectory>/lib</outputDirectory>
+ <excludes>
+ <!-- exclude rename to submarine-commons-*.jar -->
+ <exclude>commons-utils-${project.version}.jar</exclude>
+ <exclude>commons-runtime-${project.version}.jar</exclude>
+ <exclude>commons-cluster-${project.version}.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>../submarine-workbench/interpreter/python-interpreter/target</directory>
<outputDirectory>/lib/interpreter/python</outputDirectory>
<includes>
- <include>python-interpreter-${project.version}-shade.jar</include>
+
<include>submarine-python-interpreter-${project.version}-shade.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -140,7 +159,7 @@
<directory>../submarine-workbench/interpreter/spark-interpreter/target</directory>
<outputDirectory>/lib/interpreter/spark</outputDirectory>
<includes>
- <include>spark-interpreter-${project.version}-shade.jar</include>
+
<include>submarine-spark-interpreter-${project.version}-shade.jar</include>
</includes>
</fileSet>
</fileSets>
diff --git a/submarine-server/server-submitter/submitter-k8s/pom.xml
b/submarine-server/server-submitter/submitter-k8s/pom.xml
index 056a36c..f98a9b6 100644
--- a/submarine-server/server-submitter/submitter-k8s/pom.xml
+++ b/submarine-server/server-submitter/submitter-k8s/pom.xml
@@ -45,4 +45,21 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobRequest.java
b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobRequest.java
index 827346d..327a082 100644
---
a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobRequest.java
+++
b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobRequest.java
@@ -22,7 +22,7 @@ package org.apache.submarine.server.submitter.k8s;
/**
* Job request for Kubernetes Submitter.
*/
-// TODO: It should implement the JobRequest interface
+// TODO(jiwq): It should implement the JobRequest interface
public class K8sJobRequest {
private Path path;
private Object body;
diff --git
a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobSubmitter.java
b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobSubmitter.java
index 18d59b6..90ec873 100644
---
a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobSubmitter.java
+++
b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sJobSubmitter.java
@@ -40,7 +40,7 @@ import java.io.IOException;
/**
* JobSubmitter for Kubernetes Cluster.
*/
-// TODO: It should implement the JobSubmitter interface
+// TODO(jiwq): It should implement the JobSubmitter interface
public class K8sJobSubmitter {
private final Logger LOG = LoggerFactory.getLogger(K8sJobSubmitter.class);
diff --git
a/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/K8SJobSubmitterTest.java
b/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/K8SJobSubmitterTest.java
index 70b9c00..27b41fa 100644
---
a/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/K8SJobSubmitterTest.java
+++
b/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/K8SJobSubmitterTest.java
@@ -38,7 +38,7 @@ public class K8SJobSubmitterTest {
public void before() throws IOException {
String confPath = this.getClass().getResource("/config").getFile();
submitter = new K8sJobSubmitter(confPath);
- path = new K8sJobRequest.Path("kubeflow.org","v1","kubeflow", "tfjobs");
+ path = new K8sJobRequest.Path("kubeflow.org", "v1", "kubeflow", "tfjobs");
}
@Test
@@ -46,11 +46,11 @@ public class K8SJobSubmitterTest {
if (getCustomJob() != null) {
K8sJobRequest request = new K8sJobRequest(path, null, jobName);
CustomResourceJob delJob = submitter.deleteCustomResourceJob(request);
-// Assert.assertNotNull(delJob);
+ // Assert.assertNotNull(delJob);
}
CustomResourceJob job = submitter.createCustomJob(new K8sJobRequest(path,
getCutomJobSpecFile()));
-// Assert.assertNotNull(job);
+ // Assert.assertNotNull(job);
System.out.println("Create job: " + job);
}
@@ -59,14 +59,15 @@ public class K8SJobSubmitterTest {
testCreateCustomJob();
CustomResourceJob job = getCustomJob();
-// Assert.assertNotNull(job);
-// Assert.assertEquals(job.getMetadata().getName(), jobName);
+ // Assert.assertNotNull(job);
+ // Assert.assertEquals(job.getMetadata().getName(), jobName);
System.out.println("Get Job: " + job);
}
@Test
public void testListCustomJobs() throws URISyntaxException {
- CustomResourceJobList list = submitter.listCustomResourceJobs(new
K8sJobRequest(path, getCutomJobSpecFile()));
+ CustomResourceJobList list
+ = submitter.listCustomResourceJobs(new K8sJobRequest(path,
getCutomJobSpecFile()));
System.out.println("Job List: " + list);
}
@@ -74,12 +75,12 @@ public class K8SJobSubmitterTest {
public void testDeleteCustomJob() throws URISyntaxException {
if (getCustomJob() == null) {
CustomResourceJob job = submitter.createCustomJob(new
K8sJobRequest(path, getCutomJobSpecFile()));
-// Assert.assertNotNull(job);
+ // Assert.assertNotNull(job);
}
K8sJobRequest request = new K8sJobRequest(path, null, jobName);
CustomResourceJob delJob = submitter.deleteCustomResourceJob(request);
-// Assert.assertNotNull(delJob);
+ // Assert.assertNotNull(delJob);
System.out.println("Delete job: " + delJob);
}
diff --git a/submarine-server/server-submitter/submitter-yarn/pom.xml
b/submarine-server/server-submitter/submitter-yarn/pom.xml
index 713574d..cb2b2ed 100644
--- a/submarine-server/server-submitter/submitter-yarn/pom.xml
+++ b/submarine-server/server-submitter/submitter-yarn/pom.xml
@@ -218,6 +218,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/submarine-server/server-submitter/submitter-yarnservice/pom.xml
b/submarine-server/server-submitter/submitter-yarnservice/pom.xml
index 77e746a..a11a08c 100644
--- a/submarine-server/server-submitter/submitter-yarnservice/pom.xml
+++ b/submarine-server/server-submitter/submitter-yarnservice/pom.xml
@@ -321,6 +321,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/submarine-test/e2e/pom.xml b/submarine-test/e2e/pom.xml
index eb10592..7ad00d5 100644
--- a/submarine-test/e2e/pom.xml
+++ b/submarine-test/e2e/pom.xml
@@ -78,6 +78,7 @@
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/submarine-workbench/interpreter/interpreter-engine/pom.xml
b/submarine-workbench/interpreter/interpreter-engine/pom.xml
index 45492e9..8d8e838 100644
--- a/submarine-workbench/interpreter/interpreter-engine/pom.xml
+++ b/submarine-workbench/interpreter/interpreter-engine/pom.xml
@@ -107,6 +107,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/submarine-workbench/interpreter/python-interpreter/pom.xml
b/submarine-workbench/interpreter/python-interpreter/pom.xml
index 810087e..7a18634 100644
--- a/submarine-workbench/interpreter/python-interpreter/pom.xml
+++ b/submarine-workbench/interpreter/python-interpreter/pom.xml
@@ -202,6 +202,7 @@
</dependencies>
<build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -214,7 +215,7 @@
<goal>shade</goal>
</goals>
<configuration>
-
<outputFile>target/${project.artifactId}-${project.version}-shade.jar</outputFile>
+
<outputFile>target/submarine-${artifactId}-${project.version}-shade.jar</outputFile>
<filters>
<filter>
<artifact>*:*</artifact>
diff --git a/submarine-workbench/interpreter/spark-interpreter/pom.xml
b/submarine-workbench/interpreter/spark-interpreter/pom.xml
index 0ba95a9..d9a9b05 100644
--- a/submarine-workbench/interpreter/spark-interpreter/pom.xml
+++ b/submarine-workbench/interpreter/spark-interpreter/pom.xml
@@ -21,245 +21,246 @@
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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.submarine</groupId>
- <artifactId>interpreter</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>spark-interpreter</artifactId>
+ <parent>
+ <groupId>org.apache.submarine</groupId>
+ <artifactId>interpreter</artifactId>
<version>0.3.0-SNAPSHOT</version>
- <name>Submarine: Interpreter Spark</name>
- <description>Submarine spark Interpreter</description>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>spark-interpreter</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <name>Submarine: Interpreter Spark</name>
+ <description>Submarine spark Interpreter</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.submarine</groupId>
- <artifactId>interpreter-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>spark-interpreter</artifactId>
- <version>${zeppelin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-interpreter</artifactId>
- <version>${zeppelin.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.atomix</groupId>
- <artifactId>atomix</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.atomix</groupId>
- <artifactId>atomix-raft</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.atomix</groupId>
- <artifactId>atomix-primary-backup</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.submarine</groupId>
+ <artifactId>interpreter-engine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-interpreter</artifactId>
+ <version>${zeppelin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-interpreter</artifactId>
+ <version>${zeppelin.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.atomix</groupId>
+ <artifactId>atomix</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.atomix</groupId>
+ <artifactId>atomix-raft</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.atomix</groupId>
+ <artifactId>atomix-primary-backup</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${jsr305.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
- <!-- Test libraries -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-spark-dependencies</artifactId>
- <version>${zeppelin.version}</version>
- </dependency>
+ <!-- Test libraries -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-spark-dependencies</artifactId>
+ <version>${zeppelin.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>spark-scala-2.11</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.11</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${plugin.shade.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
-
<outputFile>target/${project.artifactId}-${project.version}-shade.jar</outputFile>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>org.apache.submarine.interpreter.InterpreterProcess</mainClass>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <finalName>submarine-${artifactId}-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${plugin.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+
<outputFile>target/submarine-${artifactId}-${project.version}-shade.jar</outputFile>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.submarine.interpreter.InterpreterProcess</mainClass>
+ </transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies-runtime</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<includeArtifactIds>spark-scala-2.11</includeArtifactIds>
-
<includeGroupIds>org.apache.zeppelin</includeGroupIds>
-
<outputDirectory>../spark/scala-2.11</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-dependencies-system</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeScope>system</includeScope>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <executions>
+ <execution>
+ <id>copy-dependencies-runtime</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>spark-scala-2.11</includeArtifactIds>
+ <includeGroupIds>org.apache.zeppelin</includeGroupIds>
+ <outputDirectory>../spark/scala-2.11</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-dependencies-system</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeScope>system</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
