mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject svn commit: r907007 - in /lucene/mahout/trunk: examples/pom.xml maven/pom.xml src/main/assembly/bin.xml src/main/assembly/xpp3-LICENSE.txt src/main/assembly/xstream-LICENSE.txt taste-web/pom.xml
Date Fri, 05 Feb 2010 17:12:40 GMT
Author: srowen
Date: Fri Feb  5 17:12:39 2010
New Revision: 907007

URL: http://svn.apache.org/viewvc?rev=907007&view=rev
Log:
MAHOUT-272

Added:
    lucene/mahout/trunk/src/main/assembly/xpp3-LICENSE.txt
    lucene/mahout/trunk/src/main/assembly/xstream-LICENSE.txt
Modified:
    lucene/mahout/trunk/examples/pom.xml
    lucene/mahout/trunk/maven/pom.xml
    lucene/mahout/trunk/src/main/assembly/bin.xml
    lucene/mahout/trunk/taste-web/pom.xml

Modified: lucene/mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=907007&r1=907006&r2=907007&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/pom.xml (original)
+++ lucene/mahout/trunk/examples/pom.xml Fri Feb  5 17:12:39 2010
@@ -192,6 +192,12 @@
       <groupId>org.uncommons.watchmaker</groupId>
       <artifactId>watchmaker-swing</artifactId>
       <version>0.6.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>jfree</groupId>
+          <artifactId>jfreechart</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -204,14 +210,6 @@
       <artifactId>easymockclassextension</artifactId>
     </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>

Modified: lucene/mahout/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/pom.xml?rev=907007&r1=907006&r2=907007&view=diff
==============================================================================
--- lucene/mahout/trunk/maven/pom.xml (original)
+++ lucene/mahout/trunk/maven/pom.xml Fri Feb  5 17:12:39 2010
@@ -208,6 +208,10 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>core</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
     </dependencies>

Modified: lucene/mahout/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/assembly/bin.xml?rev=907007&r1=907006&r2=907007&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/assembly/bin.xml (original)
+++ lucene/mahout/trunk/src/main/assembly/bin.xml Fri Feb  5 17:12:39 2010
@@ -20,7 +20,7 @@
       <binaries>
         <outputDirectory/>
         <unpack>false</unpack>
-         <dependencySets>
+        <dependencySets>
           <dependencySet>
             <excludes>
               <exclude>org.apache.mahout:*</exclude>
@@ -73,5 +73,12 @@
         <include>KEYS</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>src/main/assembly</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>*-LICENSE.txt</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>

Added: lucene/mahout/trunk/src/main/assembly/xpp3-LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/assembly/xpp3-LICENSE.txt?rev=907007&view=auto
==============================================================================
--- lucene/mahout/trunk/src/main/assembly/xpp3-LICENSE.txt (added)
+++ lucene/mahout/trunk/src/main/assembly/xpp3-LICENSE.txt Fri Feb  5 17:12:39 2010
@@ -0,0 +1,46 @@
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, 
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself, 
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
+must not be used to endorse or promote products derived from this 
+software without prior written permission. For written permission, 
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy" 
+name nor may "Indiana Univeristy" appear in their name, without prior 
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: lucene/mahout/trunk/src/main/assembly/xstream-LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/assembly/xstream-LICENSE.txt?rev=907007&view=auto
==============================================================================
    (empty)

Modified: lucene/mahout/trunk/taste-web/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/taste-web/pom.xml?rev=907007&r1=907006&r2=907007&view=diff
==============================================================================
--- lucene/mahout/trunk/taste-web/pom.xml (original)
+++ lucene/mahout/trunk/taste-web/pom.xml Fri Feb  5 17:12:39 2010
@@ -203,8 +203,9 @@
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>



Mime
View raw message