You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sm...@apache.org on 2016/04/11 03:53:51 UTC
mahout git commit: MAHOUT-1829: Add Flink module to build tools,
this closes apache/mahout#219
Repository: mahout
Updated Branches:
refs/heads/flink-binding 6667bb0ad -> 1f5fc5243
MAHOUT-1829: Add Flink module to build tools, this closes apache/mahout#219
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/1f5fc524
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/1f5fc524
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/1f5fc524
Branch: refs/heads/flink-binding
Commit: 1f5fc5243053b933a65b8277bc9743cd8e94b5a7
Parents: 6667bb0
Author: smarthi <sm...@apache.org>
Authored: Sun Apr 10 21:40:13 2016 -0400
Committer: smarthi <sm...@apache.org>
Committed: Sun Apr 10 21:40:13 2016 -0400
----------------------------------------------------------------------
distribution/pom.xml | 4 ++++
distribution/src/main/assembly/bin.xml | 17 +++++++++++++++++
flink/pom.xml | 2 +-
3 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/1f5fc524/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index aa37255..1cc72d3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -111,6 +111,10 @@
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-flink_${scala.compat.version}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
<artifactId>mahout-spark-shell_${scala.compat.version}</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/mahout/blob/1f5fc524/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index 3e28a53..04b0806 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -143,6 +143,19 @@
<outputDirectory/>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/../flink/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/../spark-shell/target</directory>
<includes>
<include>mahout-*.jar</include>
@@ -201,6 +214,10 @@
<outputDirectory>docs/mahout-spark</outputDirectory>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/../flink/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-flink</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/../spark-shell/target/site/scaladocs</directory>
<outputDirectory>docs/mahout-spark-shell</outputDirectory>
</fileSet>
http://git-wip-us.apache.org/repos/asf/mahout/blob/1f5fc524/flink/pom.xml
----------------------------------------------------------------------
diff --git a/flink/pom.xml b/flink/pom.xml
index d5bdedf..6cdb245 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-flink_2.10</artifactId>
+ <artifactId>mahout-flink_${scala.compat.version}</artifactId>
<name>Mahout Flink bindings</name>
<description>
Mahout Bindings for Apache Flink