You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2017/02/27 04:27:09 UTC
mahout git commit: MAHOUT-1919: Flink Module breaks the build
regularly this closes apache/mahout#289
Repository: mahout
Updated Branches:
refs/heads/master 4d1464ef4 -> eb278dc3d
MAHOUT-1919: Flink Module breaks the build regularly this closes apache/mahout#289
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/eb278dc3
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/eb278dc3
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/eb278dc3
Branch: refs/heads/master
Commit: eb278dc3d3789e3e945af77d48551aecc15ab33b
Parents: 4d1464e
Author: Andrew Palumbo <ap...@apache.org>
Authored: Sun Feb 26 20:25:58 2017 -0800
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Sun Feb 26 20:26:46 2017 -0800
----------------------------------------------------------------------
distribution/pom.xml | 27 ++-------------------------
distribution/src/main/assembly/bin.xml | 4 ----
2 files changed, 2 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/eb278dc3/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3f044c3..f2cf300 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -72,6 +72,7 @@
</plugins>
</build>
<profiles>
+
<profile>
<id>mahout-release</id>
<properties>
@@ -107,10 +108,6 @@
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-flink_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
</dependency>
<dependency>
@@ -124,6 +121,7 @@
</dependency>
</dependencies>
</profile>
+
<profile>
<id>viennacl-omp</id>
<dependencies>
@@ -153,10 +151,6 @@
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-flink_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
</dependency>
<dependency>
@@ -165,11 +159,7 @@
<version>0.13.0-SNAPSHOT</version>
</dependency>
</dependencies>
-
</profile>
-
-
-
</profiles>
<dependencies>
@@ -199,20 +189,7 @@
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-flink_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
</dependency>
- <!--Viennacl is not part of the Default build currently.-->
- <!--<dependency>-->
- <!--<groupId>org.apache.mahout</groupId>-->
- <!--<artifactId>mahout-native-viennacl_${scala.compat.version}</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.mahout</groupId>-->
- <!--<artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>-->
- <!--</dependency>-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eb278dc3/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index 2fc48e3..a27577f 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -187,10 +187,6 @@
<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}/..</directory>
<outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>