Add guava to shaded libs (#43)

Co-authored-by: Calvin Cheung <ccheung@netflix.com>
Netflix · Jul 10, 2020 · f9a2ead · f9a2ead
1 parent a875e1d
commit f9a2ead
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/...worker/src/main/java/io/mantisrx/server/worker/WorkerExecutionOperationsNetworkStage.java b/...worker/src/main/java/io/mantisrx/server/worker/WorkerExecutionOperationsNetworkStage.java
@@ -32,8 +32,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
+import io.mantisrx.shaded.com.google.common.base.Splitter;
+import io.mantisrx.shaded.com.google.common.base.Strings;
 import com.netflix.spectator.api.Registry;
 import io.mantisrx.common.WorkerPorts;
 import io.mantisrx.common.metrics.MetricsRegistry;

diff --git a/...ver-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/ClutchAutoScaler.java b/...ver-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/ClutchAutoScaler.java
@@ -24,9 +24,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.util.concurrent.AtomicDouble;
+import io.mantisrx.shaded.com.google.common.cache.Cache;
+import io.mantisrx.shaded.com.google.common.cache.CacheBuilder;
+import io.mantisrx.shaded.com.google.common.util.concurrent.AtomicDouble;
 import com.yahoo.labs.samoa.instances.Attribute;
 import io.mantisrx.runtime.descriptor.StageScalingPolicy;
 import io.mantisrx.runtime.descriptor.StageSchedulingInfo;

diff --git a/...ntisrx/server/worker/jobmaster/clutch/experimental/MantisClutchConfigurationSelector.java b/...ntisrx/server/worker/jobmaster/clutch/experimental/MantisClutchConfigurationSelector.java
@@ -16,7 +16,7 @@
 
 package io.mantisrx.server.worker.jobmaster.clutch.experimental;
 
-import com.google.common.util.concurrent.AtomicDouble;
+import io.mantisrx.shaded.com.google.common.util.concurrent.AtomicDouble;
 
 import com.netflix.control.clutch.Clutch;
 import com.netflix.control.clutch.ClutchConfiguration;

diff --git a/.../src/main/java/io/mantisrx/server/worker/jobmaster/control/controllers/PIDController.java b/.../src/main/java/io/mantisrx/server/worker/jobmaster/control/controllers/PIDController.java
@@ -17,7 +17,7 @@
 package io.mantisrx.server.worker.jobmaster.control.controllers;
 
 
-import com.google.common.util.concurrent.AtomicDouble;
+import io.mantisrx.shaded.com.google.common.util.concurrent.AtomicDouble;
 import io.mantisrx.server.worker.jobmaster.control.Controller;
 
 

diff --git a/mantis-shaded/build.gradle b/mantis-shaded/build.gradle
@@ -18,6 +18,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 ext {
     jacksonVersion = '2.10.+'
+    guavaVersion = '18.+'
 }
 
 configurations {
@@ -36,6 +37,7 @@ dependencies {
     shaded "com.fasterxml.jackson.module:jackson-module-afterburner:$jacksonVersion"
     shaded "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:$jacksonVersion"
     shaded "io.vavr:vavr-jackson:$vavrVersion"
+    shaded "com.google.guava:guava:$guavaVersion"
 
     implementation "io.vavr:vavr:$vavrVersion"
 }
@@ -45,6 +47,8 @@ shadowJar {
     configurations = [project.configurations.shaded]
     relocate 'com.fasterxml', 'io.mantisrx.shaded.com.fasterxml'
     relocate 'io.vavr.jackson.datatype', 'io.mantisrx.shaded.io.vavr.jackson.datatype'
+    relocate 'com.google.common', 'io.mantisrx.shaded.com.google.common'
+
     mergeServiceFiles()
 }