Skip to content

Commit

Permalink
[GH-15597] Add support for EMR 6.10
Browse files Browse the repository at this point in the history
  • Loading branch information
mn-mikke committed Jul 11, 2023
1 parent 68a0127 commit 42d6943
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 2 deletions.
5 changes: 5 additions & 0 deletions h2o-dist/buildinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@
"distribution" : "iop4.2",
"zip_file_name" : "h2o-SUBST_PROJECT_VERSION-iop4.2.zip",
"zip_file_path" : "h2o-SUBST_PROJECT_VERSION-iop4.2.zip"
},
{
"distribution" : "emr6.10",
"zip_file_name" : "h2o-SUBST_PROJECT_VERSION-emr6.10.zip",
"zip_file_path" : "h2o-SUBST_PROJECT_VERSION-emr6.10.zip"
}
],

Expand Down
15 changes: 15 additions & 0 deletions h2o-hadoop-3/h2o-emr6.10-assembly/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ext {
hadoopVersion = 'emr6.10'
hadoopMavenArtifactVersion = '3.3.3'
orcSupported = true
orcHiveExecVersion = "3.1.3"
}

apply from: '../assemblyjar.gradle'

dependencies {
api(project(":h2o-jetty-9")) {
exclude module: "servlet-api"
exclude group: "javax.servlet", module: "javax.servlet-api"
}
}
2 changes: 1 addition & 1 deletion make-dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ALL_HADOOP_VERSIONS="cdh5.4 cdh5.5 cdh5.6 cdh5.7 cdh5.8 cdh5.9 cdh5.10 cdh5.13 c
cdh6.0 cdh6.1 cdh6.2 cdh6.3 cdp7.0 cdp7.1 cdp7.2 \
hdp2.2 hdp2.3 hdp2.4 hdp2.5 hdp2.6 hdp3.0 hdp3.1 \
mapr4.0 mapr5.0 mapr5.1 mapr5.2 mapr6.0 mapr6.1 mapr6.2 mapr7.0 \
iop4.2"
iop4.2 emr6.10"

function make_zip_common {
PROJECT_BASE=$1
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if (System.getProperty("user.name").equals("jenkins")
"cdh5.4", "cdh5.5", "cdh5.6", "cdh5.7", "cdh5.8", "cdh5.9", "cdh5.10", "cdh5.13", "cdh5.14", "cdh5.15", "cdh5.16",
"cdh6.0", "cdh6.1", "cdh6.2", "cdh6.3", "cdp7.0", "cdp7.1", "cdp7.2",
"hdp2.2", "hdp2.3", "hdp2.4", "hdp2.5", "hdp2.6","hdp3.0","hdp3.1",
"mapr4.0", "mapr5.0", "mapr5.1", "mapr5.2", "mapr6.0", "mapr6.1", "mapr6.2", "mapr7.0", "iop4.2"
"mapr4.0", "mapr5.0", "mapr5.1", "mapr5.2", "mapr6.0", "mapr6.1", "mapr6.2", "mapr7.0", "iop4.2", "emr6.10"
]
}
logger.debug("Building hadoops " + targets)
Expand Down

0 comments on commit 42d6943

Please sign in to comment.