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/02/02 03:25:14 UTC
svn commit: r1239439 - in
/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF:
LICENSE NOTICE
Author: ate
Date: Thu Feb 2 02:25:14 2012
New Revision: 1239439
URL: http://svn.apache.org/viewvc?rev=1239439&view=rev
Log:
RAVE-437: Check and cleanup of NOTICE files to only include 3rd party usages which require a (separate) notice.
- remove incorrect NOTICE and LICENSE for joda-time which is AL license 2.0, different from joda project itself.
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=1239439&r1=1239438&r2=1239439&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 Thu Feb 2 02:25:14 2012
@@ -256,60 +256,6 @@ OTHER DEALINGS IN THE SOFTWARE.
===============================================================================
-Joda Software License, Version 1.0
- *
- *
- * Copyright (c) 2001-2004 Stephen Colebourne.
- * 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 end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Joda project (http://www.joda.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The name "Joda" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact licence@joda.org.
- *
- * 5. Products derived from this software may not be called "Joda",
- * nor may "Joda" appear in their name, without prior written
- * permission of the Joda project.
- *
- * 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 THE JODA AUTHORS OR THE PROJECT
- * CONTRIBUTORS 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Joda project and was originally
- * created by Stephen Colebourne <sc...@joda.org>. For more
- * information on the Joda project, please see <http://www.joda.org/>.
-
-===============================================================================
-
For protocol buffers
Copyright 2008, Google Inc.
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=1239439&r1=1239438&r2=1239439&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 Thu Feb 2 02:25:14 2012
@@ -12,8 +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 software developed by the Joda project (http://www.joda.org/).
-
This product includes unmodified, binary redistributions of software (ROME Modules) developed by
Sun Microsystems, Inc. (https://rometools.jira.com/wiki/display/MODULES/Home),
which is dual licensed under the LGPL or the Apache 2.0 license, and included here using the Apache 2.0 license.