Return-Path: 
 <commits-return-77431-apmail-ignite-commits-archive=ignite.apache.org@ignite.apache.org>
X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org
Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9D55618CDC
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Thu, 22 Oct 2015 13:01:18 +0000 (UTC)
Received: (qmail 60003 invoked by uid 500); 22 Oct 2015 13:01:18 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 59912 invoked by uid 500); 22 Oct 2015 13:01:18 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 59297 invoked by uid 99); 22 Oct 2015 13:01:18 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 13:01:18 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id EDC09E391D; Thu, 22 Oct 2015 13:01:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dmagda@apache.org
To: commits@ignite.apache.org
Date: Thu, 22 Oct 2015 13:01:31 -0000
Message-Id: <28ebf289da0b46549bfaae34a5564f9a@git.apache.org>
In-Reply-To: <56a8549fb27642b7a3cdbb30a47b9dfe@git.apache.org>
References: <56a8549fb27642b7a3cdbb30a47b9dfe@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [15/42] ignite git commit: IGNITE-1555. Combine ignite-hadoop and
 ignite-spark into signle assembly for downstream consumption.

IGNITE-1555. Combine ignite-hadoop and ignite-spark into signle assembly for downstream consumption.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9eb539b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9eb539b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9eb539b

Branch: refs/heads/ignite-1272
Commit: c9eb539b565bf0a49dbe8dc936c1b2f165946805
Parents: 8217be6
Author: Konstantin Boudnik <cos@wandisco.com>
Authored: Fri Oct 9 20:54:30 2015 -0700
Committer: Konstantin Boudnik <cos@wandisco.com>
Committed: Thu Oct 15 14:01:50 2015 -0700

----------------------------------------------------------------------
 DEVNOTES.txt                     | 3 ++-
 assembly/dependencies-hadoop.xml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c9eb539b/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index a46b73d..a6c45f0 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -23,7 +23,8 @@ mvn clean package -DskipTests -Dignite.edition=hadoop [-Dhadoop.version=X.X.X]
 
 Use 'hadoop.version' parameter to build Ignite against a specific Hadoop version.
 
-Look for apache-ignite-hadoop-<version>-bin.zip in ./target/bin directory.
+Look for apache-ignite-hadoop-<version>-bin.zip in ./target/bin directory. Resulting binary
+assembly will also include integration module for Apache Spark.
 
 NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9eb539b/assembly/dependencies-hadoop.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml
index 0e282a4..38646ba 100644
--- a/assembly/dependencies-hadoop.xml
+++ b/assembly/dependencies-hadoop.xml
@@ -32,6 +32,7 @@
     <moduleSets>
         <moduleSet>
             <includes>
+                <include>org.apache.ignite:ignite-spark</include>
                 <include>org.apache.ignite:ignite-spring</include>
                 <include>org.apache.ignite:ignite-log4j</include>
                 <include>org.apache.ignite:ignite-indexing</include>