From 26ea81a6ea37f0c4536d33c76dd91d658fe211fe Mon Sep 17 00:00:00 2001
From: krasinski <8573352+krasinski@users.noreply.github.com>
Date: Wed, 24 Apr 2024 15:58:56 +0200
Subject: [PATCH] Revert "remove force = true"

This reverts commit d05298bcabe9cd578f8ba0bc0ef98b09b084fe5c.
---
 h2o-hadoop-2/assemblyjar.gradle     | 28 +++++++++++-----------------
 h2o-hadoop-3/assemblyjar.gradle     |  5 +----
 h2o-hadoop-3/assemblyjar_cdp.gradle |  5 +----
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/h2o-hadoop-2/assemblyjar.gradle b/h2o-hadoop-2/assemblyjar.gradle
index c9afc98a7348..d87a359b6ff9 100644
--- 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
index ddf9f020b8be..56fa74c96463 100644
--- 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
index 41bd314a18be..0f5ca09780e8 100644
--- a/h2o-hadoop-3/assemblyjar_cdp.gradle
+++ b/h2o-hadoop-3/assemblyjar_cdp.gradle
@@ -22,7 +22,7 @@ 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
@@ -30,9 +30,6 @@ dependencies {
     api(project(':h2o-ext-krbstandalone')) { // include without dependencies
         transitive = false
     }
-    constraints {
-        api('com.google.guava:guava:20.0')
-    }
 }
 
 apply from: '../assemblyjar_common.gradle'