Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EBE581726B for ; Sun, 13 Sep 2015 21:41:59 +0000 (UTC) Received: (qmail 66371 invoked by uid 500); 13 Sep 2015 21:41:59 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 66342 invoked by uid 500); 13 Sep 2015 21:41:59 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 66333 invoked by uid 99); 13 Sep 2015 21:41:59 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Sep 2015 21:41:59 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B5CF1AC0098 for ; Sun, 13 Sep 2015 21:41:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1702837 - in /db/derby/code/branches/10.12: ./ NOTICE Date: Sun, 13 Sep 2015 21:41:59 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150913214159.B5CF1AC0098@hades.apache.org> Author: rhillegas Date: Sun Sep 13 21:41:59 2015 New Revision: 1702837 URL: http://svn.apache.org/r1702837 Log: DERBY-6811: Port 1702836 from trunk to the 10.12 branch. Modified: db/derby/code/branches/10.12/ (props changed) db/derby/code/branches/10.12/NOTICE Propchange: db/derby/code/branches/10.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 13 21:41:59 2015 @@ -1,4 +1,4 @@ /db/derby/code/branches/10.7:1061570,1061578,1082235 /db/derby/code/branches/10.8:1177474,1234973,1464951 /db/derby/code/branches/10.9:1373148 -/db/derby/code/trunk:1063809,1702820-1702830 +/db/derby/code/trunk:1063809,1702820-1702830,1702836 Modified: db/derby/code/branches/10.12/NOTICE URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.12/NOTICE?rev=1702837&r1=1702836&r2=1702837&view=diff ============================================================================== --- db/derby/code/branches/10.12/NOTICE (original) +++ db/derby/code/branches/10.12/NOTICE Sun Sep 13 21:41:59 2015 @@ -291,3 +291,10 @@ grants independently of ICOT any specifi writing, such person, organization or entity, will also be exempted from and not be held liable to the user for any such damages as noted above as far as the program is concerned. + +========================================================================= + +The Derby build relies on a jar file supplied by the JSON Simple +project, hosted at https://code.google.com/p/json-simple/. +The JSON simple jar file is licensed under the Apache 2.0 License. +No other notice covers that jar file.