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 2018/03/14 12:49:03 UTC
zeppelin git commit: ZEPPELIN-3314. Only apply
maven-dependency-plugin for interpreter component
Repository: zeppelin
Updated Branches:
refs/heads/master 9ec6eb5a4 -> 1effc6350
ZEPPELIN-3314. Only apply maven-dependency-plugin for interpreter component
### What is this PR for?
only interpreter component need to copy interpreter dependency and interpreter-setting.json
### What type of PR is it?
[Bug Fix | Improvement ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3314
### 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 #2857 from zjffdu/ZEPPELIN-3314 and squashes the following commits:
322530f [Jeff Zhang] ZEPPELIN-3314. Only apply maven-dependency-plugin for interpreter component
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1effc635
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1effc635
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1effc635
Branch: refs/heads/master
Commit: 1effc63507f819f2b99589a34605afb53226282d
Parents: 9ec6eb5
Author: Jeff Zhang <zj...@apache.org>
Authored: Mon Mar 12 09:41:01 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Mar 14 20:48:58 2018 +0800
----------------------------------------------------------------------
interpreter-parent/pom.xml | 8 --------
pom.xml | 36 ++++++++++++++++--------------------
zeppelin-integration/pom.xml | 4 ++++
zeppelin-interpreter/pom.xml | 18 +++++-------------
zeppelin-server/pom.xml | 6 ++++++
zeppelin-zengine/pom.xml | 5 +++++
6 files changed, 36 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1effc635/interpreter-parent/pom.xml
----------------------------------------------------------------------
diff --git a/interpreter-parent/pom.xml b/interpreter-parent/pom.xml
index cbfedd5..0aa2026 100644
--- a/interpreter-parent/pom.xml
+++ b/interpreter-parent/pom.xml
@@ -79,14 +79,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-dependencies</id>
- <phase>none</phase>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
-
- <execution>
<id>copy-interpreter-dependencies</id>
<phase>package</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1effc635/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d6087a8..ca6c409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,26 +450,6 @@
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- <includeScope>runtime</includeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${plugin.jar.version}</version>
<configuration>
@@ -589,6 +569,22 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>${plugin.dependency.version}</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1effc635/zeppelin-integration/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index 5240a2c..94ed3a2 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -189,6 +189,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1effc635/zeppelin-interpreter/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index 80864f9..7fe75a7 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -247,20 +247,12 @@
<skip>false</skip>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1effc635/zeppelin-server/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 1622791..3ee83bd 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -453,6 +453,12 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1effc635/zeppelin-zengine/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index cdb11dd..a7d9d5f 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -405,6 +405,11 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
</plugins>
</build>