aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasaha <none@none>2014-12-22 09:23:29 -0800
committerasaha <none@none>2014-12-22 09:23:29 -0800
commit4182ae9baf160ebcdd0e81ef15d8010d7e94041d (patch)
tree81758f9a24608d2cb040ef6aeedb1968b20fa548
parenta00b432e10a9a766dbcc74d98d2706b26900e017 (diff)
parent3ebc545caeaf71b73cdb5d3cc226329695ab34a9 (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 9d5f671..c4ce5d1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -366,5 +366,6 @@ d36513f2cf934eb2f6f665a259cbbf2af82930c0 jdk8u40-b14
0d3a452720a58bc203869ad606a4ea346c14c291 jdk8u40-b16
bff1a326ac97c543b9c271adebc9deeda974edb1 jdk8u40-b17
a1e2c13de84e00f2aedf4c40e96347306ede84f3 jdk8u40-b18
+8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u40-b19
5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01
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