You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2013/07/31 08:58:26 UTC
svn commit: r1508743 - in /mahout/trunk: buildtools/pom.xml core/pom.xml
examples/src/main/java/org/apache/mahout/clustering/streaming/tools/ResplitSequenceFiles.java
integration/pom.xml pom.xml
Author: srowen
Date: Wed Jul 31 06:58:26 2013
New Revision: 1508743
URL: http://svn.apache.org/r1508743
Log:
MRUnit is test scope. Single use of Commons IO can easily be removed and replaced with Guava, already a dependency. Update versions of a few things in integration
Modified:
mahout/trunk/buildtools/pom.xml
mahout/trunk/core/pom.xml
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/streaming/tools/ResplitSequenceFiles.java
mahout/trunk/integration/pom.xml
mahout/trunk/pom.xml
Modified: mahout/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/buildtools/pom.xml?rev=1508743&r1=1508742&r2=1508743&view=diff
==============================================================================
--- mahout/trunk/buildtools/pom.xml (original)
+++ mahout/trunk/buildtools/pom.xml Wed Jul 31 06:58:26 2013
@@ -38,6 +38,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
<build>
<plugins>
<plugin>
Modified: mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1508743&r1=1508742&r2=1508743&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Wed Jul 31 06:58:26 2013
@@ -147,11 +147,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
@@ -193,6 +188,7 @@
<artifactId>mrunit</artifactId>
<version>1.0.0</version>
<classifier>hadoop1</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/streaming/tools/ResplitSequenceFiles.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/streaming/tools/ResplitSequenceFiles.java?rev=1508743&r1=1508742&r2=1508743&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/streaming/tools/ResplitSequenceFiles.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/streaming/tools/ResplitSequenceFiles.java Wed Jul 31 06:58:26 2013
@@ -5,6 +5,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.Iterator;
+import com.google.common.base.Charsets;
import com.google.common.collect.Iterables;
import org.apache.commons.cli2.CommandLine;
import org.apache.commons.cli2.Group;
@@ -14,7 +15,6 @@ import org.apache.commons.cli2.builder.D
import org.apache.commons.cli2.builder.GroupBuilder;
import org.apache.commons.cli2.commandline.Parser;
import org.apache.commons.cli2.util.HelpFormatter;
-import org.apache.commons.io.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
Modified: mahout/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/pom.xml?rev=1508743&r1=1508742&r2=1508743&view=diff
==============================================================================
--- mahout/trunk/integration/pom.xml (original)
+++ mahout/trunk/integration/pom.xml Wed Jul 31 06:58:26 2013
@@ -131,11 +131,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -144,13 +139,13 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.11.1</version>
+ <version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
- <version>2.11.1</version>
+ <version>2.11.2</version>
</dependency>
<dependency>
@@ -172,7 +167,7 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
- <version>0.95.0</version>
+ <version>0.95.1-hadoop1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Modified: mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1508743&r1=1508742&r2=1508743&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Wed Jul 31 06:58:26 2013
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
@@ -378,12 +378,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
@@ -436,7 +430,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <versionRange>2.7</versionRange>
+ <versionRange>2.8</versionRange>
<goals>
<goal>copy-dependencies</goal>
</goals>
@@ -502,7 +496,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -650,7 +644,7 @@
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
- <version>3.1.11.1</version>
+ <version>3.1.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -947,7 +941,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
+ <version>${msurefire.version}</version>
</plugin>
<!-- checkstyle -->
<plugin>
@@ -964,7 +958,7 @@
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
- <version>3.1.10.1</version>
+ <version>3.1.12</version>
<configuration>
<generateHistorical>true</generateHistorical>
<licenseLocation>buildtools/clover.license</licenseLocation>
@@ -1044,7 +1038,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
<reportSets>
<reportSet>
<reports>