remove force = true v2

h2oai · May 9, 2024 · 6d9f394 · 6d9f394
1 parent 26ea81a
commit 6d9f394
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/h2o-hadoop-2/assemblyjar.gradle b/h2o-hadoop-2/assemblyjar.gradle
@@ -19,15 +19,15 @@ if (hasCustomHdfsDep) {
 }
 
 dependencies {
-  api("org.apache.hadoop:hadoop-client:$hadoopMavenArtifactVersion") {
-    force = true
+  api("org.apache.hadoop:hadoop-client") {
+    version { strictly hadoopMavenArtifactVersion }
   }
-  api("org.apache.hadoop:hadoop-common:$hadoopMavenArtifactVersion") {
-    force = true
+  api("org.apache.hadoop:hadoop-common") {
+    version { strictly hadoopMavenArtifactVersion }
   }
   if (hasCustomHdfsDep) {
-    api("org.apache.hadoop:${hdfsDependency}:$hadoopMavenArtifactVersion") {
-      force = true
+    api("org.apache.hadoop:${hdfsDependency}") {
+      version { strictly hadoopMavenArtifactVersion }
     }
   }
   api(project(":h2o-mapreduce-generic")) {
@@ -36,7 +36,9 @@ dependencies {
   api project(":h2o-security")
   api project(":h2o-ext-steam")
   // Libraries need for Google Cloud Storage strongly require this Guava version
-  api('com.google.guava:guava:20.0') {force = true}
+  api('com.google.guava:guava') {
+    version { strictly '20.0' }
+  }
   api(project(':h2o-app')) {
     exclude module: "${defaultWebserverModule}"
   }

diff --git a/h2o-hadoop-3/assemblyjar.gradle b/h2o-hadoop-3/assemblyjar.gradle
@@ -16,7 +16,9 @@ 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:20.0') { force = true }
+    api('com.google.guava:guava') {
+        version { strictly '20.0' }
+    }
     api(project(':h2o-app')) {
         exclude module: "${defaultWebserverModule}"
     }

diff --git a/h2o-hadoop-3/assemblyjar_cdp.gradle b/h2o-hadoop-3/assemblyjar_cdp.gradle
@@ -22,7 +22,9 @@ 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:20.0') { force = true }
+    api('com.google.guava:guava') {
+        version { strictly '20.0' }
+    }
     api(project(':h2o-app')) {
         exclude module: "${defaultWebserverModule}"
         exclude module: "h2o-ext-krbstandalone" // exclude here to avoid pulling all transitive dependencies