You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2015/04/02 03:25:41 UTC
mahout git commit: MAHOUT-1667: Hadoop 1 and 2 profile in POM
Repository: mahout
Updated Branches:
refs/heads/master 6604f1d9f -> a4f24dda8
MAHOUT-1667: Hadoop 1 and 2 profile in POM
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/a4f24dda
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/a4f24dda
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/a4f24dda
Branch: refs/heads/master
Commit: a4f24dda8f30745e1989da7f0e1cb6baaf82cc80
Parents: 6604f1d
Author: Stevo Slavic <ss...@gmail.com>
Authored: Thu Apr 2 03:25:29 2015 +0200
Committer: Stevo Slavic <ss...@gmail.com>
Committed: Thu Apr 2 03:25:29 2015 +0200
----------------------------------------------------------------------
CHANGELOG | 8 ++-
.../org/apache/mahout/utils/SplitInput.java | 2 +-
.../apache/mahout/common/DummyRecordWriter.java | 4 +-
pom.xml | 65 +++++++++++++-------
4 files changed, 51 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/a4f24dda/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 0259a4f..fcf2bc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,13 @@
Mahout Change Log
Release 0.10.0 - unreleased
-
+
+ MAHOUT-1667: Hadoop 1 and 2 profile in POM (sslavic)
+
MAHOUT-1564: Naive Bayes Classifier for New Text Documents (apalumbo)
-
+
MAHOUT-1524: Script to auto-generate and view the Mahout website on a local machine (Saleem Ansari via apalumbo)
-
+
MAHOUT-1589: Deprecate mahout.cmd due to lack of support
MAHOUT-1655: Refactors mr-legacy into mahout-hdfs and mahout-mr, Spark now depends on much reduced mahout-hdfs
http://git-wip-us.apache.org/repos/asf/mahout/blob/a4f24dda/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
----------------------------------------------------------------------
diff --git a/integration/src/main/java/org/apache/mahout/utils/SplitInput.java b/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
index af22422..562e7df 100644
--- a/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
+++ b/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
@@ -300,7 +300,7 @@ public class SplitInput extends AbstractJob {
// input dir contains one file per category.
FileStatus[] fileStats = fs.listStatus(inputDir, PathFilters.logsCRCFilter());
for (FileStatus inputFile : fileStats) {
- if (!inputFile.isDirectory()) {
+ if (!inputFile.isDir()) {
splitFile(inputFile.getPath());
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/a4f24dda/mr/src/test/java/org/apache/mahout/common/DummyRecordWriter.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/common/DummyRecordWriter.java b/mr/src/test/java/org/apache/mahout/common/DummyRecordWriter.java
index 7dea174..61b768a 100644
--- a/mr/src/test/java/org/apache/mahout/common/DummyRecordWriter.java
+++ b/mr/src/test/java/org/apache/mahout/common/DummyRecordWriter.java
@@ -114,7 +114,7 @@ public final class DummyRecordWriter<K extends Writable, V extends Writable> ext
// and 0.23.
try {
return buildNewMapperContext(configuration, output);
- } catch (Exception e) {
+ } catch (Exception|IncompatibleClassChangeError e) {
try {
return buildOldMapperContext(mapper, configuration, output);
} catch (Exception ex) {
@@ -133,7 +133,7 @@ public final class DummyRecordWriter<K extends Writable, V extends Writable> ext
// and 0.23.
try {
return buildNewReducerContext(configuration, output, keyClass, valueClass);
- } catch (Exception e) {
+ } catch (Exception|IncompatibleClassChangeError e) {
try {
return buildOldReducerContext(reducer, configuration, output, keyClass, valueClass);
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/mahout/blob/a4f24dda/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 23c775c..110133c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,6 @@
<mcheckstyle.version>2.10</mcheckstyle.version>
<mfindbugs.version>2.5.2</mfindbugs.version>
<mjavadoc.version>2.9.1</mjavadoc.version>
- <hadoop.version>2.6.0</hadoop.version>
- <hadoop.classifier>hadoop2</hadoop.classifier>
<hbase.version>1.0.0</hbase.version>
<lucene.version>4.6.1</lucene.version>
<slf4j.version>1.7.10</slf4j.version>
@@ -307,26 +305,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${lucene.version}</version>
@@ -800,8 +778,51 @@
<id>hadoop1</id>
<properties>
<hadoop.classifier>hadoop1</hadoop.classifier>
+ <hadoop.version>1.2.1</hadoop.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ <profile>
+ <id>hadoop2</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <hadoop.classifier>hadoop2</hadoop.classifier>
<hadoop.version>2.6.0</hadoop.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</profile>
<profile>
<id>fastinstall</id>