Skip to content

Commit a75ff73

Browse files
committed
Remove ea and set 0.46 branches to build RC1
Signed-off-by: Keith W. Campbell <[email protected]>
1 parent ff22f57 commit a75ff73

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

get_source.sh

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,10 @@ add_source() {
7070
# Configure the known source repositories.
7171
#
7272
configure_defaults() {
73-
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
83-
8473
# folder URL branch options
8574
# ------ --- ------ -------
86-
add_source openj9 https://github.com/eclipse-openj9/openj9.git $openj9_branch
87-
add_source omr https://github.com/eclipse-openj9/openj9-omr.git $omr_branch
75+
add_source openj9 https://github.com/eclipse-openj9/openj9.git v0.46.0-release
76+
add_source omr https://github.com/eclipse-openj9/openj9-omr.git v0.46.0-release
8877

8978
add_source openssl https://github.com/openssl/openssl.git "" "--depth=1"
9079
}

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

Lines changed: 1 addition & 1 deletion
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)