From a76a9ecd7adfd0e68bb59b579a54108a3ddc8ee8 Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Mon, 5 Nov 2012 15:00:55 -0800 Subject: [PATCH] 7050936: (pack200) Support version 52.0 class files in langtools Reviewed-by: dholmes --- .../classes/com/sun/java/util/jar/pack/Constants.java | 5 ++++- .../share/native/com/sun/java/util/jar/pack/constants.h | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java index c4c3a8f3abb..b5c1d124ef6 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java @@ -59,6 +59,9 @@ class Constants { public final static Package.Version JAVA7_MAX_CLASS_VERSION = Package.Version.of(51, 00); + public final static Package.Version JAVA8_MAX_CLASS_VERSION = + Package.Version.of(52, 00); + public final static int JAVA_PACKAGE_MAGIC = 0xCAFED00D; public final static Package.Version JAVA5_PACKAGE_VERSION = @@ -72,7 +75,7 @@ class Constants { // upper limit, should point to the latest class version public final static Package.Version JAVA_MAX_CLASS_VERSION = - JAVA7_MAX_CLASS_VERSION; + JAVA8_MAX_CLASS_VERSION; // upper limit should point to the latest package version, for version info!. public final static Package.Version MAX_PACKAGE_VERSION = diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h index a3a8c553368..dde13b8625b 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h @@ -35,12 +35,19 @@ #define JAVA_MAGIC 0xCAFEBABE #define JAVA_MIN_MAJOR_VERSION 45 #define JAVA_MIN_MINOR_VERSION 3 + #define JAVA5_MAX_MAJOR_VERSION 49 #define JAVA5_MAX_MINOR_VERSION 0 -// NOTE: Assume for now + #define JAVA6_MAX_MAJOR_VERSION 50 #define JAVA6_MAX_MINOR_VERSION 0 +#define JAVA7_MAX_MAJOR_VERSION 51 +#define JAVA7_MAX_MINOR_VERSION 0 + +#define JAVA8_MAX_MAJOR_VERSION 52 +#define JAVA8_MAX_MINOR_VERSION 0 + // package file constants #define JAVA_PACKAGE_MAGIC 0xCAFED00D #define JAVA5_PACKAGE_MAJOR_VERSION 150