This is an automated email from the ASF dual-hosted git repository.
alexott pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 3bb0fcb [ZEPPELIN-4902] Pom cleanup
3bb0fcb is described below
commit 3bb0fcb8063277b80f79b72a5801e88619f40227
Author: Philipp Dallig <philipp.dal...@gmail.com>
AuthorDate: Fri Jun 19 14:53:02 2020 +0200
[ZEPPELIN-4902] Pom cleanup
### What is this PR for?
This PR fixes the problem, that hadoop libraries are not in every submodule.
### What type of PR is it?
- Improvement
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-4902
### How should this be tested?
* **Travis-CI**:
https://travis-ci.org/github/Reamer/zeppelin/builds/700094748
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <philipp.dal...@gmail.com>
Closes #3817 from Reamer/pom_cleanup and squashes the following commits:
fa221660a [Philipp Dallig] We need kerberos-libraries with hadoop3
54db1215d [Philipp Dallig] Plugins should not need extra hadoop jars
933069ca3 [Philipp Dallig] Remove global dependency for all submodules, if
you run with hadoop3 profile
d2e4569cc [Philipp Dallig] test dependencies should be in test scope
(cherry picked from commit cf5272009e23edec03155d9f60e57651e426d724)
Signed-off-by: Alex Ott <alex...@apache.org>
---
pom.xml | 15 ---------
zeppelin-interpreter-integration/pom.xml | 57 +++++++++++++++++---------------
zeppelin-plugins/pom.xml | 6 +++-
zeppelin-server/pom.xml | 15 ++++++++-
4 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index cb81369..cc1cb3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1834,21 +1834,6 @@
<curator.version>2.13.0</curator.version>
<kerberos-client.version>2.0.0-M15</kerberos-client.version>
</properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aws</artifactId>
- <version>${hadoop.version}</version>
- <scope>${hadoop.deps.scope}</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>kerberos-client</artifactId>
- <version>${kerberos-client.version}</version>
- <scope>${hadoop.deps.scope}</scope>
- </dependency>
- </dependencies>
</profile>
</profiles>
diff --git a/zeppelin-interpreter-integration/pom.xml
b/zeppelin-interpreter-integration/pom.xml
index 1cf0341..91206f8 100644
--- a/zeppelin-interpreter-integration/pom.xml
+++ b/zeppelin-interpreter-integration/pom.xml
@@ -56,19 +56,6 @@
</dependency>
<dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-zengine</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
@@ -78,19 +65,6 @@
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-server</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.zeppelin</groupId>
- <artifactId>zeppelin-server</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -123,21 +97,52 @@
<!--test libraries-->
<dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-zengine</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-server</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml
index 92a9f29..95bf383 100644
--- a/zeppelin-plugins/pom.xml
+++ b/zeppelin-plugins/pom.xml
@@ -34,6 +34,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Zeppelin: Plugins Parent</name>
<description>Zeppelin Plugins Parent</description>
+ <properties>
+ <!-- no need to include hadoop jar, because it's already included in
zeppelin-zengine -->
+ <hadoop.deps.scope>provided</hadoop.deps.scope>
+ </properties>
<modules>
<module>notebookrepo/s3</module>
@@ -71,7 +75,7 @@
<artifactId>zeppelin-zengine</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<!-- Test libraries -->
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index b53b502..891a409 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -249,10 +249,12 @@
<artifactId>hadoop-client</artifactId>
</dependency>
+ <!--test libraries-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -260,6 +262,7 @@
<artifactId>zeppelin-zengine</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -268,7 +271,6 @@
</exclusions>
</dependency>
- <!--test libraries-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -434,6 +436,17 @@
</zeppelin.daemon.package.base>
</properties>
</profile>
+ <profile>
+ <id>hadoop3</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>kerberos-client</artifactId>
+ <version>${kerberos-client.version}</version>
+ <scope>${hadoop.deps.scope}</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
