From 3f438d726eabae33b2687e565530272909ff37ad Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Tue, 16 Apr 2024 22:37:15 -0400 Subject: [PATCH] Set v0.44.0-release branch and remove ea Signed-off-by: Peter Shipton --- closed/get_j9_source.sh | 12 +++--------- jdk/make/closed/autoconf/custom-spec.gmk.in | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/closed/get_j9_source.sh b/closed/get_j9_source.sh index 9a6cc0be5a8..ed4abedfd02 100644 --- a/closed/get_j9_source.sh +++ b/closed/get_j9_source.sh @@ -1,7 +1,7 @@ #!/bin/sh # =========================================================================== -# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved +# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved # =========================================================================== # # This code is free software; you can redistribute it and/or modify it @@ -55,14 +55,8 @@ declare -A commands declare -A shas declare -A references -currentbranch=$(git rev-parse --abbrev-ref HEAD) -if [[ "$currentbranch" =~ v[0-9]+\.[0-9]+(\.[0-9]+)?-release ]] ; then - default_branches[openj9]=$currentbranch - default_branches[omr]=$currentbranch -else - default_branches[openj9]=master - default_branches[omr]=openj9 -fi +default_branches[openj9]=v0.44.0-release +default_branches[omr]=v0.44.0-release pflag="false" base_git_url=https://github.com diff --git a/jdk/make/closed/autoconf/custom-spec.gmk.in b/jdk/make/closed/autoconf/custom-spec.gmk.in index 2b9e7796ab0..854d9625800 100644 --- a/jdk/make/closed/autoconf/custom-spec.gmk.in +++ b/jdk/make/closed/autoconf/custom-spec.gmk.in @@ -69,7 +69,7 @@ USERNAME := @USERNAME@ include $(SRC_ROOT)/closed/openjdk-tag.gmk JDK_FIX_VERSION := @JDK_FIX_VERSION@ -J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(JDK_FIX_VERSION)-ea +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