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 17:06:24 UTC
svn commit: r769022 - in /maven/components/branches/maven-2.0.x: ./
apache-maven/ apache-maven/LICENSE.txt apache-maven/NOTICE.txt
apache-maven/src/test/ maven-integration-tests/ maven-model/src/test/
Author: brett
Date: Mon Apr 27 15:06:24 2009
New Revision: 769022
URL: http://svn.apache.org/viewvc?rev=769022&view=rev
Log:
add missing license notices
Merged from: r769011
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/LICENSE.txt
maven/components/branches/maven-2.0.x/apache-maven/NOTICE.txt
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props changed)
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props changed)
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props changed)
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:06:24 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
/maven/components/branches/maven-2.1.0-RC:753089
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796,766523,768995
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796,766523,768995,769010-769011
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:06:24 2009
@@ -1,6 +1,6 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
/maven/components/branches/maven-2.1.0-RC/apache-maven:753089
-/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Modified: maven/components/branches/maven-2.0.x/apache-maven/LICENSE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/LICENSE.txt?rev=769022&r1=769021&r2=769022&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/apache-maven/LICENSE.txt (original)
+++ maven/components/branches/maven-2.0.x/apache-maven/LICENSE.txt Mon Apr 27 15:06:24 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.0.x/apache-maven/NOTICE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/NOTICE.txt?rev=769022&r1=769021&r2=769022&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/apache-maven/NOTICE.txt (original)
+++ maven/components/branches/maven-2.0.x/apache-maven/NOTICE.txt Mon Apr 27 15:06:24 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).
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:06:24 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:753089
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:06:24 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:753089
-/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 15:06:24 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:753089
-/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997,766523,768995,769010-769011