From 42d6943399c2d8fde7c8187813c99500fa6108ea Mon Sep 17 00:00:00 2001
From: Marek Novotny <marek.novotny@h2o.ai>
Date: Tue, 11 Jul 2023 18:14:57 +0200
Subject: [PATCH] [GH-15597] Add support for EMR 6.10

---
 h2o-dist/buildinfo.json                        |  5 +++++
 h2o-hadoop-3/h2o-emr6.10-assembly/build.gradle | 15 +++++++++++++++
 make-dist.sh                                   |  2 +-
 settings.gradle                                |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 h2o-hadoop-3/h2o-emr6.10-assembly/build.gradle

diff --git a/h2o-dist/buildinfo.json b/h2o-dist/buildinfo.json
index bc480a23a489..cef7ad96ff8d 100644
--- a/h2o-dist/buildinfo.json
+++ b/h2o-dist/buildinfo.json
@@ -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"
         }
     ],
 
diff --git a/h2o-hadoop-3/h2o-emr6.10-assembly/build.gradle b/h2o-hadoop-3/h2o-emr6.10-assembly/build.gradle
new file mode 100644
index 000000000000..1eabd77f6824
--- /dev/null
+++ b/h2o-hadoop-3/h2o-emr6.10-assembly/build.gradle
@@ -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"
+  }
+}
diff --git a/make-dist.sh b/make-dist.sh
index cad7abc87777..7543b0866aed 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -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
diff --git a/settings.gradle b/settings.gradle
index c7036c4f3800..14248c55738f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -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)