diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in index 74d0107719..a0eccaf679 100644 --- a/closed/autoconf/custom-spec.gmk.in +++ b/closed/autoconf/custom-spec.gmk.in @@ -1,5 +1,5 @@ # =========================================================================== -# (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 # under the terms of the GNU General Public License version 2 only, as @@ -67,7 +67,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 c5754c82a7..451d806f56 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 @@ -59,14 +59,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.43.0-release +branches[omr]=v0.43.0-release pflag=false