Author: dlyubimov
Date: Tue Apr 5 02:49:08 2011
New Revision: 1088864
URL: http://svn.apache.org/viewvc?rev=1088864&view=rev
Log:
MAHOUT-622: final dependencies cleanup, all versions propagated under
<dependencyManagement>
Modified:
mahout/trunk/buildtools/pom.xml
mahout/trunk/eclipse/pom.xml
mahout/trunk/examples/pom.xml
mahout/trunk/math/pom.xml
mahout/trunk/pom.xml
mahout/trunk/taste-web/pom.xml
mahout/trunk/utils/pom.xml
Modified: mahout/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/buildtools/pom.xml?rev=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/buildtools/pom.xml (original)
+++ mahout/trunk/buildtools/pom.xml Tue Apr 5 02:49:08 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-buildtools</artifactId>
- <version>0.5-SNAPSHOT</version>
-
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
@@ -33,6 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>mahout-buildtools</artifactId>
<name>Mahout Build Tools</name>
<packaging>jar</packaging>
Modified: mahout/trunk/eclipse/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/eclipse/pom.xml?rev=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/eclipse/pom.xml (original)
+++ mahout/trunk/eclipse/pom.xml Tue Apr 5 02:49:08 2011
@@ -19,16 +19,16 @@
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-eclipse-support</artifactId>
- <version>0.5-SNAPSHOT</version>
- <name>Mahout Eclipse</name>
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
+ <artifactId>mahout-eclipse-support</artifactId>
+ <name>Mahout Eclipse</name>
+
<profiles>
<profile>
<id>setup-eclipse-workspace</id>
Modified: mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Tue Apr 5 02:49:08 2011
@@ -29,9 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-examples</artifactId>
- <version>0.5-SNAPSHOT</version>
<name>Mahout Examples</name>
<description>Scalable machine learning library examples</description>
@@ -134,28 +132,31 @@
</build>
<dependencies>
-
+
+ <!-- our modules -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mahout-core</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-core</artifactId>
- <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-utils</artifactId>
- <version>${project.version}</version>
</dependency>
@@ -165,25 +166,15 @@
<artifactId>lucene-wikipedia</artifactId>
</dependency>
- <!-- core test -->
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-framework</artifactId>
- <version>0.6.2</version>
</dependency>
<dependency>
<groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-swing</artifactId>
- <version>0.6.2</version>
<exclusions>
<exclusion>
<groupId>jfree</groupId>
@@ -210,19 +201,16 @@
<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>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
- <version>0.7.1</version>
</dependency>
</dependencies>
Modified: mahout/trunk/math/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/math/pom.xml?rev=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/math/pom.xml (original)
+++ mahout/trunk/math/pom.xml Tue Apr 5 02:49:08 2011
@@ -29,9 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-math</artifactId>
- <version>0.5-SNAPSHOT</version>
<name>Mahout Math</name>
<description>High performance scientific and technical computing data
structures and methods, mostly based on CERN's
Colt Java API
@@ -91,24 +89,25 @@
</build>
<dependencies>
+
+ <!-- 3rd-party -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- <version>2.1</version>
-<!-- <scope>test</scope>-->
</dependency>
<dependency>
<groupId>org.uncommons.maths</groupId>
<artifactId>uncommons-maths</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>r03</version>
</dependency>
+
+ <!-- it's not a module even though it has same group id.
+ Hence, considered a 3rd-party -->
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-collections</artifactId>
@@ -118,19 +117,16 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>1.3</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>
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Tue Apr 5 02:49:08 2011
@@ -152,6 +152,13 @@
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>mahout-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<artifactId>mahout-math</artifactId>
@@ -201,7 +208,12 @@
<artifactId>lucene-wikipedia</artifactId>
<version>3.0.2</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-commons-csv</artifactId>
+ <version>1.4.1</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -336,6 +348,12 @@
</dependency>
<dependency>
+ <groupId>org.uncommons.maths</groupId>
+ <artifactId>uncommons-maths</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
@@ -346,12 +364,23 @@
<artifactId>watchmaker-framework</artifactId>
<version>0.6.2</version>
</dependency>
+ <dependency>
+ <groupId>org.uncommons.watchmaker</groupId>
+ <artifactId>watchmaker-swing</artifactId>
+ <version>0.6.2</version>
+ </dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.3.1</version>
</dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r03</version>
+ </dependency>
<dependency>
<groupId>org.apache.mahout.commons</groupId>
@@ -359,6 +388,26 @@
<version>2.0-mahout</version>
</dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.7.1</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=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/taste-web/pom.xml (original)
+++ mahout/trunk/taste-web/pom.xml Tue Apr 5 02:49:08 2011
@@ -114,10 +114,10 @@
<dependencies>
+ <!-- own modules -->
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-core</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -189,26 +189,22 @@
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</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>
Modified: mahout/trunk/utils/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/pom.xml?rev=1088864&r1=1088863&r2=1088864&view=diff
==============================================================================
--- mahout/trunk/utils/pom.xml (original)
+++ mahout/trunk/utils/pom.xml Tue Apr 5 02:49:08 2011
@@ -29,9 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-utils</artifactId>
- <version>0.5-SNAPSHOT</version>
<name>Mahout Utilities</name>
<description>Utilities for preparing content into formats for
Mahout.</description>
@@ -118,34 +116,32 @@
<dependencies>
+ <!-- own modules -->
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-core</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.mahout</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <!-- 3rd party -->
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
@@ -157,13 +153,11 @@
<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>
