diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 84d0b079d6b..4e92c65c186 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4447,7 +4447,7 @@ VS_TOOLSET_SUPPORTED_2019=false #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1656536820 +DATE_WHEN_GENERATED=1660749156 ############################################################################### # diff --git a/jdk/make/closed/autoconf/custom-hook.m4 b/jdk/make/closed/autoconf/custom-hook.m4 index 31433788143..28d10e9a464 100644 --- a/jdk/make/closed/autoconf/custom-hook.m4 +++ b/jdk/make/closed/autoconf/custom-hook.m4 @@ -495,7 +495,6 @@ AC_DEFUN([OPENJ9_CHECK_NASM_VERSION], AC_DEFUN([OPENJDK_VERSION_DETAILS], [ - AC_SUBST(JDK_MOD_VERSION) AC_SUBST(JDK_FIX_VERSION) # Outer [ ] to quote m4. diff --git a/jdk/make/closed/autoconf/custom-spec.gmk.in b/jdk/make/closed/autoconf/custom-spec.gmk.in index 4ddfec69f09..c0e6775fedc 100644 --- a/jdk/make/closed/autoconf/custom-spec.gmk.in +++ b/jdk/make/closed/autoconf/custom-spec.gmk.in @@ -68,9 +68,8 @@ USERNAME := @USERNAME@ include $(SRC_ROOT)/closed/openjdk-tag.gmk -JDK_MOD_VERSION := @JDK_MOD_VERSION@ JDK_FIX_VERSION := @JDK_FIX_VERSION@ -J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER) +J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(JDK_FIX_VERSION) J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9 # required by CMake diff --git a/jdk/make/closed/autoconf/generated-configure.sh b/jdk/make/closed/autoconf/generated-configure.sh index c2d71c404c2..670c07ed63f 100644 --- a/jdk/make/closed/autoconf/generated-configure.sh +++ b/jdk/make/closed/autoconf/generated-configure.sh @@ -914,7 +914,6 @@ OPENJ9_ENABLE_CMAKE CMAKE USERNAME JDK_FIX_VERSION -JDK_MOD_VERSION OMR_MIXED_REFERENCES_MODE OPENJ9_LIBS_SUBDIR OPENJ9_PLATFORM_CODE @@ -4618,7 +4617,7 @@ VS_TOOLSET_SUPPORTED_2019=false # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1656536820 +DATE_WHEN_GENERATED=1660749156 ############################################################################### # @@ -15355,7 +15354,6 @@ fi - # Outer [ ] to quote m4. USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` diff --git a/jdk/make/closed/autoconf/openj9ext-version-numbers b/jdk/make/closed/autoconf/openj9ext-version-numbers index f4a4ff8f6e9..9c3cde66733 100644 --- a/jdk/make/closed/autoconf/openj9ext-version-numbers +++ b/jdk/make/closed/autoconf/openj9ext-version-numbers @@ -23,5 +23,4 @@ COMPANY_NAME="Eclipse OpenJ9" VENDOR_URL="http://www.eclipse.org/openj9" -JDK_MOD_VERSION=345 -JDK_FIX_VERSION=0 +JDK_FIX_VERSION=1