aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasaha <none@none>2014-12-17 12:49:40 -0800
committerasaha <none@none>2014-12-17 12:49:40 -0800
commit372edc2647bf50c9d6d119904934830aecc6a467 (patch)
treefa85827e0f1fa7aa13f7a2e12014ac141886e7c8
parenta8209dbbf28dbe2d17bb3c973d772cb449440e76 (diff)
parent302342aff861e4b7f20e82949cb907e81a9fb9a0 (diff)
Merge
-rw-r--r--.hgtags1
-rw-r--r--THIRD_PARTY_README2
2 files changed, 2 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 251aecc..1542c9f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -368,3 +368,4 @@ ed46c05af2570feed5ea264eca02f223055109e9 jdk8u40-b15
cda81fbeec94b31dba27a043fbf58f442524cdf5 jdk8u40-b16
cb63029168a52d62d82c3325f1092405c318e78c jdk8u40-b17
6103f5a8119a85937ae006f18b8dfc04f73315d0 jdk8u40-b18
+3b73732d6886dc8155f0c1fbb125ca60d9e2fd2b jdk8u40-b19
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index 6d1c60f..c34ce6b 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -3385,7 +3385,7 @@ with JRE 8, JDK 8, and OpenJDK 8.
included with JRE 8, JDK 8, and OpenJDK 8.
Apache Commons Math 3.2
- Apache Derby 10.10.1.3
+ Apache Derby 10.11.1.2
Apache Jakarta BCEL 5.1
Apache Jakarta Regexp 1.4
Apache Santuario XML Security for Java 1.5.4