Author: brett
Date: Mon Apr 27 14:45:06 2009
New Revision: 769006
URL: http://svn.apache.org/viewvc?rev=769006&view=rev
Log:
revert r610773 which incorrectly removed notice requirements
Merged from: r768995
Modified:
maven/components/branches/maven-2.2.x/ (props changed)
maven/components/branches/maven-2.2.x/apache-maven/ (props changed)
maven/components/branches/maven-2.2.x/apache-maven/LICENSE.txt
maven/components/branches/maven-2.2.x/apache-maven/NOTICE.txt
maven/components/branches/maven-2.2.x/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
(props changed)
maven/components/branches/maven-2.2.x/maven-integration-tests/ (props
changed)
maven/components/branches/maven-2.2.x/maven-model/src/test/ (props
changed)
maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
(props changed)
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
(props changed)
Propchange: maven/components/branches/maven-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -2,6 +2,6 @@
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x:751686,767628,767631,768817
+/maven/components/branches/maven-2.1.x:751686,767628,767631,768817,768995
/maven/components/trunk:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379:678167
Propchange: maven/components/branches/maven-2.2.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -2,7 +2,7 @@
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543,746038
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/apache-maven:751686,767628,767631
+/maven/components/branches/maven-2.1.x/apache-maven:751686,767628,767631,768995
/maven/components/trunk/apache-maven:720001,721902,726845,727688
/maven/components/trunk/maven-distribution:727688
/maven/sandbox/branches/maven/MNG-3379/apache-maven:678167
Modified: maven/components/branches/maven-2.2.x/apache-maven/LICENSE.txt
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/apache-maven/LICENSE.txt?rev=769006&r1=769005&r2=769006&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/apache-maven/LICENSE.txt (original)
+++ maven/components/branches/maven-2.2.x/apache-maven/LICENSE.txt Mon Apr 27
14:45:06 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.2.x/apache-maven/NOTICE.txt
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/apache-maven/NOTICE.txt?rev=769006&r1=769005&r2=769006&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/apache-maven/NOTICE.txt (original)
+++ maven/components/branches/maven-2.2.x/apache-maven/NOTICE.txt Mon Apr 27
14:45:06 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.2.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:728834
/maven/components/branches/maven-2.0.x/apache-maven/src/test:736543
/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,767628,767631
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,767628,767631,768995
Propchange:
maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -4,6 +4,6 @@
/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:688883,689695,689976,689990
/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:752168,752622,752653,753320,755199,755215
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:751686,753648,754505,754542
-/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:767628,767631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:767628,767631,768995
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:678167
Propchange: maven/components/branches/maven-2.2.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:728834
/maven/components/branches/maven-2.0.x/maven-integration-tests:736543
/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,767628,767631
+/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,767628,767631,768995
Propchange: maven/components/branches/maven-2.2.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:728834
/maven/components/branches/maven-2.0.x/maven-model/src/test:736543
/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,767628,767631
+/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,767628,767631,768995
Propchange:
maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259,725329-725330,725342,725349,725359
/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
-/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,767628,767631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,767628,767631,768995
Propchange:
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 14:45:06 2009
@@ -1 +1 @@
-/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796
+/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796,768995
