<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Look good Joe<br class=""><div><blockquote type="cite" class=""><div class="">On Feb 3, 2017, at 2:21 PM, joe darcy <<a href="mailto:joe.darcy@oracle.com" class="">joe.darcy@oracle.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Hello,<br class=""><br class="">After the version update to "10" in JDK 10 ( JDK-8029942 ), various libraries tests failed including:<br class=""><br class=""> java/lang/module/MultiReleaseJarTest.java<br class=""> java/security/Provider/ProviderVersionCheck.java<br class="">sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java<br class=""><br class="">These tests need to be updated for the new JDK. When it is clear how to do so, I've updated the tests in a way so that they don't need to be updated again for JDK 11.<br class=""><br class="">Webrev:<br class=""><br class=""> <a href="http://cr.openjdk.java.net/~darcy/8173903.0/" class="">http://cr.openjdk.java.net/~darcy/8173903.0/</a><br class=""><br class="">and patch below. I'll update the other copyrights before pushing.<br class=""><br class="">Thanks,<br class=""><br class="">-Joe<br class=""><br class=""><br class="">diff -r 72f33dbfcf3b test/java/lang/module/MultiReleaseJarTest.java<br class="">--- a/test/java/lang/module/MultiReleaseJarTest.java Tue Jan 31 19:26:10 2017 -0500<br class="">+++ b/test/java/lang/module/MultiReleaseJarTest.java Fri Feb 03 11:18:23 2017 -0800<br class="">@@ -1,5 +1,5 @@<br class=""> /*<br class="">- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.<br class="">+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.<br class=""> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.<br class=""> *<br class=""> * This code is free software; you can redistribute it and/or modify it<br class="">@@ -65,7 +65,7 @@<br class=""><br class=""> private static final String MODULE_INFO = "module-info.class";<br class=""><br class="">- private static final int RELEASE = Runtime.version().major();<br class="">+ private static final String RELEASE = "" + Runtime.version().major();<br class=""><br class=""> // are multi-release JARs enabled?<br class=""> private static final boolean MULTI_RELEASE;<br class="">@@ -88,8 +88,8 @@<br class=""> .moduleInfo("module-info.class", descriptor)<br class=""> .resource("p/Main.class")<br class=""> .resource("p/Helper.class")<br class="">- .resource("META-INF/versions/9/p/Helper.class")<br class="">- .resource("META-INF/versions/9/p/internal/Helper9.class")<br class="">+ .resource("META-INF/versions/" + RELEASE + "/p/Helper.class")<br class="">+ .resource("META-INF/versions/" + RELEASE + "/p/internal/HelperNew.class")<br class=""> .build();<br class=""><br class=""> // find the module<br class="">@@ -131,9 +131,9 @@<br class=""> .moduleInfo(MODULE_INFO, descriptor1)<br class=""> .resource("p/Main.class")<br class=""> .resource("p/Helper.class")<br class="">- .moduleInfo("META-INF/versions/9/" + MODULE_INFO, descriptor2)<br class="">- .resource("META-INF/versions/9/p/Helper.class")<br class="">- .resource("META-INF/versions/9/p/internal/Helper9.class")<br class="">+ .moduleInfo("META-INF/versions/" + RELEASE + "/" + MODULE_INFO, descriptor2)<br class="">+ .resource("META-INF/versions/" + RELEASE + "/p/Helper.class")<br class="">+ .resource("META-INF/versions/" + RELEASE + "/p/internal/HelperNew.class")<br class=""> .build();<br class=""><br class=""> // find the module<br class="">@@ -161,8 +161,8 @@<br class=""> Path jar = new JarBuilder(name)<br class=""> .resource("p/Main.class")<br class=""> .resource("p/Helper.class")<br class="">- .resource("META-INF/versions/9/p/Helper.class")<br class="">- .resource("META-INF/versions/9/p/internal/Helper9.class")<br class="">+ .resource("META-INF/versions/" + RELEASE + "/p/Helper.class")<br class="">+ .resource("META-INF/versions/" + RELEASE + "/p/internal/HelperNew.class")<br class=""> .build();<br class=""><br class=""> // find the module<br class="">@@ -200,7 +200,7 @@<br class=""><br class=""> Path jar = new JarBuilder(name)<br class=""> .moduleInfo(MODULE_INFO, descriptor1)<br class="">- .moduleInfo("META-INF/versions/9/" + MODULE_INFO, descriptor2)<br class="">+ .moduleInfo("META-INF/versions/" + RELEASE + "/" + MODULE_INFO, descriptor2)<br class=""> .build();<br class=""><br class=""> // find the module<br class="">diff -r 72f33dbfcf3b test/java/security/Provider/ProviderVersionCheck.java<br class="">--- a/test/java/security/Provider/ProviderVersionCheck.java Tue Jan 31 19:26:10 2017 -0500<br class="">+++ b/test/java/security/Provider/ProviderVersionCheck.java Fri Feb 03 11:18:23 2017 -0800<br class="">@@ -42,7 +42,7 @@<br class=""><br class=""> for (Provider p: Security.getProviders()) {<br class=""> System.out.print(p.getName() + " ");<br class="">- if (p.getVersion() != 9.0d) {<br class="">+ if (p.getVersion() != 10.0d) {<br class=""> System.out.println("failed. " + "Version received was " +<br class=""> p.getVersion());<br class=""> failure = true;<br class="">diff -r 72f33dbfcf3b test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java<br class="">--- a/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java Tue Jan 31 19:26:10 2017 -0500<br class="">+++ b/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java Fri Feb 03 11:18:23 2017 -0800<br class="">@@ -74,7 +74,8 @@<br class=""> private static final String KEYPASS = "changeit";<br class=""> private static final String SIGNED_JAR = "Signed.jar";<br class=""> private static final String POLICY_FILE = "SignedJar.policy";<br class="">- private static final String VERSION_MESSAGE = "I am running on version 9";<br class="">+ private static final String VERSION = "" + Runtime.version().major();<br class="">+ private static final String VERSION_MESSAGE = "I am running on version " + VERSION;<br class=""><br class=""> public static void main(String[] args) throws Throwable {<br class=""> // compile java files in jarContent directory<br class=""><br class=""></div></div></blockquote></div><br class=""><div class="">
<div class=""><span class="Apple-style-span" style="border-collapse: separate; border-spacing: 0px; "><span class="Apple-style-span" style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; "><a href="http://oracle.com/us/design/oracle-email-sig-198324.gif" class=""><span><img height="26" width="114" apple-inline="yes" id="396548EB-B232-4B69-BBEC-607A74C0BD73" apple-width="yes" apple-height="yes" src="cid:E1C4E2F0-ECD0-4C9D-ADB4-B16CA7BCB7FC@home" class=""></span></a><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; " class=""><a href="http://oracle.com/us/design/oracle-email-sig-198324.gif" class=""><span class="Apple-style-span" style="border-collapse: separate; border-spacing: 0px; "><span class="Apple-style-span" style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; "></span></span></a><a href="http://oracle.com/us/design/oracle-email-sig-198324.gif" class=""><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; border-spacing: 0px; -webkit-text-decorations-in-effect: none; "><span class="Apple-style-span" style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; border-spacing: 0px; -webkit-text-decorations-in-effect: none; "></span></span></span></a><a href="http://oracle.com/us/design/oracle-email-sig-198324.gif" class=""><br class=""></a><span style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class="">Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037</span><br style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class=""><font color="#FF0000" style="font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class="">Oracle</font><span style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class=""> Java Engineering </span><br style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class=""><span style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class="">1 Network Drive </span><br style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class=""><span style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class="">Burlington, MA 01803</span><br style="color: rgb(102, 102, 102); font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class=""><a href="mailto:Lance.Andersen@oracle.com" style="font-family: Verdana, Arial, Helvetica, sans-serif; font-size: small; " class="">Lance.Andersen@oracle.com</a></div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; " class=""><br class=""></div><br class="Apple-interchange-newline">
</span></span></div>
</div><br class=""></body></html>