You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/01/17 19:42:35 UTC
incubator-zeppelin git commit: Remove duplicated entries from
spark/pom.xml
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 8c848f0de -> cd031aad8
Remove duplicated entries from spark/pom.xml
### What is this PR for?
spark/pom.xml has some duplicated entry with spark-dependencies/pom.xml. this pr removes them.
### What type of PR is it?
Refactoring
### Is there a relevant Jira issue?
no
### How should this be tested?
N/A
### 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: Lee moon soo <mo...@apache.org>
Closes #647 from Leemoonsoo/move_spark_profile and squashes the following commits:
be0dbe7 [Lee moon soo] remove duplicated entries from spark/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/cd031aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/cd031aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/cd031aad
Branch: refs/heads/master
Commit: cd031aad82ba5a441154e54fa2b0fda1b59a77c4
Parents: 8c848f0
Author: Lee moon soo <mo...@apache.org>
Authored: Sat Jan 16 15:32:04 2016 -0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Sun Jan 17 10:44:59 2016 -0800
----------------------------------------------------------------------
spark-dependencies/pom.xml | 3 -
spark/pom.xml | 129 +++++++---------------------------------
2 files changed, 22 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cd031aad/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index cb8bfc4..c173b9c 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -272,14 +272,12 @@
<version>${spark.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_2.10</artifactId>
<version>${spark.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming-twitter_2.10</artifactId>
@@ -292,7 +290,6 @@
<version>${spark.version}</version>
</dependency>
-
<!-- hadoop -->
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cd031aad/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 2bc1d6d..773bbc9 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -38,64 +38,8 @@
<spark.version>1.4.1</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
- <hadoop.version>2.3.0</hadoop.version>
- <py4j.version>0.8.2.1</py4j.version>
</properties>
- <profiles>
- <profile>
- <id>vendor-repo</id>
- <repositories>
- <repository>
- <id>cloudera</id>
- <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>spark-1.1</id>
- <properties>
- <spark.version>1.1.1</spark.version>
- </properties>
- </profile>
-
- <profile>
- <id>spark-1.2</id>
- <properties>
- <spark.version>1.2.1</spark.version>
- </properties>
- </profile>
-
- <profile>
- <id>spark-1.3</id>
- <properties>
- <spark.version>1.3.1</spark.version>
- </properties>
- </profile>
-
- <profile>
- <id>spark-1.4</id>
- <properties>
- <spark.version>1.4.1</spark.version>
- </properties>
- </profile>
-
- <profile>
- <id>spark-1.5</id>
- <properties>
- <spark.version>1.5.2</spark.version>
- </properties>
- </profile>
-
- <profile>
- <id>spark-1.6</id>
- <properties>
- <spark.version>1.6.0</spark.version>
- <py4j.version>0.9</py4j.version>
- </properties>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -247,51 +191,6 @@
<version>1.3</version>
</dependency>
- <!-- to compile and test code.
- Runtime dependency is provided by either spark-dependencies submodule or SPARK_HOME
- -->
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.10</artifactId>
- <version>${spark.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-repl_2.10</artifactId>
- <version>${spark.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.10</artifactId>
- <version>${spark.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_2.10</artifactId>
- <version>${spark.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-catalyst_2.10</artifactId>
- <version>${spark.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
@@ -326,12 +225,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>net.sf.py4j</groupId>
- <artifactId>py4j</artifactId>
- <version>${py4j.version}</version>
- </dependency>
-
<!--TEST-->
<dependency>
@@ -346,6 +239,28 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>3.2.10</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>3.2.6</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>3.2.9</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>