Author: dlyubimov
Date: Tue Mar 29 04:02:26 2011
New Revision: 1086468
URL: http://svn.apache.org/viewvc?rev=1086468&view=rev
Log:
MAHOUT-622:first of standardizing dependency management, core deps cleanup
Modified:
mahout/trunk/core/pom.xml
mahout/trunk/examples/pom.xml
mahout/trunk/pom.xml
mahout/trunk/taste-web/pom.xml
Modified: mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1086468&r1=1086467&r2=1086468&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Tue Mar 29 04:02:26 2011
@@ -22,10 +22,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core</artifactId>
- <version>0.5-SNAPSHOT</version>
-
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
@@ -33,6 +29,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <!-- modules inherit parent's group id and version. -->
+ <artifactId>mahout-core</artifactId>
<name>Mahout Core</name>
<description>Scalable machine learning libraries</description>
@@ -129,13 +127,22 @@
</build>
<dependencies>
+
+ <!-- our modules -->
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mahout-math</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Third Party -->
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
@@ -143,56 +150,47 @@
<dependency>
<groupId>org.apache.mahout.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>0.20.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-framework</artifactId>
- <version>0.6.2</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
</dependency>
<dependency>
@@ -208,70 +206,37 @@
<dependency>
<groupId>org.apache.mahout.commons</groupId>
<artifactId>commons-cli</artifactId>
- <version>2.0-mahout</version>
</dependency>
<dependency>
-<!-- <groupId>commons-math</groupId>-->
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- <!-- version>1.2</version -->
- <version>2.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>Apache snapshots</id>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>gson</id>
- <url>http://google-gson.googlecode.com/svn/mavenrepo</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/core</connection>
Modified: mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1086468&r1=1086467&r2=1086468&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Tue Mar 29 04:02:26 2011
@@ -163,7 +163,6 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-wikipedia</artifactId>
- <version>${lucene.version}</version>
</dependency>
<!-- core test -->
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1086468&r1=1086467&r2=1086468&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Tue Mar 29 04:02:26 2011
@@ -89,11 +89,7 @@
</mailingList>
</mailingLists>
<properties>
- <junit.version>4.7</junit.version>
- <lucene.version>3.0.2</lucene.version>
- <hadoop.version>0.20.2</hadoop.version>
<maven.clover.multiproject>true</maven.clover.multiproject>
- <collections.version>1.0</collections.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
@@ -129,32 +125,88 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>gson</id>
+ <url>http://google-gson.googlecode.com/svn/mavenrepo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
</repositories>
<issueManagement>
<system>Jira</system>
<url>https://issues.apache.org/jira/browse/MAHOUT</url>
</issueManagement>
+
<dependencyManagement>
<dependencies>
+
+ <!-- our modules -->
+
+ <dependency>
+ <artifactId>mahout-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>mahout-math</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>mahout-math</artifactId>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <artifactId>mahout-utils</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>mahout-buildtools</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- sibling projects -->
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-collections</artifactId>
- <version>${collections.version}</version>
+ <version>1.0</version>
</dependency>
+
+
+ <!-- 3rd party -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
- <version>${lucene.version}</version>
+ <version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>${lucene.version}</version>
+ <version>3.0.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-wikipedia</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -169,10 +221,11 @@
<version>2.5.2</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
+ <version>0.20.2</version>
<exclusions>
<exclusion>
<groupId>net.sf.kosmosfs</groupId>
@@ -240,6 +293,79 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mahout.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>0.20.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.uncommons.watchmaker</groupId>
+ <artifactId>watchmaker-framework</artifactId>
+ <version>0.6.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mahout.commons</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>2.0-mahout</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<build>
Modified: mahout/trunk/taste-web/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/taste-web/pom.xml?rev=1086468&r1=1086467&r2=1086468&view=diff
==============================================================================
--- mahout/trunk/taste-web/pom.xml (original)
+++ mahout/trunk/taste-web/pom.xml Tue Mar 29 04:02:26 2011
@@ -30,9 +30,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-taste-webapp</artifactId>
- <version>0.5-SNAPSHOT</version>
<name>Mahout Taste Webapp</name>
<description>Mahout Taste Collaborative Filtering Web App</description>
@@ -224,7 +222,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
