<html>
  <head>
    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    <p><br>
    </p>
    It seems that ProviderVersionCheck.java is the only one that still
    has the hardcoded 10?<b><br>
    </b><br>
    The other two are changed to use<span class="changed">
      Runtime.version().major() call. Is this difference intentional?</span><br>
    <span class="changed">Thanks,<br>
    </span><br>
    <span class="changed">Valerie<br>
    </span>
    <p><br>
    </p>
    <br>
    <div class="moz-cite-prefix">On 2/3/2017 11:21 AM, joe darcy wrote:<br>
    </div>
    <blockquote
      cite="mid:b372228d-f4a4-2a03-7554-c8cc6ca72781@oracle.com"
      type="cite">Hello,
      <br>
      <br>
      After the version update to "10" in JDK 10 ( JDK-8029942 ),
      various libraries tests failed including:
      <br>
      <br>
          java/lang/module/MultiReleaseJarTest.java
      <br>
          java/security/Provider/ProviderVersionCheck.java
      <br>
      sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
      <br>
      <br>
      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>
      <br>
      Webrev:
      <br>
      <br>
          <a class="moz-txt-link-freetext" href="http://cr.openjdk.java.net/~darcy/8173903.0/">http://cr.openjdk.java.net/~darcy/8173903.0/</a>
      <br>
      <br>
      and patch below. I'll update the other copyrights before pushing.
      <br>
      <br>
      Thanks,
      <br>
      <br>
      -Joe
      <br>
      <br>
      <br>
      diff -r 72f33dbfcf3b
      test/java/lang/module/MultiReleaseJarTest.java
      <br>
      --- a/test/java/lang/module/MultiReleaseJarTest.java    Tue Jan 31
      19:26:10 2017 -0500
      <br>
      +++ b/test/java/lang/module/MultiReleaseJarTest.java    Fri Feb 03
      11:18:23 2017 -0800
      <br>
      @@ -1,5 +1,5 @@
      <br>
       /*
      <br>
      - * Copyright (c) 2016, Oracle and/or its affiliates. All rights
      reserved.
      <br>
      + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All
      rights reserved.
      <br>
        * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
      <br>
        *
      <br>
        * This code is free software; you can redistribute it and/or
      modify it
      <br>
      @@ -65,7 +65,7 @@
      <br>
      <br>
           private static final String MODULE_INFO =
      "module-info.class";
      <br>
      <br>
      -    private static final int RELEASE = Runtime.version().major();
      <br>
      +    private static final String RELEASE = "" +
      Runtime.version().major();
      <br>
      <br>
           // are multi-release JARs enabled?
      <br>
           private static final boolean MULTI_RELEASE;
      <br>
      @@ -88,8 +88,8 @@
      <br>
                       .moduleInfo("module-info.class", descriptor)
      <br>
                       .resource("p/Main.class")
      <br>
                       .resource("p/Helper.class")
      <br>
      -                .resource("META-INF/versions/9/p/Helper.class")
      <br>
      - .resource("META-INF/versions/9/p/internal/Helper9.class")
      <br>
      +                .resource("META-INF/versions/" + RELEASE +
      "/p/Helper.class")
      <br>
      +                .resource("META-INF/versions/" + RELEASE +
      "/p/internal/HelperNew.class")
      <br>
                       .build();
      <br>
      <br>
               // find the module
      <br>
      @@ -131,9 +131,9 @@
      <br>
                       .moduleInfo(MODULE_INFO, descriptor1)
      <br>
                       .resource("p/Main.class")
      <br>
                       .resource("p/Helper.class")
      <br>
      -                .moduleInfo("META-INF/versions/9/" + MODULE_INFO,
      descriptor2)
      <br>
      -                .resource("META-INF/versions/9/p/Helper.class")
      <br>
      - .resource("META-INF/versions/9/p/internal/Helper9.class")
      <br>
      +                .moduleInfo("META-INF/versions/" + RELEASE + "/"
      + MODULE_INFO, descriptor2)
      <br>
      +                .resource("META-INF/versions/" + RELEASE +
      "/p/Helper.class")
      <br>
      +                .resource("META-INF/versions/" + RELEASE +
      "/p/internal/HelperNew.class")
      <br>
                       .build();
      <br>
      <br>
               // find the module
      <br>
      @@ -161,8 +161,8 @@
      <br>
               Path jar = new JarBuilder(name)
      <br>
                       .resource("p/Main.class")
      <br>
                       .resource("p/Helper.class")
      <br>
      -                .resource("META-INF/versions/9/p/Helper.class")
      <br>
      - .resource("META-INF/versions/9/p/internal/Helper9.class")
      <br>
      +                .resource("META-INF/versions/" + RELEASE +
      "/p/Helper.class")
      <br>
      +                .resource("META-INF/versions/" + RELEASE +
      "/p/internal/HelperNew.class")
      <br>
                       .build();
      <br>
      <br>
               // find the module
      <br>
      @@ -200,7 +200,7 @@
      <br>
      <br>
               Path jar = new JarBuilder(name)
      <br>
                       .moduleInfo(MODULE_INFO, descriptor1)
      <br>
      -                .moduleInfo("META-INF/versions/9/" + MODULE_INFO,
      descriptor2)
      <br>
      +                .moduleInfo("META-INF/versions/" + RELEASE + "/"
      + MODULE_INFO, descriptor2)
      <br>
                       .build();
      <br>
      <br>
               // find the module
      <br>
      diff -r 72f33dbfcf3b
      test/java/security/Provider/ProviderVersionCheck.java
      <br>
      --- a/test/java/security/Provider/ProviderVersionCheck.java    Tue
      Jan 31 19:26:10 2017 -0500
      <br>
      +++ b/test/java/security/Provider/ProviderVersionCheck.java    Fri
      Feb 03 11:18:23 2017 -0800
      <br>
      @@ -42,7 +42,7 @@
      <br>
      <br>
               for (Provider p: Security.getProviders()) {
      <br>
                   System.out.print(p.getName() + " ");
      <br>
      -            if (p.getVersion() != 9.0d) {
      <br>
      +            if (p.getVersion() != 10.0d) {
      <br>
                       System.out.println("failed. " + "Version received
      was " +
      <br>
                               p.getVersion());
      <br>
                       failure = true;
      <br>
      diff -r 72f33dbfcf3b
      test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
      <br>
      ---
      a/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
      Tue Jan 31 19:26:10 2017 -0500
      <br>
      +++
      b/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
      Fri Feb 03 11:18:23 2017 -0800
      <br>
      @@ -74,7 +74,8 @@
      <br>
           private static final String KEYPASS = "changeit";
      <br>
           private static final String SIGNED_JAR = "Signed.jar";
      <br>
           private static final String POLICY_FILE = "SignedJar.policy";
      <br>
      -    private static final String VERSION_MESSAGE = "I am running
      on version 9";
      <br>
      +    private static final String VERSION = "" +
      Runtime.version().major();
      <br>
      +    private static final String VERSION_MESSAGE = "I am running
      on version " + VERSION;
      <br>
      <br>
           public static void main(String[] args) throws Throwable {
      <br>
               // compile java files in jarContent directory
      <br>
      <br>
    </blockquote>
    <br>
  </body>
</html>