From 14b4ad399c2666c7b9d6a3a242505121da1492ab Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Wed, 17 Apr 2024 07:48:30 -0400 Subject: [PATCH] Set branches to v0.44.0-release and remove ea Signed-off-by: Peter Shipton --- closed/autoconf/custom-spec.gmk.in | 2 +- closed/get_j9_source.sh | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in index ee60f533717..01095142f08 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/closed/get_j9_source.sh b/closed/get_j9_source.sh index d21de3d37fb..8ccd54f10a4 100644 --- a/closed/get_j9_source.sh +++ b/closed/get_j9_source.sh @@ -1,7 +1,7 @@ #!/bin/bash # =========================================================================== -# (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 @@ -66,14 +66,8 @@ declare -A references git_urls[openj9]=https://github.com/eclipse-openj9/openj9 git_urls[omr]=https://github.com/eclipse-openj9/openj9-omr -currentbranch=$(git rev-parse --abbrev-ref HEAD) -if [[ "$currentbranch" =~ v[0-9]+\.[0-9]+(\.[0-9]+)?-release ]] ; then - branches[openj9]=$currentbranch - branches[omr]=$currentbranch -else - branches[openj9]=master - branches[omr]=openj9 -fi +branches[openj9]=v0.44.0-release +branches[omr]=v0.44.0-release pflag=false