You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ka...@apache.org on 2008/08/21 13:37:17 UTC
svn commit: r687716 - in /lucene/mahout/trunk: core/lib/ examples/
examples/lib/
Author: kalle
Date: Thu Aug 21 04:37:16 2008
New Revision: 687716
URL: http://svn.apache.org/viewvc?rev=687716&view=rev
Log:
MAHOUT-72
moved some libs from core to examples and added a couple of deps in the maven pom.
Added:
lucene/mahout/trunk/examples/lib/cglib-nodep-2.1_3.jar (props changed)
- copied unchanged from r687685, lucene/mahout/trunk/core/lib/cglib-nodep-2.1_3.jar
lucene/mahout/trunk/examples/lib/cglib-nodep-LICENSE.txt (props changed)
- copied unchanged from r687685, lucene/mahout/trunk/core/lib/cglib-nodep-LICENSE.txt
lucene/mahout/trunk/examples/lib/easymock-LICENSE.html (props changed)
- copied unchanged from r687685, lucene/mahout/trunk/core/lib/easymock-LICENSE.html
lucene/mahout/trunk/examples/lib/easymock.jar (props changed)
- copied unchanged from r687685, lucene/mahout/trunk/core/lib/easymock.jar
lucene/mahout/trunk/examples/lib/easymockclassextension-LICENSE.html (props changed)
- copied unchanged from r687685, lucene/mahout/trunk/core/lib/easymockclassextension-LICENSE.html
lucene/mahout/trunk/examples/lib/easymockclassextension.jar (props changed)
- copied unchanged from r687685, lucene/mahout/trunk/core/lib/easymockclassextension.jar
Removed:
lucene/mahout/trunk/core/lib/cglib-nodep-2.1_3.jar
lucene/mahout/trunk/core/lib/cglib-nodep-LICENSE.txt
lucene/mahout/trunk/core/lib/easymock-LICENSE.html
lucene/mahout/trunk/core/lib/easymock.jar
lucene/mahout/trunk/core/lib/easymockclassextension-LICENSE.html
lucene/mahout/trunk/core/lib/easymockclassextension.jar
Modified:
lucene/mahout/trunk/examples/build.xml
lucene/mahout/trunk/examples/pom.xml
Modified: lucene/mahout/trunk/examples/build.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/build.xml?rev=687716&r1=687715&r2=687716&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/build.xml (original)
+++ lucene/mahout/trunk/examples/build.xml Thu Aug 21 04:37:16 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+job<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -362,7 +362,7 @@
<zipfileset dir="${shared-lib}" prefix="lib"
includes="**/*.jar"/>
<zipfileset dir="${examples-lib}" prefix="lib"
- includes="**/*.jar"/>
+ includes="**/*.jar" excludes="easymock*.jar"/>
<zipfileset dir="${core-lib}" prefix="lib"
includes="**/*.jar" excludes="hadoop-*.jar"/>
<zipfileset dir="${basedir}/../core/dist/" prefix="lib" includes="apache-mahout-core-${version}.jar"/>
Propchange: lucene/mahout/trunk/examples/lib/cglib-nodep-2.1_3.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: lucene/mahout/trunk/examples/lib/cglib-nodep-2.1_3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: lucene/mahout/trunk/examples/lib/cglib-nodep-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/examples/lib/cglib-nodep-LICENSE.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: lucene/mahout/trunk/examples/lib/easymock-LICENSE.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/examples/lib/easymock-LICENSE.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: lucene/mahout/trunk/examples/lib/easymock.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: lucene/mahout/trunk/examples/lib/easymock.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: lucene/mahout/trunk/examples/lib/easymockclassextension-LICENSE.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/examples/lib/easymockclassextension-LICENSE.html
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: lucene/mahout/trunk/examples/lib/easymockclassextension.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: lucene/mahout/trunk/examples/lib/easymockclassextension.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=687716&r1=687715&r2=687716&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/pom.xml (original)
+++ lucene/mahout/trunk/examples/pom.xml Thu Aug 21 04:37:16 2008
@@ -74,6 +74,29 @@
<dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- cglib contains nested dependencies that interfere with easymock,
+ thus the cglib references needs to be below easymock -->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>