IGNITE-1701. Bump Spark dependenency to 1.5.1 (the latest stable)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1334e77a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1334e77a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1334e77a Branch: refs/heads/ignite-1607 Commit: 1334e77a7eb23d575de9097f519a64b4678e9dff Parents: ef785cb Author: Konstantin Boudnik <c...@wandisco.com> Authored: Thu Oct 15 14:26:47 2015 -0700 Committer: Konstantin Boudnik <c...@wandisco.com> Committed: Mon Oct 26 13:13:56 2015 -0700 ---------------------------------------------------------------------- DEVNOTES.txt | 3 ++- modules/spark-2.10/pom.xml | 4 ++-- modules/spark/pom.xml | 4 ++-- parent/pom.xml | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1334e77a/DEVNOTES.txt ---------------------------------------------------------------------- diff --git a/DEVNOTES.txt b/DEVNOTES.txt index e8e3741..ea9cf17 100644 --- a/DEVNOTES.txt +++ b/DEVNOTES.txt @@ -19,9 +19,10 @@ NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40. Ignite Hadoop Accelerator Maven Build Instructions ============================================ -mvn clean package -DskipTests -Dignite.edition=hadoop [-Dhadoop.version=X.X.X] +mvn clean package -DskipTests -Dignite.edition=hadoop [-Dhadoop.version=X.X.X] [-Dspark.version=x.y.z] Use 'hadoop.version' parameter to build Ignite against a specific Hadoop version. +Use 'spark.version' parameter to build ignite-spark module for a specific Spark version. Look for apache-ignite-hadoop-<version>-bin.zip in ./target/bin directory. Resulting binary assembly will also include integration module for Apache Spark. http://git-wip-us.apache.org/repos/asf/ignite/blob/1334e77a/modules/spark-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml index 316b13b..4697693 100644 --- a/modules/spark-2.10/pom.xml +++ b/modules/spark-2.10/pom.xml @@ -58,13 +58,13 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.10</artifactId> - <version>1.3.1</version> + <version>${spark.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-sql_2.10</artifactId> - <version>1.3.1</version> + <version>${spark.version}</version> </dependency> <!-- Test dependencies --> http://git-wip-us.apache.org/repos/asf/ignite/blob/1334e77a/modules/spark/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml index 95e05d8..942652c 100644 --- a/modules/spark/pom.xml +++ b/modules/spark/pom.xml @@ -58,13 +58,13 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.11</artifactId> - <version>1.3.1</version> + <version>${spark.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-sql_2.11</artifactId> - <version>1.3.1</version> + <version>${spark.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1334e77a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ba44c85..765ecf1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -36,6 +36,7 @@ <properties> <ignite.edition>fabric</ignite.edition> <hadoop.version>2.4.1</hadoop.version> + <spark.version>1.5.1</spark.version> <spring.version>4.1.0.RELEASE</spring.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>