You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2017/02/27 11:12:08 UTC
[1/2] ignite git commit: IGNITE-4752 Hadoop examples fail for hadoop
accelerator
Repository: ignite
Updated Branches:
refs/heads/ignite-1.9 57291773c -> a779c5f94
IGNITE-4752 Hadoop examples fail for hadoop accelerator
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4dd3d23b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4dd3d23b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4dd3d23b
Branch: refs/heads/ignite-1.9
Commit: 4dd3d23b96e8ff348f603e63d99905fc5dca6c4a
Parents: 5729177
Author: Evgenii Zhuravlev <ez...@gridgain.com>
Authored: Mon Feb 27 13:37:18 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Feb 27 14:08:33 2017 +0300
----------------------------------------------------------------------
assembly/dependencies-hadoop.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd3d23b/assembly/dependencies-hadoop.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml
index 38646ba..076f09c 100644
--- a/assembly/dependencies-hadoop.xml
+++ b/assembly/dependencies-hadoop.xml
@@ -55,6 +55,9 @@
<fileSet>
<directory>target/libs</directory>
<outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>hadoop*.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>target</directory>
[2/2] ignite git commit: IGNITE-4754 SharedRDDExample missed in
example JAR file
Posted by av...@apache.org.
IGNITE-4754 SharedRDDExample missed in example JAR file
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a779c5f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a779c5f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a779c5f9
Branch: refs/heads/ignite-1.9
Commit: a779c5f9439bd797d9c662f32663780c09271672
Parents: 4dd3d23
Author: Evgenii Zhuravlev <ez...@gridgain.com>
Authored: Mon Feb 27 11:45:48 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Feb 27 14:11:57 2017 +0300
----------------------------------------------------------------------
examples/pom-standalone-lgpl.xml | 6 ++++++
examples/pom-standalone.xml | 6 ++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a779c5f9/examples/pom-standalone-lgpl.xml
----------------------------------------------------------------------
diff --git a/examples/pom-standalone-lgpl.xml b/examples/pom-standalone-lgpl.xml
index c09cc6b..f664514 100644
--- a/examples/pom-standalone-lgpl.xml
+++ b/examples/pom-standalone-lgpl.xml
@@ -32,6 +32,7 @@
<!-- will be changed by profile activation. allows to combine profiles. -->
<lgpl.folder>src/main/java</lgpl.folder>
<java8.folder>src/main/java</java8.folder>
+ <spark.folder>src/main/java</spark.folder>
<java.ver>1.7</java.ver>
</properties>
@@ -100,6 +101,10 @@
<profile>
<id>scala</id>
+ <properties>
+ <spark.folder>src/main/spark</spark.folder>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.ignite</groupId>
@@ -219,6 +224,7 @@
<source>schema-import/src/main/java</source>
<source>${lgpl.folder}</source>
<source>${java8.folder}</source>
+ <source>${spark.folder}</source>
</sources>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/ignite/blob/a779c5f9/examples/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml
index b3843e6..029ca77 100644
--- a/examples/pom-standalone.xml
+++ b/examples/pom-standalone.xml
@@ -32,6 +32,7 @@
<!-- will be changed by profile activation. allows to combine profiles. -->
<lgpl.folder>src/main/java</lgpl.folder>
<java8.folder>src/main/java</java8.folder>
+ <spark.folder>src/main/java</spark.folder>
<java.ver>1.7</java.ver>
</properties>
@@ -100,6 +101,10 @@
<profile>
<id>scala</id>
+ <properties>
+ <spark.folder>src/main/spark</spark.folder>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.ignite</groupId>
@@ -220,6 +225,7 @@
<source>schema-import/src/main/java</source>
<source>${lgpl.folder}</source>
<source>${java8.folder}</source>
+ <source>${spark.folder}</source>
</sources>
</configuration>
</execution>