Skip to content

Commit

Permalink
[build] allow hadoop target distros to be set from gradle.properties (h…
Browse files Browse the repository at this point in the history
  • Loading branch information
Honza Sterba authored May 27, 2020
1 parent 47cb7e8 commit 7f4d4d5
Show file tree
Hide file tree
Showing 36 changed files with 72 additions and 59 deletions.
9 changes: 5 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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
#
Expand All @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions gradle/components/xgboost.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
dependencies {
compile project(":h2o-genmodel-ext-xgboost")
compile project(":h2o-ext-xgboost")
}
}
4 changes: 2 additions & 2 deletions h2o-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions h2o-hadoop-2/assemblyjar.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand All @@ -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')) {
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.10-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.13-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.14-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.15-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.16-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.4-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.5-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.6-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.7-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.8-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-cdh5.9-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-hdp2.2-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
3 changes: 1 addition & 2 deletions h2o-hadoop-2/h2o-hdp2.3-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-hdp2.4-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-hdp2.5-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-hdp2.6-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-iop4.2-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-mapr4.0-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-mapr5.0-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-mapr5.1-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-mapr5.2-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-mapr6.0-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-2/h2o-mapr6.1-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions h2o-hadoop-3/assemblyjar.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-3/h2o-cdh6.0-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-3/h2o-cdh6.1-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-3/h2o-cdh6.2-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-3/h2o-cdh6.3-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 3 additions & 3 deletions h2o-hadoop-3/h2o-cdp7.0-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-3/h2o-hdp3.0-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion h2o-hadoop-3/h2o-hdp3.1-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Loading

0 comments on commit 7f4d4d5

Please sign in to comment.