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:03:15 UTC
svn commit: r768995 - in
/maven/components/branches/maven-2.1.x/apache-maven: LICENSE.txt NOTICE.txt
Author: brett
Date: Mon Apr 27 14:03:15 2009
New Revision: 768995
URL: http://svn.apache.org/viewvc?rev=768995&view=rev
Log:
revert r610773 which incorrectly removed notice requirements
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=768995&r1=768994&r2=768995&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:03:15 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.1.x/apache-maven/NOTICE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/NOTICE.txt?rev=768995&r1=768994&r2=768995&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:03:15 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/).