Author: brett
Date: Mon Apr 27 14:30:12 2009
New Revision: 769001
URL: http://svn.apache.org/viewvc?rev=769001&view=rev
Log:
revert r610773 which incorrectly removed notice requirements
Merged from: r768995
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 14:30:12 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
+/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/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:30:12 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
+/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/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=769001&r1=769000&r2=769001&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
14:30:12 2009
@@ -175,28 +175,3 @@
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
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=769001&r1=769000&r2=769001&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
14:30:12 2009
@@ -9,3 +9,9 @@
This product includes software (Plexus and Classworlds) developed by
The Codehaus Foundation (http://www.codehaus.org/).
+
+This product includes software (JSCH) developed by
+JCraft Inc. (http://www.jcraft.com/).
+
+This product includes software (JTidy) developed by
+SourceForge (http://www.sourceforge.net/).
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:30:12 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
+/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
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:30:12 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
+/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
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:30:12 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
+/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
