Skip to content

Commit 3068665

Browse files
committed
Set branches for 0.48 and remove ea
Signed-off-by: Peter Shipton <[email protected]>
1 parent 8ba854a commit 3068665

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

get_source.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,8 @@ add_source() {
7171
#
7272
configure_defaults() {
7373
local current_branch="$(git rev-parse --abbrev-ref HEAD)"
74-
local openj9_branch=master
75-
local omr_branch=openj9
76-
77-
# If this repository is on a release branch, use the same branch names
78-
# for OpenJ9 and OMR.
79-
if [[ "$current_branch" =~ (ibm-)?(v[0-9]+\.[0-9]+(\.[0-9]+)?-release) ]] ; then
80-
openj9_branch="${BASH_REMATCH[2]}"
81-
omr_branch="${BASH_REMATCH[2]}"
82-
fi
74+
local openj9_branch=v0.48.0-release
75+
local omr_branch=v0.48.0-release
8376

8477
# folder URL branch options
8578
# ------ --- ------ -------

jdk/make/closed/autoconf/custom-spec.gmk.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ USERNAME := @USERNAME@
6969
include $(SRC_ROOT)/closed/openjdk-tag.gmk
7070

7171
JDK_FIX_VERSION := @JDK_FIX_VERSION@
72-
J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(JDK_FIX_VERSION)-ea
72+
J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(JDK_FIX_VERSION)
7373
J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9
7474

7575
# required by CMake

0 commit comments

Comments
 (0)