rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject svn commit: r1239444 - /incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
Date Thu, 02 Feb 2012 02:31:53 GMT
Author: mfranklin
Date: Thu Feb  2 02:31:53 2012
New Revision: 1239444

URL: http://svn.apache.org/viewvc?rev=1239444&view=rev
Log:
RAVE-437: Check and cleanup of NOTICE files to only include 3rd party usages which require
a (separate) notice.
   - Found Joda time is licensed under ASL, not Joda

Modified:
    incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE

Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE?rev=1239444&r1=1239443&r2=1239444&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE Thu Feb
 2 02:31:53 2012
@@ -745,60 +745,6 @@ Copyright (c) 2004-2008 QOS.ch
  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR
  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 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 <scolebourne@joda.org>. For more
-  * information on the Joda project, please see <http://www.joda.org/>.
-
 ===============================================================================
 
 For XPP3:



Mime
View raw message