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 2015/11/10 13:37:27 UTC
incubator-zeppelin git commit: [ZEPPELIN-394] Update cassandra-spark
profiles to latest connector versions
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 81f02485b -> f3de6cd7e
[ZEPPELIN-394] Update cassandra-spark profiles to latest connector versions
Below is the version matrix. Updates are in bold
<table>
<tr>
<th><strong>Maven profile</strong></th>
<th><strong>Spark Cassandra connector version</strong></th>
</tr>
<tr>
<td>cassandra-spark-1.1</td>
<td>1.1.1</td>
</tr>
<tr>
<td>cassandra-spark-1.2</td>
<td>1.2.1</td>
</tr>
<tr>
<td><strong>cassandra-spark-1.3</strong></td>
<td><strong>1.3.1</strong></td>
</tr>
<tr>
<td><strong>cassandra-spark-1.4</strong></td>
<td><strong>1.4.0</strong></td>
</tr>
<tr>
<td><strong>cassandra-spark-1.5</strong></td>
<td><strong>1.5.0-M2</strong></td>
</tr>
</table>
Author: DuyHai DOAN <do...@gmail.com>
Closes #395 from doanduyhai/SparkCassandraDependenciesUpdate and squashes the following commits:
8b14bea [DuyHai DOAN] Add description for Spark-Cassandra profiles in README
41992b3 [DuyHai DOAN] Update cassandra-spark profiles to latest Spark-Cassandra connector versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/f3de6cd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/f3de6cd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/f3de6cd7
Branch: refs/heads/master
Commit: f3de6cd7e16f190b3a75c4dd61ee9fc1c8c2dcb8
Parents: 81f0248
Author: DuyHai DOAN <do...@gmail.com>
Authored: Fri Nov 6 09:29:46 2015 +0100
Committer: Lee moon soo <mo...@apache.org>
Committed: Tue Nov 10 21:37:34 2015 +0900
----------------------------------------------------------------------
README.md | 27 ++++++++++++++++++++++
spark-dependencies/pom.xml | 51 +++++++++++++++++++++++++++++++++++++----
2 files changed, 74 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f3de6cd7/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ff58299..39cb6f0 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,33 @@ Ignite (1.1.0-incubating and later)
mvn clean package -Dignite.version=1.1.0-incubating -DskipTests
```
+Spark-Cassandra integration (Spark 1.1.x)
+```
+mvn clean package -Pcassandra-spark-1.1 -Dhadoop.version=2.6.0 -Phadoop-2.6 -DskipTests
+```
+
+Spark-Cassandra integration (Spark 1.2.x)
+```
+mvn clean package -Pcassandra-spark-1.2 -Dhadoop.version=2.6.0 -Phadoop-2.6 -DskipTests
+```
+
+Spark-Cassandra integration (Spark 1.3.x)
+```
+mvn clean package -Pcassandra-spark-1.3 -Dhadoop.version=2.6.0 -Phadoop-2.6 -DskipTests
+```
+
+Spark-Cassandra integration (Spark 1.4.x)
+```
+mvn clean package -Pcassandra-spark-1.4 -Dhadoop.version=2.6.0 -Phadoop-2.6 -DskipTests
+```
+
+Spark-Cassandra integration (Spark 1.5.x)
+```
+mvn clean package -Pcassandra-spark-1.5 -Dhadoop.version=2.6.0 -Phadoop-2.6 -DskipTests
+```
+
+
+
### Configure
If you wish to configure Zeppelin option (like port number), configure the following files:
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f3de6cd7/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index cf4dfa4..8294311 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -435,9 +435,7 @@
<dependency>
<groupId>com.datastax.spark</groupId>
<artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId>
- <!--You need to build your own version of Spark Cassandra connector 1.3.0-SNAPSHOT
- because it is not yet released-->
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1</version>
<exclusions>
<exclusion>
<groupId>org.joda</groupId>
@@ -459,6 +457,27 @@
</profile>
<profile>
+ <id>cassandra-spark-1.4</id>
+ <properties>
+ <spark.version>1.4.1</spark.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.datastax.spark</groupId>
+ <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId>
+ <version>1.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.joda</groupId>
+ <artifactId>joda-convert</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
<id>spark-1.5</id>
<properties>
<spark.version>1.5.1</spark.version>
@@ -470,7 +489,31 @@
<dependencies>
</dependencies>
</profile>
-
+
+ <profile>
+ <id>cassandra-spark-1.5</id>
+ <properties>
+ <spark.version>1.5.1</spark.version>
+ <akka.group>com.typesafe.akka</akka.group>
+ <akka.version>2.3.11</akka.version>
+ <protobuf.version>2.5.0</protobuf.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.datastax.spark</groupId>
+ <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId>
+ <version>1.5.0-M2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.joda</groupId>
+ <artifactId>joda-convert</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+
<profile>
<id>hadoop-0.23</id>
<!-- SPARK-1121: Adds an explicit dependency on Avro to work around a