Skip to content

Commit 4a1ff62

Browse files
krasinskikrasinski
committed
jdk21
1 parent 9ad701f commit 4a1ff62

File tree

11 files changed

+50
-10
lines changed

11 files changed

+50
-10
lines changed

‎docker/Jenkinsfile-build-docker

+11-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ properties([
1919

2020
IMAGE_NAME_PREFIX = 'harbor.h2o.ai/opsh2oai/h2o-3'
2121

22-
JDK_VERSIONS = ['8', '10', '11', '12', '13', '14', '15', '16', '17']
23-
JDK_VERSIONS_PY_R = ['8', '11', '17'] // stable, last-supported, latest
24-
PYTHON_VERSIONS = ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
25-
R_VERSION = ['3.3.3', '3.4.1', '3.5.3', '3.6.2', '4.0.2']
22+
JDK_VERSIONS = ['18', '19', '20', '21'] //TODO: revert, for faster test only
23+
//JDK_VERSIONS = ['8', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21']
24+
JDK_VERSIONS_PY_R = ['8', '17', '21'] // stable, last-supported, latest
25+
PYTHON_VERSIONS = ['3.11'] //TODO: revert, for faster test only
26+
//PYTHON_VERSIONS = ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
27+
R_VERSION = ['4.0.2'] //TODO: revert, for faster test only
28+
//R_VERSION = ['3.3.3', '3.4.1', '3.5.3', '3.6.2', '4.0.2']
2629

2730
def pipelineContext
2831

@@ -60,6 +63,10 @@ ansiColor('xterm') {
6063
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-15/x64-linux/jdk-15.0.2_linux-x64_bin.tar.gz"
6164
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-16/x64-linux/jdk-16.0.2_linux-x64_bin.tar.gz"
6265
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-17/x64-linux/jdk-17.0.0_linux-x64_bin.tar.gz"
66+
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-18/x64-linux/jdk-18.0.2_linux-x64_bin.tar.gz"
67+
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-19/x64-linux/jdk-19.0.0_linux-x64_bin.tar.gz"
68+
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-20/x64-linux/jdk-20.0.2_linux-x64_bin.tar.gz"
69+
sh "s3cmd get s3://artifacts.h2o.ai/releases/oracle/jdk-21/x64-linux/jdk-21.0.0_linux-x64_bin.tar.gz"
6370
}
6471
}
6572
stash name: 'docker-sources'

‎docker/jenkins-images/Dockerfile-jdk-others

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN \
1515
sync && \
1616
if [ "${JAVA_VERSION}" = '8' ] || [ "${JAVA_VERSION}" = '10' ] || [ "${JAVA_VERSION}" = '11' ] || \
1717
[ "${JAVA_VERSION}" = '12' ] || [ "${JAVA_VERSION}" = '13' ] || [ "${JAVA_VERSION}" = '14' ] || \
18-
[ "${JAVA_VERSION}" = '15' ] || [ "${JAVA_VERSION}" = '16' ] || [ "${JAVA_VERSION}" = '17' ]; then \
18+
[ "${JAVA_VERSION}" = '15' ] || [ "${JAVA_VERSION}" = '16' ] || [ "${JAVA_VERSION}" = '17' ] || \
19+
[ "${JAVA_VERSION}" = '18' ] || [ "${JAVA_VERSION}" = '19' ] || [ "${JAVA_VERSION}" = '20' ] || \
20+
[ "${JAVA_VERSION}" = '21' ]; then \
1921
/tmp/install_java_version_local ${JAVA_VERSION} /tmp/java-${JAVA_VERSION}-vars.sh; \
2022
else \
2123
/tmp/install_java_version ${JAVA_VERSION} /tmp/java-${JAVA_VERSION}-vars.sh; \

‎docker/scripts/java-18-vars.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#! /bin/bash
2+
3+
JAVA_INSTALL_VERSION_MAJOR='18'
4+
JAVA_INSTALL_VERSION=2
5+
JAVA_INSTALL_PATH=/usr/opt/java-${JAVA_INSTALL_VERSION_MAJOR}-${JAVA_INSTALL_VERSION}/
6+
JDK_FILE=/tmp/jdk-18.0.2_linux-x64_bin.tar.gz

‎docker/scripts/java-19-vars.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#! /bin/bash
2+
3+
JAVA_INSTALL_VERSION_MAJOR='19'
4+
JAVA_INSTALL_VERSION=2
5+
JAVA_INSTALL_PATH=/usr/opt/java-${JAVA_INSTALL_VERSION_MAJOR}-${JAVA_INSTALL_VERSION}/
6+
JDK_FILE=/tmp/jdk-19.0.2_linux-x64_bin.tar.gz

‎docker/scripts/java-20-vars.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#! /bin/bash
2+
3+
JAVA_INSTALL_VERSION_MAJOR='20'
4+
JAVA_INSTALL_VERSION=2
5+
JAVA_INSTALL_PATH=/usr/opt/java-${JAVA_INSTALL_VERSION_MAJOR}-${JAVA_INSTALL_VERSION}/
6+
JDK_FILE=/tmp/jdk-20.0.2_linux-x64_bin.tar.gz

‎docker/scripts/java-21-vars.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#! /bin/bash
2+
3+
JAVA_INSTALL_VERSION_MAJOR='21'
4+
JAVA_INSTALL_VERSION=0
5+
JAVA_INSTALL_PATH=/usr/opt/java-${JAVA_INSTALL_VERSION_MAJOR}-${JAVA_INSTALL_VERSION}/
6+
JDK_FILE=/tmp/jdk-21.0.0_linux-x64_bin.tar.gz

‎h2o-core/src/main/java/water/JavaVersionSupport.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class JavaVersionSupport {
88
// Make sure that the following is logically consistent with whitelist in R code - see function .h2o.check_java_version in connection.R.
99
// Upgrade of the javassist library should be considered when adding support for a new java version.
1010
public static final int MIN_SUPPORTED_JAVA_VERSION = 8;
11-
public static final int MAX_SUPPORTED_JAVA_VERSION = 17;
11+
public static final int MAX_SUPPORTED_JAVA_VERSION = 21;
1212

1313
/**
1414
* Checks for the version of Java this instance of H2O was ran with and compares it with supported versions.

‎h2o-core/src/test/java/water/JavaVersionSupportTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static void beforeClass() throws Exception {
3737
@Parameterized.Parameters
3838
public static Collection<Object[]> data() {
3939
return Arrays.asList(new Object[][]{
40-
{8}, {9}, {10}, {11}, {12}, {13}, {14}, {15}, {16}, {17}
40+
{8}, {9}, {10}, {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20}, {21}
4141
});
4242
}
4343

@@ -79,7 +79,7 @@ public static void beforeClass() throws Exception {
7979
@Parameterized.Parameters
8080
public static Collection<Object[]> data() {
8181
return Arrays.asList(new Object[][]{
82-
{7}, {18}
82+
{7}, {22}
8383
});
8484
}
8585

‎h2o-docs/src/product/welcome.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ H2O runs on Java. To build H2O or run H2O tests, the 64-bit JDK is required. To
3737

3838
H2O supports the following versions of Java:
3939

40-
- Java SE 17, 16, 15, 14, 13, 12, 11, 10, 9, 8
40+
- Java SE 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8
4141

4242
Click `here <https://jdk.java.net/archive/>`__ to download the latest supported version.
4343

‎h2o-r/h2o-DESCRIPTION.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ License: Apache License (== 2.0)
4646
URL: https://github.com/h2oai/h2o-3
4747
BugReports: https://github.com/h2oai/h2o-3/issues
4848
NeedsCompilation: no
49-
SystemRequirements: Java (>= 8, <= 17)
49+
SystemRequirements: Java (>= 8, <= 21)
5050
Depends: R (>= 2.13.0),
5151
methods,
5252
stats

‎scripts/jenkins/Makefile.jenkins

+7
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,13 @@ test-junit-17-jenkins:
480480
test-junit-17:
481481
ADDITIONAL_TEST_JVM_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" ./gradlew test -x h2o-ext-mojo-pipeline:test -x h2o-automl:test -x h2o-ext-xgboost:testMultiNode -x h2o-ext-target-encoder:testMultiNode -x h2o-clustering:test $$ADDITIONAL_GRADLE_OPTS
482482

483+
test-junit-21-jenkins:
484+
$(call sed_test_scripts)
485+
@$(MAKE) -f $(THIS_FILE) test-junit-21
486+
487+
test-junit-21:
488+
ADDITIONAL_TEST_JVM_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" ./gradlew test -x h2o-ext-mojo-pipeline:test -x h2o-automl:test -x h2o-ext-xgboost:testMultiNode -x h2o-ext-target-encoder:testMultiNode -x h2o-clustering:test $$ADDITIONAL_GRADLE_OPTS
489+
483490
test-junit-latest-jenkins:
484491
$(call sed_test_scripts)
485492
@$(MAKE) -f $(THIS_FILE) test-junit-latest

0 commit comments

Comments
 (0)