How to increment JDK_MINOR_VERSION for JDK 9? -- request for review

David Holmes david.holmes at oracle.com
Thu Dec 19 07:14:59 UTC 2013 

Joe,

hotspot/make/hotspot_version also defines:

JDK_MAJOR_VER=1
JDK_MINOR_VER=8
JDK_MICRO_VER=0

David H.
-----

On 19/12/2013 4:19 AM, Joe Darcy wrote:
> On 12/16/2013 02:14 PM, Joe Darcy wrote:
>> On 12/15/2013 09:50 PM, Joe Darcy wrote:
>>> On 12/10/2013 03:51 PM, David Katleman wrote:
>>>>
>>>> On 12/10/2013 3:33 PM, Joseph Darcy wrote:
>>>>> Hello,
>>>>>
>>>>> Looking ahead to JDK 9, a build 01 change that is needed is
>>>>> updating the JDK_MINOR_VERSION setting in the build from "8" to "9":
>>>>>
>>>>>         JDK-8000962 Update JDK_MINOR_VERSION for JDK 9
>>>>>         https://bugs.openjdk.java.net/browse/JDK-8000962
>>>>>
>>>>> I poked around a bit, but didn't see where this needs to be set.
>>>>> The value of this variable gets used in numerous places throughout
>>>>> the JDK, including in system properties.
>>>>>
>>>>> How can this be updating in the new build?
>>>>
>>>> That would be in common/autoconf/version-numbers
>>>>
>>>>         Dave
>>>>
>>>
>>> An update, I've done a build after bumping up that value, but I ran
>>> into testing issue. It seems that the jtreg needs a minor update to
>>> allow for the successful running of TestNG tests after the minor
>>> version is incremented; I've contacted the jtreg team and a fix is in
>>> progress.
>>>
>>> Thanks,
>>>
>>> -Joe
>>
>> An update on the update: a new jtreg build resolves the TestNG issue.
>> After a new build of jtreg is promoted, I'll go ahead with the
>> JDK_MINOR_VERSIO update.
>>
>> Cheers,
>>
>> -Joe
>
> Please review this increment in common/autoconf/version-numbers along
> with test updates to work around a HotSpot bug:
>
>      http://cr.openjdk.java.net/~darcy/8000962.0/
>
> Patch below.
>
> Thanks,
>
> -Joe
>
> --- old/common/autoconf/version-numbers    2013-12-18 09:12:06.000000000
> -0800
> +++ new/common/autoconf/version-numbers    2013-12-18 09:12:06.000000000
> -0800
> @@ -24,7 +24,7 @@
>   #
>
>   JDK_MAJOR_VERSION=1
> -JDK_MINOR_VERSION=8
> +JDK_MINOR_VERSION=9
>   JDK_MICRO_VERSION=0
>   JDK_UPDATE_VERSION=
>   LAUNCHER_NAME=openjdk
> --- old/langtools/test/tools/javac/MethodParameters/AnnotationTest.java
> 2013-12-18 09:12:07.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/AnnotationTest.java
> 2013-12-18 09:12:07.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters AnnotationTest.java
> --- old/langtools/test/tools/javac/MethodParameters/AnonymousClass.java
> 2013-12-18 09:12:07.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/AnonymousClass.java
> 2013-12-18 09:12:07.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters AnonymousClass.java
> --- old/langtools/test/tools/javac/MethodParameters/CaptureTest.java
> 2013-12-18 09:12:07.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/CaptureTest.java
> 2013-12-18 09:12:07.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8015701
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary Test method parameter attribute generation with captured
> locals.
>    * @compile -parameters CaptureTest.java
>    * @run main CaptureTest
> --- old/langtools/test/tools/javac/MethodParameters/Constructors.java
> 2013-12-18 09:12:08.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/Constructors.java
> 2013-12-18 09:12:08.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters Constructors.java
> --- old/langtools/test/tools/javac/MethodParameters/EnumTest.java
> 2013-12-18 09:12:08.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/EnumTest.java
> 2013-12-18 09:12:08.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582 8008658
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters EnumTest.java
> --- old/langtools/test/tools/javac/MethodParameters/InstanceMethods.java
> 2013-12-18 09:12:09.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/InstanceMethods.java
> 2013-12-18 09:12:09.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters InstanceMethods.java
> --- old/langtools/test/tools/javac/MethodParameters/LambdaTest.java
> 2013-12-18 09:12:09.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/LambdaTest.java
> 2013-12-18 09:12:09.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters LambdaTest.java
> --- old/langtools/test/tools/javac/MethodParameters/LocalClassTest.java
> 2013-12-18 09:12:09.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/LocalClassTest.java
> 2013-12-18 09:12:09.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582 8008658
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters LocalClassTest.java
> --- old/langtools/test/tools/javac/MethodParameters/MemberClassTest.java
> 2013-12-18 09:12:10.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/MemberClassTest.java
> 2013-12-18 09:12:10.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582 8008658
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters MemberClassTest.java
> --- old/langtools/test/tools/javac/MethodParameters/StaticMethods.java
> 2013-12-18 09:12:10.000000000 -0800
> +++ new/langtools/test/tools/javac/MethodParameters/StaticMethods.java
> 2013-12-18 09:12:10.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters StaticMethods.java
> ---
> old/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java
> 2013-12-18 09:12:10.000000000 -0800
> +++
> new/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java
> 2013-12-18 09:12:10.000000000 -0800
> @@ -24,6 +24,7 @@
>   /*
>    * @test
>    * @bug 8006582
> + * @ignore 8030656 Bad version check for parameter information in
> src/share/vm/classfile/javaClasses.cpp
>    * @summary javac should generate method parameters correctly.
>    * @build Tester
>    * @compile -parameters UncommonParamNames.java
> --- old/jdk/test/ProblemList.txt    2013-12-18 09:12:11.000000000 -0800
> +++ new/jdk/test/ProblemList.txt    2013-12-18 09:12:11.000000000 -0800
> @@ -123,6 +123,11 @@
>   # 8029415
>   java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java
> generic-all
>
> +# 8030656
> +java/lang/reflect/Parameter/GetAnnotatedTypeTest.java generic-all
> +java/lang/reflect/Parameter/WithParameters.java generic-all
> +java/lang/reflect/Parameter/BadClassFiles.java generic-all
> +
>   ############################################################################
>
>   # jdk_management
>

More information about the build-dev mailing list