8006946: PKCS12 test failure due to incorrect alias name Reviewed-by: mullan

8006565: java.lang.instrument specification should make it clear that -javaagent is optional Reviewed-by: sla, dcubed, mchung

7183373: URLClassloader.close() does not close JAR files whose resources have been loaded via getResource() Reviewed-by: chegar

8006895: Clarify that FunctionalInferface is only informative Reviewed-by: briangoetz

8006863: javadoc cleanup for 8005408 Reviewed-by: alanb

8006850: [pack200] disable pack200 tests until JSR-308 is implemented Reviewed-by: alanb

8006855: PKCS12 test failures due to unsupported algorithm Reviewed-by: mullan

8006524: JSR-3: Allows java.beans to be optional Reviewed-by: dfuchs, mchung

8006813: Compilation error in PKCS12KeyStore.java Reviewed-by: valeriep

8005408: KeyStore API enhancements Reviewed-by: mullan

8006591: Protect keystore entries using stronger PBE algorithms Reviewed-by: mullan

Merge

8006773: test/java/util/zip/ZipFile/FinalizeZipFile.java failing intermittently Summary: fixed the test case Reviewed-by: alanb

8004729: Add java.lang.reflect.Parameter and related changes for parameter reflection Reviewed-by: darcy, forax, psandoz, dholmes, tbell

8006764: FunctionalInterface missing from rt.jar (old build) Reviewed-by: lancea, forax

8006669: sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh fails on mac Reviewed-by: alanb

6519127: user.home property not set correctly Summary: Registry-based approach was changed to SHGetKnownFolderPath/SHGetFolderPathW Reviewed-by: alanb, anthony

8006741: javadoc cleanup for 6263419 Reviewed-by: alanb

8003680: JSR 310 Date/Time API Summary: Integration of JSR310 Date/Time API for M6 Reviewed-by: alanb, naoto, dholmes Contributed-by: scolebourne@joda.org, roger.riggs@oracle.com, richard.warburton@gmail.com, misterm@gmail.com

8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running Reviewed-by: mchung

6263419: No way to clean the memory for a java.security.Key Reviewed-by: mullan

Merge

Merge

8006642: Fix javadoc warnings due to Integer.MAX_VALUE Reviewed-by: alanb

8005311: Add Scalable Updatable Variables, DoubleAccumulator, DoubleAdder, LongAccumulator, LongAdder Reviewed-by: chegar, darcy, goetz

8006092: SecurityPermission: printIdentity doesn't exist Reviewed-by: weijun

8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI 8006509: Add more calendar symbol names from CLDR Reviewed-by: peytoia

4745761: (cal) RFE: Support builder for constructing Calendar Reviewed-by: peytoia

8006560: java/net/ipv6tests/B6521014.java fails intermittently Reviewed-by: khazra, wetmore

8005080: JDBC 4.2 Core changes Reviewed-by: naoto

8006139: add missing methods to javax.sql.rowset.serial.SQLInputImpl, SQLOutputImpl Reviewed-by: naoto, ulfzibis, alanb

8006568: HTTP protocol handler NLTM Authentication should use Base64 API Reviewed-by: chegar, alanb

6939260: (fs) BasicFileAttributes.lastModifiedTime() should return last modified time with higher precision Reviewed-by: chegar

8005120: Compiler warnings in socket transport native code Reviewed-by: chegar, dsamersoff

8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times Summary: Increase number of retries to twice the number of ports in the reserved range Reviewed-by: mduigou

7171415: java.net.URI.equals/hashCode not consistent for some URIs Summary: Rewrite URI.hashCode() to consider encoded characters, also reviewed by vitalyd@gmail.com, schlosna@gmail.com Reviewed-by: chegar

8006090: Formatter asserts with -esa Summary: removed the offending assert Reviewed-by: alanb, darcy Contributed-by: brian.burkhalter@oracle.com

Merge

8005939: sun/security/x509/{X509CRLImplX509CertImpl}/Verify.java fail in confusing way when some providers not present Reviewed-by: mullan, weijun

8005389: Backout fix for JDK-6500133 Reviewed-by: mullan

8001666: Add lambda-compatible atomics and accumulators to the ActomicXXX classes Reviewed-by: dl, chegar, darcy, goetz Contributed-by: dl@cs.oswego.edu, chris.hegarty@oracle.com

8005926: Merge ThreadLocalRandom state into java.lang.Thread Reviewed-by: shade, chegar

8005618: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently Reviewed-by: alanb, martin, dholmes

8005406: HTTP server implementation should use Base64 API Reviewed-by: khazra, alanb, chegar Contributed-by: Mark Sheppard <mark.sheppard@oracle.com>

8005250: Downgrade normative references to ${java.home}/lib folder from Java client code. Summary: Javadoc was changed in accordance with CCC-8005250 request. Reviewed-by: alanb, amenkov

8006265: Add test SSLEngineDeadlock.java to ProblemList Reviewed-by: weijun

8005252: pack200 should support MethodParameters Reviewed-by: jrose

7162007: Clean up i18n related caches Reviewed-by: okutsu, ohair