svn commit: r1702837 - in /db/derby/code/branches/10.12: ./ NOTICE

[rh...@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.