Set branches for 0.48 and remove ea

Signed-off-by: Peter Shipton <[email protected]>
ibmruntimes · Oct 17, 2024 · 3068665 · 3068665
1 parent 8ba854a
commit 3068665
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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
 	#          ------       ---                                               ------          -------

diff --git 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