Author: srowen
Date: Wed May 22 16:37:44 2013
New Revision: 1485277
URL: http://svn.apache.org/r1485277
Log:
Update a few plugin and integration-related dependencies, and require Maven 3
for consistency
Modified:
mahout/trunk/integration/pom.xml
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
mahout/trunk/pom.xml
Modified: mahout/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/pom.xml?rev=1485277&r1=1485276&r2=1485277&view=diff
==============================================================================
--- mahout/trunk/integration/pom.xml (original)
+++ mahout/trunk/integration/pom.xml Wed May 22 16:37:44 2013
@@ -78,7 +78,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.10</version>
+ <version>6.1.26</version>
</plugin>
</plugins>
@@ -149,19 +149,19 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.9.1</version>
+ <version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
- <version>2.9.1</version>
+ <version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>1.1.5</version>
+ <version>1.2.5</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -176,8 +176,8 @@
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>0.94.1</version>
+ <artifactId>hbase-client</artifactId>
+ <version>0.95.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -187,7 +187,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
-
</exclusions>
</dependency>
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java?rev=1485277&r1=1485276&r2=1485277&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
Wed May 22 16:37:44 2013
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HBaseConf
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
@@ -143,8 +142,6 @@ public final class HBaseDataModel implem
try {
admin.createTable(tDesc);
log.info("Created table {}", tableName);
- } catch (TableExistsException e) {
- log.info("Table {} alreay exists", tableName);
} finally {
admin.close();
}
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1485277&r1=1485276&r2=1485277&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Wed May 22 16:37:44 2013
@@ -116,6 +116,10 @@
</repository>
</repositories>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
<dependencyManagement>
<dependencies>
@@ -559,7 +563,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
@@ -635,7 +639,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -670,7 +674,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>once</forkMode>
- <argLine>-Xms256m -Xmx1800m</argLine>
+ <argLine>-Xms256m -Xmx1800m</argLine>
<testFailureIgnore>false</testFailureIgnore>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -691,7 +695,7 @@
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
- <version>3.1.10.1</version>
+ <version>3.1.11.1</version>
</plugin>
</plugins>
<resources>
@@ -794,7 +798,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
@@ -860,7 +864,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.1</version>
</plugin>
<!-- checkstyle -->
<plugin>
@@ -957,7 +961,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
