Revert "remove force = true"

This reverts commit d05298b.
h2oai · May 9, 2024 · 26ea81a · 26ea81a
1 parent 11b5fbe
commit 26ea81a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 25 deletions.
diff --git a/h2o-hadoop-2/assemblyjar.gradle b/h2o-hadoop-2/assemblyjar.gradle
@@ -19,19 +19,24 @@ if (hasCustomHdfsDep) {
 }
 
 dependencies {
-  api("org.apache.hadoop:hadoop-client")
-  api("org.apache.hadoop:hadoop-common")
-
+  api("org.apache.hadoop:hadoop-client:$hadoopMavenArtifactVersion") {
+    force = true
+  }
+  api("org.apache.hadoop:hadoop-common:$hadoopMavenArtifactVersion") {
+    force = true
+  }
   if (hasCustomHdfsDep) {
-      api("org.apache.hadoop:${hdfsDependency}")
+    api("org.apache.hadoop:${hdfsDependency}:$hadoopMavenArtifactVersion") {
+      force = true
+    }
   }
-
   api(project(":h2o-mapreduce-generic")) {
     transitive = false
   }
   api project(":h2o-security")
   api project(":h2o-ext-steam")
-  api('com.google.guava:guava')
+  // Libraries need for Google Cloud Storage strongly require this Guava version
+  api('com.google.guava:guava:20.0') {force = true}
   api(project(':h2o-app')) {
     exclude module: "${defaultWebserverModule}"
   }
@@ -73,17 +78,6 @@ dependencies {
   api(project(":h2o-parquet-parser")) {
     transitive = false
   }
-
-  constraints {
-    api("org.apache.hadoop:hadoop-client:$hadoopMavenArtifactVersion")
-    api("org.apache.hadoop:hadoop-common:$hadoopMavenArtifactVersion")
-    if (hasCustomHdfsDep) {
-      api("org.apache.hadoop:${hdfsDependency}:$hadoopMavenArtifactVersion")
-    }
-    // Libraries needed for Google Cloud Storage strongly require this Guava version
-    api('com.google.guava:guava:20.0')
-  }
-
 }
 
 apply from: "${rootDir}/h2o-parsers/h2o-parquet-parser/parquet_dependencies.gradle"

diff --git a/h2o-hadoop-3/assemblyjar.gradle b/h2o-hadoop-3/assemblyjar.gradle
@@ -16,13 +16,10 @@ dependencies {
     api "org.apache.hadoop:hadoop-mapreduce-client-app:$hadoopMavenArtifactVersion"
     api "org.apache.hadoop:hadoop-aws:$hadoopMavenArtifactVersion"
     // Libraries need for Google Cloud Storage strongly require this Guava version
-    api('com.google.guava:guava')
+    api('com.google.guava:guava:20.0') { force = true }
     api(project(':h2o-app')) {
         exclude module: "${defaultWebserverModule}"
     }
-    constraints {
-        api('com.google.guava:guava:20.0')
-    }
 }
 
 apply from: '../assemblyjar_common.gradle'
diff --git a/h2o-hadoop-3/assemblyjar_cdp.gradle b/h2o-hadoop-3/assemblyjar_cdp.gradle
@@ -22,17 +22,14 @@ dependencies {
     compileOnly "org.apache.hadoop:hadoop-client:$hadoopMavenArtifactVersion"
     compileOnly "org.apache.hadoop:hadoop-mapreduce-client-app:$hadoopMavenArtifactVersion"
     // Libraries need for Google Cloud Storage strongly require this Guava version
-    api('com.google.guava:guava')
+    api('com.google.guava:guava:20.0') { force = true }
     api(project(':h2o-app')) {
         exclude module: "${defaultWebserverModule}"
         exclude module: "h2o-ext-krbstandalone" // exclude here to avoid pulling all transitive dependencies
     }
     api(project(':h2o-ext-krbstandalone')) { // include without dependencies
         transitive = false
     }
-    constraints {
-        api('com.google.guava:guava:20.0')
-    }
 }
 
 apply from: '../assemblyjar_common.gradle'