From d17dd58f8d7cd16b7219d0e8042ae4809ac96bfd Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Wed, 16 Oct 2024 21:39:38 -0400 Subject: [PATCH] Set branches for 0.48 and remove ea Signed-off-by: Peter Shipton --- closed/autoconf/custom-spec.gmk.in | 2 +- get_source.sh | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in index ddb2a52f088..684f6e84dce 100644 --- a/closed/autoconf/custom-spec.gmk.in +++ b/closed/autoconf/custom-spec.gmk.in @@ -82,7 +82,7 @@ COMPILER_VERSION_STRING := @COMPILER_VERSION_STRING@ include $(TOPDIR)/closed/openjdk-tag.gmk -J9JDK_EXT_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS)-ea +J9JDK_EXT_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS) J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9 # required by CMake diff --git a/get_source.sh b/get_source.sh index e8271466a4f..5d09cba8083 100644 --- a/get_source.sh +++ b/get_source.sh @@ -71,15 +71,8 @@ add_source() { # configure_defaults() { local current_branch="$(git rev-parse --abbrev-ref HEAD)" - local openj9_branch=master - local omr_branch=openj9 - - # If this repository is on a release branch, use the same branch names - # for OpenJ9 and OMR. - if [[ "$current_branch" =~ (ibm-)?(v[0-9]+\.[0-9]+(\.[0-9]+)?-release) ]] ; then - openj9_branch="${BASH_REMATCH[2]}" - omr_branch="${BASH_REMATCH[2]}" - fi + local openj9_branch=v0.48.0-release + local omr_branch=v0.48.0-release # folder URL branch options # ------ --- ------ -------