You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2011/05/28 10:58:58 UTC
svn commit: r1128572 - in /mahout/trunk: LICENSE.txt NOTICE.txt
distribution/src/main/assembly/bin.xml
distribution/src/main/assembly/xpp3-LICENSE.txt
distribution/src/main/assembly/xstream-LICENSE.txt
src/main/appended-resources/META-INF/ utils/pom.xml
Author: srowen
Date: Sat May 28 08:58:58 2011
New Revision: 1128572
URL: http://svn.apache.org/viewvc?rev=1128572&view=rev
Log:
Attempt to clean up license locations and fix their inclusion in bin artifacts
Removed:
mahout/trunk/distribution/src/main/assembly/xpp3-LICENSE.txt
mahout/trunk/distribution/src/main/assembly/xstream-LICENSE.txt
mahout/trunk/src/main/appended-resources/META-INF/
Modified:
mahout/trunk/LICENSE.txt
mahout/trunk/NOTICE.txt
mahout/trunk/distribution/src/main/assembly/bin.xml
mahout/trunk/utils/pom.xml
Modified: mahout/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/mahout/trunk/LICENSE.txt?rev=1128572&r1=1128571&r2=1128572&view=diff
==============================================================================
--- mahout/trunk/LICENSE.txt (original)
+++ mahout/trunk/LICENSE.txt Sat May 28 08:58:58 2011
@@ -388,6 +388,59 @@ CONTRACT, STRICT LIABILITY, OR TORT (INC
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
+
+==========================================================
+The following license applies to the XPP package
+==========================================================
+
+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.
+
+
==========================================================
The following license applies to the JUnit package
==========================================================
Modified: mahout/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/mahout/trunk/NOTICE.txt?rev=1128572&r1=1128571&r2=1128572&view=diff
==============================================================================
--- mahout/trunk/NOTICE.txt (original)
+++ mahout/trunk/NOTICE.txt Sat May 28 08:58:58 2011
@@ -1 +1,44 @@
-Please see the file src/main/appended-resources/META-INF/NOTICE
\ No newline at end of file
+==============================================================
+ Apache Mahout
+ Copyright 2009 The Apache Software Foundation
+==============================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Includes software from other Apache Software Foundation projects,
+including, but not limited to:
+ - Apache Lucene Java
+ - Apache Hadoop
+ - Apache Commons
+
+This product includes software developed by the Indiana University
+ Extreme! Lab (http://www.extreme.indiana.edu/).
+ Copyright (c) 2002 Extreme! Lab, Indiana University.
+
+This product includes examples code from the Watchmaker project
+ https://watchmaker.dev.java.net/
+ Copyright (c) 2006-2009 Daniel W. Dyer.
+
+This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/)
+Copyright (c) 2008 James Murty
+
+This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
+Copyright (c) 2008, cglib
+
+This product includes a JUnit jar: http://junit.sourceforge.net/
+License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
+Copyright (c) 2000-2006, www.hamcrest.org
+
+This product includes code from the XStream project (http://xstream.codehaus.org/)
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+
+This product includes tests written with EasyMock
+Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
+
+This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
+UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)].
+
+This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
+Copyright (c) 2005, Regents of the University of California
Modified: mahout/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/distribution/src/main/assembly/bin.xml?rev=1128572&r1=1128571&r2=1128572&view=diff
==============================================================================
--- mahout/trunk/distribution/src/main/assembly/bin.xml (original)
+++ mahout/trunk/distribution/src/main/assembly/bin.xml Sat May 28 08:58:58 2011
@@ -11,7 +11,7 @@
<fileSets>
<fileSet>
- <directory>../examples/target/dependency</directory>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
<includes>
<include>*.jar</include>
</includes>
@@ -21,111 +21,106 @@
<outputDirectory>lib</outputDirectory>
</fileSet>
<fileSet>
- <directory>../examples/target/dependency</directory>
+ <directory>${project.basedir}/../examples/target/dependency</directory>
<includes>
<include>mahout-collections*.jar</include>
</includes>
<outputDirectory>lib</outputDirectory>
</fileSet>
<fileSet>
- <directory>../math/target</directory>
+ <directory>${project.basedir}/../math/target</directory>
<includes>
<include>mahout-*.jar</include>
</includes>
<excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
</excludes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>../core/target</directory>
+ <directory>${project.basedir}/../core/target</directory>
<includes>
<include>mahout-*.job</include>
<include>mahout-*.jar</include>
</includes>
<excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
</excludes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>../utils/target</directory>
+ <directory>${project.basedir}/../utils/target</directory>
<includes>
<include>mahout-*.job</include>
<include>mahout-*.jar</include>
</includes>
<excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
</excludes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>../examples/target</directory>
+ <directory>${project.basedir}/../examples/target</directory>
<includes>
<include>mahout-*.jar</include>
<include>mahout-*.job</include>
</includes>
<excludes>
- <exclude>*sources.jar</exclude>
- <exclude>*javadoc.jar</exclude>
- <exclude>*tests.jar</exclude>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
</excludes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>../taste-web/target</directory>
+ <directory>${project.basedir}/../taste-web/target</directory>
<includes>
<include>mahout-*.war</include>
</includes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>../collections/target/apidocs</directory>
+ <directory>${project.basedir}/../collections/target/apidocs</directory>
<outputDirectory>docs/mahout-collections</outputDirectory>
</fileSet>
<fileSet>
- <directory>../math/target/apidocs</directory>
+ <directory>${project.basedir}/../math/target/apidocs</directory>
<outputDirectory>docs/mahout-math</outputDirectory>
</fileSet>
<fileSet>
- <directory>../core/target/apidocs</directory>
+ <directory>${project.basedir}/../core/target/apidocs</directory>
<outputDirectory>docs/mahout-core</outputDirectory>
</fileSet>
<fileSet>
- <directory>../utils/target/apidocs</directory>
+ <directory>${project.basedir}/../utils/target/apidocs</directory>
<outputDirectory>docs/mahout-utils</outputDirectory>
</fileSet>
<fileSet>
- <directory>../examples/target/apidocs</directory>
+ <directory>${project.basedir}/../examples/target/apidocs</directory>
<outputDirectory>docs/mahout-examples</outputDirectory>
</fileSet>
<fileSet>
- <directory></directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
<includes>
- <include>../README*</include>
- <include>../LICENSE*</include>
- <include>../NOTICE*</include>
- <include>KEYS</include>
+ <include>**/README*</include>
+ <include>**/LICENSE*</include>
+ <include>**/NOTICE*</include>
+ <include>**/*.properties</include>
</includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>src/main/assembly</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*-LICENSE.txt</include>
- </includes>
- <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>target/**</exclude>
+ </excludes>
</fileSet>
<fileSet>
- <directory>../bin</directory>
+ <directory>${project.basedir}/../bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>mahout</include>
@@ -133,12 +128,12 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>../src/conf</directory>
+ <directory>${project.basedir}/../src/conf</directory>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>../examples/bin</directory>
+ <directory>${project.basedir}/../examples/bin</directory>
<outputDirectory>examples/bin</outputDirectory>
<fileMode>0755</fileMode>
<excludes>
Modified: mahout/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/pom.xml?rev=1128572&r1=1128571&r2=1128572&view=diff
==============================================================================
--- mahout/trunk/utils/pom.xml (original)
+++ mahout/trunk/utils/pom.xml Sat May 28 08:58:58 2011
@@ -36,36 +36,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>
- ${project.build.directory}/classes/META-INF
- </outputDirectory>
- <resources>
- <resource>
- <directory>..</directory>
- <includes>
- <include>README.txt</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>