Author: jmannix
Date: Thu Jan 28 07:52:53 2010
New Revision: 903989
URL: http://svn.apache.org/viewvc?rev=903989&view=rev
Log:
Fixes MAHOUT-215, patch courtesy of Drew Farris.
Modified:
lucene/mahout/trunk/core/pom.xml
lucene/mahout/trunk/examples/pom.xml
lucene/mahout/trunk/math/pom.xml
lucene/mahout/trunk/maven/pom.xml
lucene/mahout/trunk/pom.xml
Modified: lucene/mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=903989&r1=903988&r2=903989&view=diff
==============================================================================
--- lucene/mahout/trunk/core/pom.xml (original)
+++ lucene/mahout/trunk/core/pom.xml Thu Jan 28 07:52:53 2010
@@ -83,7 +83,6 @@
</executions>
</plugin>
-
<!-- Build the Job Jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -169,7 +168,7 @@
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.mahout</groupId>
@@ -255,6 +254,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.mahout.commons</groupId>
<artifactId>commons-cli</artifactId>
<version>2.0-mahout</version>
@@ -269,29 +273,25 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
+
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<version>1.0-rc5</version>
</dependency>
</dependencies>
-
+
<repositories>
<repository>
<id>Apache snapshots</id>
@@ -315,7 +315,6 @@
</repository>
</repositories>
-
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/tags/mahout-0.2-core</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/tags/mahout-0.2</developerConnection>
Modified: lucene/mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=903989&r1=903988&r2=903989&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/pom.xml (original)
+++ lucene/mahout/trunk/examples/pom.xml Thu Jan 28 07:52:53 2010
@@ -197,15 +197,11 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
- <scope>test</scope>
</dependency>
<!-- cglib contains nested dependencies that interfere with easymock,
@@ -219,8 +215,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
Modified: lucene/mahout/trunk/math/pom.xml
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/math/pom.xml?rev=903989&r1=903988&r2=903989&view=diff
==============================================================================
--- lucene/mahout/trunk/math/pom.xml (original)
+++ lucene/mahout/trunk/math/pom.xml Thu Jan 28 07:52:53 2010
@@ -72,27 +72,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>bin</descriptorRef>
- </descriptorRefs>
-
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <!-- this is used for inheritance merges -->
- <phase>package</phase>
- <!-- append to the packaging phase. -->
- <goals>
- <goal>single</goal>
- <!-- goals == mojos -->
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Modified: lucene/mahout/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/pom.xml?rev=903989&r1=903988&r2=903989&view=diff
==============================================================================
--- lucene/mahout/trunk/maven/pom.xml (original)
+++ lucene/mahout/trunk/maven/pom.xml Thu Jan 28 07:52:53 2010
@@ -13,7 +13,7 @@
</parent>
<!-- Keep this in sync with the values in mahout-core pom.xml -->
<properties>
- <junit.version>4.7</junit.version>
+ <junit.version>4.7</junit.version>
<tagBase>https://svn.apache.org/repos/asf/lucene/mahout</tagBase>
<lucene.version>2.9.1</lucene.version>
<hadoop.version>0.20.2-SNAPSHOT</hadoop.version>
@@ -128,6 +128,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
@@ -326,6 +338,39 @@
</build>
<profiles>
<profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>sourcecheck</id>
<build>
<plugins>
Modified: lucene/mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=903989&r1=903988&r2=903989&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Thu Jan 28 07:52:53 2010
@@ -31,7 +31,7 @@
<module>taste-web</module>
<module>examples</module>
<module>utils</module>
- <module>collections-codegen-plugin</module>
+ <module>collections-codegen-plugin</module>
</modules>
<build>
@@ -73,21 +73,36 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
<executions>
<execution>
- <id>make-assembly</id>
- <!-- this is used for inheritance merges -->
- <phase>package</phase>
- <!-- append to the packaging phase. -->
+ <id>bin-assembly</id>
+ <phase>verify</phase>
<goals>
<goal>single</goal>
- <!-- goals == mojos -->
</goals>
<configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src-assembly</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
@@ -123,4 +138,4 @@
</site>
</distributionManagement>
</project>
-
+
