From be4bd30f35997c084f8aadd080eff6ad8cfc3009 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Wed, 17 Jul 2024 13:41:45 -0400 Subject: [PATCH] Remove ea and set 0.46 branches to build RC1 Signed-off-by: Keith W. Campbell --- closed/autoconf/custom-spec.gmk.in | 2 +- get_source.sh | 15 ++------------- 2 files changed, 3 insertions(+), 14 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..37845c0bec3 100644 --- a/get_source.sh +++ b/get_source.sh @@ -70,21 +70,10 @@ add_source() { # Configure the known source repositories. # 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 - # folder URL branch options # ------ --- ------ ------- - add_source openj9 https://github.com/eclipse-openj9/openj9.git $openj9_branch - add_source omr https://github.com/eclipse-openj9/openj9-omr.git $omr_branch + add_source openj9 https://github.com/eclipse-openj9/openj9.git v0.46.0-release + add_source omr https://github.com/eclipse-openj9/openj9-omr.git v0.46.0-release add_source OpenJCEPlus https://github.com/ibmruntimes/OpenJCEPlus.git add_source openssl https://github.com/openssl/openssl.git "" "--depth=1"