You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by gs...@apache.org on 2009/11/12 00:22:47 UTC
svn commit: r835150 - in /lucene/mahout/trunk: core/lib/ core/pom.xml
examples/pom.xml maven/pom.xml pom.xml
src/main/appended-resources/supplemental-models.xml taste-web/pom.xml
Author: gsingers
Date: Wed Nov 11 23:22:43 2009
New Revision: 835150
URL: http://svn.apache.org/viewvc?rev=835150&view=rev
Log:
MAHOUT-198: clean up libs, poms, etc.
Removed:
lucene/mahout/trunk/core/lib/
Modified:
lucene/mahout/trunk/core/pom.xml
lucene/mahout/trunk/examples/pom.xml
lucene/mahout/trunk/maven/pom.xml
lucene/mahout/trunk/pom.xml
lucene/mahout/trunk/src/main/appended-resources/supplemental-models.xml
lucene/mahout/trunk/taste-web/pom.xml
Modified: lucene/mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=835150&r1=835149&r2=835150&view=diff
==============================================================================
--- lucene/mahout/trunk/core/pom.xml (original)
+++ lucene/mahout/trunk/core/pom.xml Wed Nov 11 23:22:43 2009
@@ -66,261 +66,7 @@
</executions>
</plugin>
- <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository -->
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <!-- hadoop -->
-
- <executions>
- <execution>
- <id>create-hadoop-core-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/hadoop-core-${hadoop.version}.jar</file>
- <groupId>org.apache.mahout.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <packaging>jar</packaging>
- <version>${hadoop.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-hbase-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/hbase-${hbase.version}.jar</file>
- <groupId>org.apache.mahout.hbase</groupId>
- <artifactId>hbase</artifactId>
- <packaging>jar</packaging>
- <version>${hbase.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-kfs-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/kfs-${kfs.version}.jar</file>
- <groupId>org.apache.mahout.kosmofs</groupId>
- <artifactId>kfs</artifactId>
- <packaging>jar</packaging>
- <version>${kfs.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-jets3t-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/jets3t-${jets3t.version}.jar</file>
- <groupId>org.apache.mahout.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <packaging>jar</packaging>
- <version>${jets3t.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-watchmaker-framework-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/watchmaker-framework-${watchmaker.version}.jar</file>
- <groupId>org.apache.mahout.watchmaker</groupId>
- <artifactId>watchmaker-framework</artifactId>
- <packaging>jar</packaging>
- <version>${watchmaker.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-watchmaker-swing-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/watchmaker-swing-${watchmaker.version}.jar</file>
- <groupId>org.apache.mahout.watchmaker</groupId>
- <artifactId>watchmaker-swing</artifactId>
- <packaging>jar</packaging>
- <version>${watchmaker.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-uncommons-math-artifact</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/uncommons-maths-${uncommons.maths.version}.jar</file>
- <groupId>org.apache.mahout.uncommons.math</groupId>
- <artifactId>uncommons-math</artifactId>
- <packaging>jar</packaging>
- <version>${uncommons.maths.version}</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- <execution>
- <id>create-commons-cli</id>
- <phase>validate</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>lib/commons-cli-2.0-mahout.jar</file>
- <groupId>org.apache.mahout.commons</groupId>
- <artifactId>commons-cli</artifactId>
- <packaging>jar</packaging>
- <version>2.0-mahout</version>
- <generatePom>true</generatePom>
- <createChecksum>true</createChecksum>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
- <url>${deploy.url}</url>
- <repositoryId>mahout.dist</repositoryId>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- <executions>
- <execution>
- <id>create-hadoop-core-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/hadoop-core-${hadoop.version}.jar</file>
- <groupId>org.apache.mahout.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <packaging>jar</packaging>
- <version>${hadoop.version}</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-kfs-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/kfs-${kfs.version}.jar</file>
- <groupId>org.apache.mahout.kosmofs</groupId>
- <artifactId>kfs</artifactId>
- <packaging>jar</packaging>
- <version>${kfs.version}</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-jets3t-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/jets3t-${jets3t.version}.jar</file>
- <groupId>org.apache.mahout.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <packaging>jar</packaging>
- <version>${jets3t.version}</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-watchmaker-framework-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/watchmaker-framework-${watchmaker.version}.jar</file>
- <groupId>org.apache.mahout.watchmaker</groupId>
- <artifactId>watchmaker-framework</artifactId>
- <packaging>jar</packaging>
- <version>${watchmaker.version}</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-watchmaker-swing-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/watchmaker-swing-${watchmaker.version}.jar</file>
- <groupId>org.apache.mahout.watchmaker</groupId>
- <artifactId>watchmaker-swing</artifactId>
- <packaging>jar</packaging>
- <version>${watchmaker.version}</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-uncommons-math-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/uncommons-maths-${uncommons.maths.version}.jar</file>
- <groupId>org.apache.mahout.uncommons.math</groupId>
- <artifactId>uncommons-math</artifactId>
- <packaging>jar</packaging>
- <version>${uncommons.maths.version}</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-commons-cli</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy-file</goal>
- </goals>
- <configuration>
- <file>lib/commons-cli-2.0-mahout.jar</file>
- <groupId>org.apache.mahout.commons</groupId>
- <artifactId>commons-cli</artifactId>
- <packaging>jar</packaging>
- <version>2.0-mahout</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
+
<!-- Build the Job Jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -414,30 +160,30 @@
<dependency>
<groupId>org.apache.mahout.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
+ <version>0.20.1</version>
</dependency>
<dependency>
<groupId>org.apache.mahout.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
+ <version>0.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.mahout.kosmofs</groupId>
<artifactId>kfs</artifactId>
- <version>${kfs.version}</version>
+ <version>0.3</version>
</dependency>
<dependency>
<groupId>org.apache.mahout.jets3t</groupId>
<artifactId>jets3t</artifactId>
- <version>${jets3t.version}</version>
+ <version>0.7.1</version>
</dependency>
<dependency>
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
- <version>${xmlenc.version}</version>
+ <version>0.52</version>
</dependency>
<dependency>
@@ -505,21 +251,21 @@
<dependency>
- <groupId>org.apache.mahout.watchmaker</groupId>
+ <groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-framework</artifactId>
- <version>${watchmaker.version}</version>
+ <version>0.6.2</version>
</dependency>
<dependency>
- <groupId>org.apache.mahout.watchmaker</groupId>
+ <groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-swing</artifactId>
- <version>${watchmaker.version}</version>
+ <version>0.6.2</version>
</dependency>
<dependency>
- <groupId>org.apache.mahout.uncommons.math</groupId>
- <artifactId>uncommons-math</artifactId>
- <version>${uncommons.maths.version}</version>
+ <groupId>org.uncommons</groupId>
+ <artifactId>uncommons-maths</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
@@ -549,7 +295,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
Modified: lucene/mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=835150&r1=835149&r2=835150&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/pom.xml (original)
+++ lucene/mahout/trunk/examples/pom.xml Wed Nov 11 23:22:43 2009
@@ -72,44 +72,6 @@
<goal>run</goal>
</goals>
</execution>
- <!--<execution>
- <id>get-20news</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks if="get.20news">
- <ant antfile="../maven/build.xml" target="get-files">
- <property name="dest" value="${project.build.directory}" />
- <property name="fullnamever" value="${project.artifactId}-${project.version}" />
- <property name="core-lib" value="../core/lib" />
- <property name="shared-lib" value="../lib" />
- <property name="version" value="${project.version}" />
- </ant>
- </tasks>
-
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>-->
- <!--<execution>
- <id>get-enwiki</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks if="get.enwiki">
- <ant antfile="../maven/build.xml" target="enwiki-files">
- <property name="dest" value="${project.build.directory}" />
- <property name="fullnamever" value="${project.artifactId}-${project.version}" />
- <property name="core-lib" value="../core/lib" />
- <property name="shared-lib" value="../lib" />
- <property name="version" value="${project.version}" />
- </ant>
- </tasks>
-
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>-->
</executions>
</plugin>
@@ -187,7 +149,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-benchmark</artifactId>
- <version>2.9.0</version>
+ <version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -226,7 +188,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
Modified: lucene/mahout/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/pom.xml?rev=835150&r1=835149&r2=835150&view=diff
==============================================================================
--- lucene/mahout/trunk/maven/pom.xml (original)
+++ lucene/mahout/trunk/maven/pom.xml Wed Nov 11 23:22:43 2009
@@ -13,16 +13,9 @@
</parent>
<!-- Keep this in sync with the values in mahout-core pom.xml -->
<properties>
- <junit.version>3.8.2</junit.version>
- <hadoop.version>0.20.1</hadoop.version>
- <hbase.version>0.20.0</hbase.version>
- <kfs.version>0.3</kfs.version>
- <xmlenc.version>0.52</xmlenc.version>
- <jets3t.version>0.7.1</jets3t.version>
- <uncommons.maths.version>1.2</uncommons.maths.version>
- <watchmaker.version>0.6.2</watchmaker.version>
+ <junit.version>3.8.2</junit.version>
<tagBase>https://svn.apache.org/repos/asf/lucene/mahout</tagBase>
- <lucene.version>2.9.0</lucene.version>
+ <lucene.version>2.9.1</lucene.version>
</properties>
<licenses>
<license>
Modified: lucene/mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=835150&r1=835149&r2=835150&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Wed Nov 11 23:22:43 2009
@@ -94,14 +94,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <configuration>
- <url>${deploy.url}</url>
- <repositoryId>mahout.dist</repositoryId>
- </configuration>
- <!--
- Keep these versions in sync
-
- -->
<executions>
<execution>
<id>sign-artifacts</id>
@@ -110,113 +102,9 @@
<goal>sign</goal>
</goals>
</execution>
- <execution>
- <id>create-hadoop-core-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/hadoop-core-0.20.1.jar</file>
- <groupId>org.apache.mahout.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <packaging>jar</packaging>
- <version>0.20.1</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-kfs-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/kfs-0.3.jar</file>
- <groupId>org.apache.mahout.kosmofs</groupId>
- <artifactId>kfs</artifactId>
- <packaging>jar</packaging>
- <version>0.3</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-jets3t-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/jets3t-0.7.1.jar</file>
- <groupId>org.apache.mahout.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <packaging>jar</packaging>
- <version>0.7.1</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-watchmaker-framework-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/watchmaker-framework-0.6.2.jar</file>
- <groupId>org.apache.mahout.watchmaker</groupId>
- <artifactId>watchmaker-framework</artifactId>
- <packaging>jar</packaging>
- <version>0.6.2</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-watchmaker-swing-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/watchmaker-swing-0.6.2.jar</file>
- <groupId>org.apache.mahout.watchmaker</groupId>
- <artifactId>watchmaker-swing</artifactId>
- <packaging>jar</packaging>
- <version>0.6.2</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-uncommons-math-artifact</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/uncommons-maths-1.2.jar</file>
- <groupId>org.apache.mahout.uncommons.math</groupId>
- <artifactId>uncommons-math</artifactId>
- <packaging>jar</packaging>
- <version>1.2</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>create-commons-cli</id>
- <phase>deploy</phase>
- <goals>
- <goal>sign-and-deploy-file</goal>
- </goals>
- <configuration>
- <file>${basedir}/core/lib/commons-cli-2.0-mahout.jar</file>
- <groupId>org.apache.mahout.commons</groupId>
- <artifactId>commons-cli</artifactId>
- <packaging>jar</packaging>
- <version>2.0-mahout</version>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
</executions>
</plugin>
+
</plugins>
</build>
</profile>
Modified: lucene/mahout/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/appended-resources/supplemental-models.xml?rev=835150&r1=835149&r2=835150&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ lucene/mahout/trunk/src/main/appended-resources/supplemental-models.xml Wed Nov 11 23:22:43 2009
@@ -333,8 +333,8 @@
<supplement>
<project>
<name>Uncommons Math</name>
- <groupId>org.apache.mahout.uncommons.math</groupId>
- <artifactId>uncommons-math</artifactId>
+ <groupId>org.uncommons</groupId>
+ <artifactId>uncommons-maths</artifactId>
<url>https://uncommons-maths.dev.java.net/</url>
<licenses>
<license>
@@ -348,7 +348,7 @@
<supplement>
<project>
<name>Watchmaker Framework</name>
- <groupId>org.apache.mahout.watchmaker</groupId>
+ <groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-framework</artifactId>
<url>https://watchmaker.dev.java.net/</url>
<licenses>
@@ -363,7 +363,7 @@
<supplement>
<project>
<name>Watchmaker Swing</name>
- <groupId>org.apache.mahout.watchmaker</groupId>
+ <groupId>org.uncommons.watchmaker</groupId>
<artifactId>watchmaker-swing</artifactId>
<url>https://watchmaker.dev.java.net/</url>
<licenses>
Modified: lucene/mahout/trunk/taste-web/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/taste-web/pom.xml?rev=835150&r1=835149&r2=835150&view=diff
==============================================================================
--- lucene/mahout/trunk/taste-web/pom.xml (original)
+++ lucene/mahout/trunk/taste-web/pom.xml Wed Nov 11 23:22:43 2009
@@ -210,7 +210,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>