You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/01/30 23:47:57 UTC
svn commit: r1238061 - in
/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF:
LICENSE NOTICE
Author: ate
Date: Mon Jan 30 22:47:56 2012
New Revision: 1238061
URL: http://svn.apache.org/viewvc?rev=1238061&view=rev
Log:
RAVE-437: Check and cleanup of NOTICE files to only include 3rd party usages which require a (separate) notice.
- Add missing X License for ICU4J library to the LICENSE file and remove not required notice for it from the NOTICE file.
Modified:
incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE
incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE
Modified: incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE?rev=1238061&r1=1238060&r2=1238061&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE Mon Jan 30 22:47:56 2012
@@ -606,4 +606,38 @@ after the cause of action arose. Each pa
any resulting litigation.
===============================================================================
+For ICU4J:
+The X License
+
+ICU License - ICU 1.8.1 and later
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2011 International Business Machines Corporation and others
+
+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, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+provided that the above copyright notice(s) and this permission notice appear
+in all copies of the Software and that both the above copyright notice(s) and
+this permission notice appear in supporting documentation.
+
+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 OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
+LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization of the copyright holder.
+
+===============================================================================
Modified: incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE?rev=1238061&r1=1238060&r2=1238061&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE Mon Jan 30 22:47:56 2012
@@ -12,10 +12,6 @@ This product includes unmodified, binary
the HTML Parser community (http://htmlparser.sourceforge.net), which is licensed under the Common Public License.
An original copy of the license can be found at http://htmlparser.sourceforge.net/license.html
-This product includes unmodified, binary redistributions of software (ICU4J) developed by
-the ICU Project (http://site.icu-project.org), which is licensed under the X License.
-An original copy of the license can be found at http://source.icu-project.org/repos/icu/icu4j/tags/release-4-8/main/shared/licenses/license.html
-
This product includes unmodified, binary redistributions of software (JDOM) developed by
The JDOM Project (http://www.jdom.org), which is licensed under the license noted in LICENSE.txt.