You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/04/27 16:56:02 UTC
svn commit: r769011 - in
/maven/components/branches/maven-2.1.x/apache-maven: LICENSE.txt NOTICE.txt
Author: brett
Date: Mon Apr 27 14:56:02 2009
New Revision: 769011
URL: http://svn.apache.org/viewvc?rev=769011&view=rev
Log:
add missing license notices
Modified:
maven/components/branches/maven-2.1.x/apache-maven/LICENSE.txt
maven/components/branches/maven-2.1.x/apache-maven/NOTICE.txt
Modified: maven/components/branches/maven-2.1.x/apache-maven/LICENSE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/LICENSE.txt?rev=769011&r1=769010&r2=769011&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/LICENSE.txt (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/LICENSE.txt Mon Apr 27 14:56:02 2009
@@ -175,3 +175,59 @@
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
+
+License for JSch
+
+------------------------------------------------------------------------------
+Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc.
+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 names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+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 JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 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.
+
+License for SLF4J
+
+Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
Modified: maven/components/branches/maven-2.1.x/apache-maven/NOTICE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/NOTICE.txt?rev=769011&r1=769010&r2=769011&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/NOTICE.txt (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/NOTICE.txt Mon Apr 27 14:56:02 2009
@@ -11,7 +11,10 @@
The Codehaus Foundation (http://www.codehaus.org/).
This product includes software (JSCH) developed by
-JCraft Inc. (http://www.jcraft.com/).
+JCraft Inc. (http://www.jcraft.com/jsch/).
-This product includes software (JTidy) developed by
-SourceForge (http://www.sourceforge.net/).
+This product includes software (JTidy) developed at
+SourceForge (http://sourceforge.net/projects/jtidy).
+
+This product includes software (NekoHTML) developed at
+SourceForge (http://sourceforge.net/projects/nekohtml).