You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2015/09/13 23:35:10 UTC
svn commit: r1702834 - in /db/derby/code/branches/10.12: ./ build.xml
Author: rhillegas
Date: Sun Sep 13 21:35:08 2015
New Revision: 1702834
URL: http://svn.apache.org/r1702834
Log:
DERBY-6811: Port 1702830 from trunk to the 10.12 branch.
Modified:
db/derby/code/branches/10.12/ (props changed)
db/derby/code/branches/10.12/build.xml
Propchange: db/derby/code/branches/10.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 13 21:35:08 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
+/db/derby/code/trunk:1063809,1702820-1702830
Modified: db/derby/code/branches/10.12/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.12/build.xml?rev=1702834&r1=1702833&r2=1702834&view=diff
==============================================================================
--- db/derby/code/branches/10.12/build.xml (original)
+++ db/derby/code/branches/10.12/build.xml Sun Sep 13 21:35:08 2015
@@ -2155,6 +2155,7 @@
<antcall target="appendnotice"><param name="sourcefile" value="jdbcstubs.txt"/></antcall>
<antcall target="appendnotice"><param name="sourcefile" value="felix.txt"/></antcall>
<antcall target="appendnotice"><param name="sourcefile" value="lucene.txt"/></antcall>
+ <antcall target="appendnotice"><param name="sourcefile" value="simpleJson.txt"/></antcall>
<antcall target="checkinfile">
<param name="checkinComment" value="Check in NOTICE as part of building a release."/>