Return-Path: X-Original-To: apmail-incubator-rave-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-rave-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 59B4A9FAF for ; Wed, 1 Feb 2012 14:42:45 +0000 (UTC) Received: (qmail 26092 invoked by uid 500); 1 Feb 2012 14:42:45 -0000 Delivered-To: apmail-incubator-rave-commits-archive@incubator.apache.org Received: (qmail 26045 invoked by uid 500); 1 Feb 2012 14:42:45 -0000 Mailing-List: contact rave-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: rave-dev@incubator.apache.org Delivered-To: mailing list rave-commits@incubator.apache.org Received: (qmail 26038 invoked by uid 99); 1 Feb 2012 14:42:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 14:42:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 14:42:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 619C5238890D; Wed, 1 Feb 2012 14:42:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239152 - /incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE Date: Wed, 01 Feb 2012 14:42:21 -0000 To: rave-commits@incubator.apache.org From: mfranklin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120201144221.619C5238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mfranklin Date: Wed Feb 1 14:42:20 2012 New Revision: 1239152 URL: http://svn.apache.org/viewvc?rev=1239152&view=rev Log: RAVE-437: Check and cleanup of NOTICE files to only include 3rd party usages which require a (separate) notice. - Removed NOTICE for SXIP & GUICE, both ASL 2.0 without NOTICE file Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE?rev=1239152&r1=1239151&r2=1239152&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE (original) +++ incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE Wed Feb 1 14:42:20 2012 @@ -15,17 +15,10 @@ An original copy of the license can be f This product includes unmodified, binary redistributions of software (Joda Time) developed by The Joda project (http://joda.org), which is licensed under the Joda Software License. -This product includes unmodified, binary redistributions of software (OpenId4Java) developed by -Sxip Identity Corporation (http://code.google.com/p/openid4java), which is licensed under the Apache 2 license. - -This product includes unmodified, binary redistributions of software (Guice) developed by -Google Inc (http://code.google.com/p/google-guice), which is licensed under the Apache 2 license. - This product includes unmodified, binary & source redistributions of software (Java Concurrency in Practice) developed by Brian Goetz and Tim Peierls (http://jcip.net), which is licensed under the Creative Commons Attribution License. -This product includes unmodified, binary redisributions of software (org.json.*) developed by -JSON.org (http://json.org) +This product includes unmodified, binary redisributions of software (org.json.*) developed by JSON.org (http://json.org) This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/), which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License)