Merge

8003632: HPROF class file version java.lang.RuntimeException errors Reviewed-by: mchung, lancea

8000525: Java.net.httpcookie api does not support 2-digit year format Reviewed-by: chegar

8003890: corelibs test scripts should pass TESTVMOPTS Reviewed-by: chegar, alanb Contributed-by: Mark Sheppard <mark.sheppard@oracle.com>

Merge

7193792: sun/security/pkcs11/ec/TestECDSA.java failing intermittently Reviewed-by: vinnie, wetmore

8004675: Inet6Address.getHostAddress should use string scope identifier where available Summary: ...and some minor stylistic cleanup Reviewed-by: khazra, dsamersoff, michaelm

8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff

8004357: Implement various methods in SerialBlob/Clob/Array and specify Thread Safety Reviewed-by: naoto

8004235: Disable native JGSS provider on Mac Reviewed-by: erikj, valeriep

8004651: TEST: java/util/logging/CheckLockLocationTest.java failed to delete file (win) Summary: Failure to delete test log file should be a warning instead of test failure Reviewed-by: mduigou, smarks

8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung

8004337: java/sql tests aren't run in test/Makefile Reviewed-by: lancea, alanb

Merge

8004064: Downgrade normative references to ${java.home}/lib/security/java.security Reviewed-by: alanb, vinnie, xuelei

8004874: Reduce dependency on java.beans to only add/removePropertyChangeListener Reviewed-by: ksrini, mchung, dholmes

8004921: Trivial javadoc warnings in Base64 Reviewed-by: darcy

8004904: Makefile for ntlm Reviewed-by: erikj, chegar

8004905: Correct license of test to remove classpath exception Reviewed-by: akhil

8003246: Add InitialValue Supplier to ThreadLocal Reviewed-by: mduigou, forax, dl, chegar, briangoetz

8004488: wrong permissions checked in krb5 Reviewed-by: xuelei

6512101: Incorrect encoding in NetworkInterface.getDisplayName() Reviewed-by: chegar, dsamersoff

4819681: Typo in http://java.sun.com/j2se/1.4.1/docs/api/java/util/logging/LogManager.html Summary: Simple capitalization typo in LogManager() description Reviewed-by: darcy, mchung

8003948: NTLM/Negotiate authentication problem Reviewed-by: chegar, weijun

8000983: Support narrow display names for calendar fields 8003267: Support generic time zone names in TimeZoneNameProvider (SPI) Reviewed-by: naoto

7194370: (fs) WatchService fails if volume S/N is 0 [win] Reviewed-by: alanb, forax

8004042: Arrrghs.java test failed on windows with access error. Reviewed-by: smarks, jjh, ksrini Contributed-by: david.dehaven@oracle.com

8003881: Prevent lambda implementing inner classes from allowing the creation of new instances Summary: Lambda implementing inner classes now has private constructor (thanks Kumar) Reviewed-by: ksrini

8004374: CachedRowSetSwriter.writeData reports wrong number of conflicts in SyncProviderException Reviewed-by: naoto

8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported Reviewed-by: alanb, dmocek, smarks