Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JAVA_VERSION to JDK_VERSION mapping for Java12 #4645

Merged
merged 1 commit into from
Feb 7, 2019
Merged

Add JAVA_VERSION to JDK_VERSION mapping for Java12 #4645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions test/TestConfig/run_configure.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ endif
ifeq ($(JAVA_VERSION), SE110)
JDK_VERSION:=11
endif
ifeq ($(JAVA_VERSION), SE120)
JDK_VERSION:=12
endif

ifndef JDK_VERSION
export JDK_VERSION:=8
Expand Down
8 changes: 7 additions & 1 deletion test/TestConfig/settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##############################################################################
# Copyright (c) 2016, 2018 IBM Corp. and others
# Copyright (c) 2016, 2019 IBM Corp. and others
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -70,6 +70,9 @@ endif
ifeq ($(JAVA_VERSION), SE110)
JDK_VERSION:=11
endif
ifeq ($(JAVA_VERSION), SE120)
JDK_VERSION:=12
endif

ifndef JDK_VERSION
export JDK_VERSION:=8
Expand Down Expand Up @@ -102,6 +105,9 @@ endif
ifeq ($(JDK_VERSION), 11)
OPENJDK_VERSION = openjdk11
endif
ifeq ($(JDK_VERSION), 12)
OPENJDK_VERSION = openjdk12
endif

ifeq (hotspot, $(JDK_IMPL))
JVM_VERSION = $(OPENJDK_VERSION)
Expand Down