diff --git a/gradle.properties b/gradle.properties
index 4843f708adb5..23bb91b5e06c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,12 +16,15 @@ doFindbugs=false
 # Run animal sniffer to verify compatibility of API with actual Java version
 doAnimalSniffer=false
 
-# The flag to include ORC support inside default h2o.jar.
+# include ORC support inside default h2o.jar.
 doIncludeOrc=false
 
-# The flag to include MOJO Pipeline support inside default h2o.jar.
+# include MOJO Pipeline support inside default h2o.jar.
 doIncludeMojoPipeline=false
 
+# enable building hadoop distributions
+hadoopTargets=
+
 #
 # Gradle arguments
 #
@@ -36,7 +39,6 @@ doUBench=true
 # Upload micro bench results into shared bucket hosted in S3
 # It needs AWS credentials to be configured in environment
 doUploadUBenchResults=false
-
 #
 # Internal Nexus location
 #
@@ -50,7 +52,6 @@ publicNexusLocation="http://nexus.h2o.ai:8081/repository"
 ##
 # Version of libraries used inside H2O
 ##
-
 httpClientVersion=4.5.2
 
 # Version of Apache Parquet dependency (should be kept in sync with the version used in current Spark releases)
diff --git a/gradle/components/xgboost.gradle b/gradle/components/xgboost.gradle
index b031e667da54..afa9947ea542 100644
--- a/gradle/components/xgboost.gradle
+++ b/gradle/components/xgboost.gradle
@@ -1,4 +1,3 @@
 dependencies {
-    compile project(":h2o-genmodel-ext-xgboost")
     compile project(":h2o-ext-xgboost")
-}
\ No newline at end of file
+}
diff --git a/h2o-core/build.gradle b/h2o-core/build.gradle
index 9ede87e120a6..6f1759be6543 100644
--- a/h2o-core/build.gradle
+++ b/h2o-core/build.gradle
@@ -17,7 +17,7 @@ dependencies {
   compile "org.apache.commons:commons-math3:3.3"
   compile "commons-io:commons-io:2.4"
   compileOnly "javax.servlet:javax.servlet-api:3.0.1"
-  compile ("com.github.wendykierp:JTransforms:3.1") { exclude module: "junit" }
+  compile("com.github.wendykierp:JTransforms:3.1") { exclude module: "junit" }
   compile project(":h2o-jaas-pam")
 
   compile("log4j:log4j:1.2.17") {
@@ -32,7 +32,7 @@ dependencies {
   compile 'commons-lang:commons-lang:2.6'
   
   // Duke library: collection of String comparators
-  compile ('no.priv.garshol.duke:duke:1.2'){
+  compile('no.priv.garshol.duke:duke:1.2') {
     exclude group: 'org.apache.lucene', module: 'lucene-core'
     exclude group: 'org.apache.lucene', module: 'lucene-analyzers-common'
     exclude group: 'org.apache.lucene', module: 'lucene-spatial'
diff --git a/h2o-hadoop-2/assemblyjar.gradle b/h2o-hadoop-2/assemblyjar.gradle
index 098139a07ad9..9288e34d8764 100644
--- a/h2o-hadoop-2/assemblyjar.gradle
+++ b/h2o-hadoop-2/assemblyjar.gradle
@@ -15,14 +15,14 @@ if (hasCustomHdfsDep) {
 }
 
 dependencies {
-  compile ("org.apache.hadoop:hadoop-client:$hadoopMavenArtifactVersion") {
+  compile("org.apache.hadoop:hadoop-client:$hadoopMavenArtifactVersion") {
     force = true
   }
-  compile ("org.apache.hadoop:hadoop-common:$hadoopMavenArtifactVersion") {
+  compile("org.apache.hadoop:hadoop-common:$hadoopMavenArtifactVersion") {
     force = true
   }
   if (hasCustomHdfsDep) {
-    compile ("org.apache.hadoop:${hdfsDependency}:$hadoopMavenArtifactVersion") {
+    compile("org.apache.hadoop:${hdfsDependency}:$hadoopMavenArtifactVersion") {
       force = true
     }
   }
@@ -38,11 +38,11 @@ dependencies {
   compile project(":h2o-web")
   compile project(":h2o-avro-parser")
   // Include GCS persist layer
-  compile(project(":h2o-persist-gcs"))
+  compile project(":h2o-persist-gcs")
   // Include S3 persist layer
-  compile(project(":h2o-persist-s3"))
+  compile project(":h2o-persist-s3")
   // Include HDFS persist layer
-  compile (project(':h2o-persist-hdfs')) {
+  compile(project(':h2o-persist-hdfs')) {
     transitive = false
   }
   compile(project(':h2o-hive')) {
diff --git a/h2o-hadoop-2/h2o-cdh5.10-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.10-assembly/build.gradle
index b78a4fefb1f4..038d2445c8b5 100644
--- a/h2o-hadoop-2/h2o-cdh5.10-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.10-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.13-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.13-assembly/build.gradle
index fcb7259e8b47..9cecb599929a 100644
--- a/h2o-hadoop-2/h2o-cdh5.13-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.13-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.14-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.14-assembly/build.gradle
index d0845f05586b..97dc3c1f50b5 100644
--- a/h2o-hadoop-2/h2o-cdh5.14-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.14-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.15-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.15-assembly/build.gradle
index bb3e31d406ec..ab2617a626b4 100644
--- a/h2o-hadoop-2/h2o-cdh5.15-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.15-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.16-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.16-assembly/build.gradle
index 71a89245418e..e0d2c84e94a4 100644
--- a/h2o-hadoop-2/h2o-cdh5.16-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.16-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.4-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.4-assembly/build.gradle
index aa08a18a3a49..d947a5207001 100644
--- a/h2o-hadoop-2/h2o-cdh5.4-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.4-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.5-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.5-assembly/build.gradle
index f8397012a2ad..91c836beef17 100644
--- a/h2o-hadoop-2/h2o-cdh5.5-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.5-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.6-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.6-assembly/build.gradle
index 8991f8c50efb..bff077b69460 100644
--- a/h2o-hadoop-2/h2o-cdh5.6-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.6-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.7-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.7-assembly/build.gradle
index 324ca20c3bf7..5366be11b9b9 100644
--- a/h2o-hadoop-2/h2o-cdh5.7-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.7-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.8-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.8-assembly/build.gradle
index 7b5fb38b489d..c45b26be4d25 100644
--- a/h2o-hadoop-2/h2o-cdh5.8-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.8-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-cdh5.9-assembly/build.gradle b/h2o-hadoop-2/h2o-cdh5.9-assembly/build.gradle
index 43c2b9567fd7..94b85ac0b699 100644
--- a/h2o-hadoop-2/h2o-cdh5.9-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-cdh5.9-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-hdp2.2-assembly/build.gradle b/h2o-hadoop-2/h2o-hdp2.2-assembly/build.gradle
index f436c4e50d3e..deedebb7cfe2 100644
--- a/h2o-hadoop-2/h2o-hdp2.2-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-hdp2.2-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-hdp2.3-assembly/build.gradle b/h2o-hadoop-2/h2o-hdp2.3-assembly/build.gradle
index 0712bb5f7630..a98e134b3377 100644
--- a/h2o-hadoop-2/h2o-hdp2.3-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-hdp2.3-assembly/build.gradle
@@ -3,13 +3,12 @@ ext {
   hadoopMavenArtifactVersion = '2.7.1.2.3.2.0-2950'
   orcSupported = true
   orcHiveExecVersion = "1.2.1"
-
 }
 
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-hdp2.4-assembly/build.gradle b/h2o-hadoop-2/h2o-hdp2.4-assembly/build.gradle
index 4dad31b479ce..4189f3270bf0 100644
--- a/h2o-hadoop-2/h2o-hdp2.4-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-hdp2.4-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-hdp2.5-assembly/build.gradle b/h2o-hadoop-2/h2o-hdp2.5-assembly/build.gradle
index faad9f3f0943..02766883fbd3 100644
--- a/h2o-hadoop-2/h2o-hdp2.5-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-hdp2.5-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-hdp2.6-assembly/build.gradle b/h2o-hadoop-2/h2o-hdp2.6-assembly/build.gradle
index e0bdc08ea5d8..de6524590ef9 100644
--- a/h2o-hadoop-2/h2o-hdp2.6-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-hdp2.6-assembly/build.gradle
@@ -9,7 +9,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-iop4.2-assembly/build.gradle b/h2o-hadoop-2/h2o-iop4.2-assembly/build.gradle
index c875ac614207..f3b6bc93a16c 100644
--- a/h2o-hadoop-2/h2o-iop4.2-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-iop4.2-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-mapr4.0-assembly/build.gradle b/h2o-hadoop-2/h2o-mapr4.0-assembly/build.gradle
index 1d02735ffb8e..53ef0d6e5a2c 100644
--- a/h2o-hadoop-2/h2o-mapr4.0-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-mapr4.0-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-mapr5.0-assembly/build.gradle b/h2o-hadoop-2/h2o-mapr5.0-assembly/build.gradle
index 25953033c4f8..27fa1d5eccb6 100644
--- a/h2o-hadoop-2/h2o-mapr5.0-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-mapr5.0-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-mapr5.1-assembly/build.gradle b/h2o-hadoop-2/h2o-mapr5.1-assembly/build.gradle
index 5f9c451dde01..5eca27bd1f25 100644
--- a/h2o-hadoop-2/h2o-mapr5.1-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-mapr5.1-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-mapr5.2-assembly/build.gradle b/h2o-hadoop-2/h2o-mapr5.2-assembly/build.gradle
index 0464caccdd73..15132f8758ed 100644
--- a/h2o-hadoop-2/h2o-mapr5.2-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-mapr5.2-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-mapr6.0-assembly/build.gradle b/h2o-hadoop-2/h2o-mapr6.0-assembly/build.gradle
index 03a2526293f9..bc34d727b1c3 100644
--- a/h2o-hadoop-2/h2o-mapr6.0-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-mapr6.0-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-2/h2o-mapr6.1-assembly/build.gradle b/h2o-hadoop-2/h2o-mapr6.1-assembly/build.gradle
index 578a432d4216..a9807532d7c8 100644
--- a/h2o-hadoop-2/h2o-mapr6.1-assembly/build.gradle
+++ b/h2o-hadoop-2/h2o-mapr6.1-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-8")) {
+  compile(project(":h2o-jetty-8")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-3/assemblyjar.gradle b/h2o-hadoop-3/assemblyjar.gradle
index 7d5e91a61ee0..5c8ea98fdea0 100644
--- a/h2o-hadoop-3/assemblyjar.gradle
+++ b/h2o-hadoop-3/assemblyjar.gradle
@@ -25,10 +25,10 @@ dependencies {
     // Include S3 persist layer
     compile(project(":h2o-persist-s3"))
     // Include HDFS persist layer
-    compile (project(':h2o-persist-hdfs')) {
+    compile(project(':h2o-persist-hdfs')) {
         transitive = false
     }
-    compile (project(':h2o-hive')) {
+    compile(project(':h2o-hive')) {
         transitive = false
     }
 
diff --git a/h2o-hadoop-3/h2o-cdh6.0-assembly/build.gradle b/h2o-hadoop-3/h2o-cdh6.0-assembly/build.gradle
index c41ef228dc8f..c8627c15d790 100644
--- a/h2o-hadoop-3/h2o-cdh6.0-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-cdh6.0-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-    compile (project(":h2o-jetty-9")) {
+    compile(project(":h2o-jetty-9")) {
         exclude module: "servlet-api"
         exclude group: "javax.servlet", module: "javax.servlet-api"
     }
diff --git a/h2o-hadoop-3/h2o-cdh6.1-assembly/build.gradle b/h2o-hadoop-3/h2o-cdh6.1-assembly/build.gradle
index 2cf4209535e1..3af1a0863548 100644
--- a/h2o-hadoop-3/h2o-cdh6.1-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-cdh6.1-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-    compile (project(":h2o-jetty-9")) {
+    compile(project(":h2o-jetty-9")) {
         exclude module: "servlet-api"
         exclude group: "javax.servlet", module: "javax.servlet-api"
     }
diff --git a/h2o-hadoop-3/h2o-cdh6.2-assembly/build.gradle b/h2o-hadoop-3/h2o-cdh6.2-assembly/build.gradle
index bbc6a1366385..2e8930248758 100644
--- a/h2o-hadoop-3/h2o-cdh6.2-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-cdh6.2-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-    compile (project(":h2o-jetty-9")) {
+    compile(project(":h2o-jetty-9")) {
         exclude module: "servlet-api"
         exclude group: "javax.servlet", module: "javax.servlet-api"
     }
diff --git a/h2o-hadoop-3/h2o-cdh6.3-assembly/build.gradle b/h2o-hadoop-3/h2o-cdh6.3-assembly/build.gradle
index 56edef241331..10a7ba1ee337 100644
--- a/h2o-hadoop-3/h2o-cdh6.3-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-cdh6.3-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-    compile (project(":h2o-jetty-9")) {
+    compile(project(":h2o-jetty-9")) {
         exclude module: "servlet-api"
         exclude group: "javax.servlet", module: "javax.servlet-api"
     }
diff --git a/h2o-hadoop-3/h2o-cdp7.0-assembly/build.gradle b/h2o-hadoop-3/h2o-cdp7.0-assembly/build.gradle
index c12d0717974a..f6920d1bb995 100644
--- a/h2o-hadoop-3/h2o-cdp7.0-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-cdp7.0-assembly/build.gradle
@@ -16,7 +16,7 @@ configurations {
 }
 
 dependencies {
-    compile (project(":h2o-jetty-9")) {
+    compile(project(":h2o-jetty-9")) {
         exclude module: "servlet-api"
         exclude group: "javax.servlet", module: "javax.servlet-api"
     }
@@ -39,10 +39,10 @@ dependencies {
     // Include S3 persist layer
     compile(project(":h2o-persist-s3"))
     // Include HDFS persist layer
-    compile (project(':h2o-persist-hdfs')) {
+    compile(project(':h2o-persist-hdfs')) {
         transitive = false
     }
-    compile (project(':h2o-hive')) {
+    compile(project(':h2o-hive')) {
         transitive = false
     }
 
diff --git a/h2o-hadoop-3/h2o-hdp3.0-assembly/build.gradle b/h2o-hadoop-3/h2o-hdp3.0-assembly/build.gradle
index 6738cf69f955..ba4e2630399c 100644
--- a/h2o-hadoop-3/h2o-hdp3.0-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-hdp3.0-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-9")) {
+  compile(project(":h2o-jetty-9")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/h2o-hadoop-3/h2o-hdp3.1-assembly/build.gradle b/h2o-hadoop-3/h2o-hdp3.1-assembly/build.gradle
index 671de5f3bc69..f53f613562b3 100644
--- a/h2o-hadoop-3/h2o-hdp3.1-assembly/build.gradle
+++ b/h2o-hadoop-3/h2o-hdp3.1-assembly/build.gradle
@@ -8,7 +8,7 @@ ext {
 apply from: '../assemblyjar.gradle'
 
 dependencies {
-  compile (project(":h2o-jetty-9")) {
+  compile(project(":h2o-jetty-9")) {
     exclude module: "servlet-api"
     exclude group: "javax.servlet", module: "javax.servlet-api"
   }
diff --git a/settings.gradle b/settings.gradle
index b58068c2b100..55048f67e8fa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -177,17 +177,29 @@ rootProject.children.each { project ->
 //
 if (System.getProperty("user.name").equals("jenkins")
         || System.getenv("BUILD_HADOOP") != null
-        || System.getenv("H2O_TARGET") != null) {
-
-  // Default hadoop build targets
-  def allTargets = [
-         "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",
-         "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", "iop4.2"
-  ]
+        || System.getenv("H2O_TARGET") != null
+        || hadoopTargets) {
+  // check if a filter prop or env var is defined
+  def targetsFilter
+  if (System.getenv("H2O_TARGET") != null) {
+    // env can override gradle property
+    targetsFilter = System.getenv("H2O_TARGET")
+  } else if (hadoopTargets) {
+    targetsFilter = hadoopTargets
+  }
   // Compute targets
-  def targets = System.getenv("H2O_TARGET") != null ? System.getenv("H2O_TARGET").split(",").collect { it.trim() } : allTargets
+  def targets
+  if (targetsFilter) {
+    targets = targetsFilter.split(",").collect { it.trim() }
+  } else {
+    targets = [ // build all
+            "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",
+            "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", "iop4.2"
+    ]
+  }
+  logger.debug("Building hadoops " + targets)
   // Include selected/all Hadoop targets
   if (System.getenv("BUILD_HADOOP") != "false") {
     targets.each { name ->
@@ -195,4 +207,6 @@ if (System.getProperty("user.name").equals("jenkins")
       include "h2o-hadoop-3:h2o-${name}-assembly"
     }
   }
+} else {
+  logger.debug("Not building hadoop jars")
 }