diff --git a/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/WorkerExecutionOperationsNetworkStage.java b/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/WorkerExecutionOperationsNetworkStage.java index b6dc8ea15..e6cab1cef 100644 --- a/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/WorkerExecutionOperationsNetworkStage.java +++ b/mantis-server/mantis-server-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/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/ClutchAutoScaler.java b/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/ClutchAutoScaler.java index 9d62f8943..25c329488 100644 --- a/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/ClutchAutoScaler.java +++ b/mantis-server/mantis-server-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/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/experimental/MantisClutchConfigurationSelector.java b/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/experimental/MantisClutchConfigurationSelector.java index b0976a7bf..036efc818 100644 --- a/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/clutch/experimental/MantisClutchConfigurationSelector.java +++ b/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/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/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/control/controllers/PIDController.java b/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/control/controllers/PIDController.java index 4334ca83e..19afc129a 100644 --- a/mantis-server/mantis-server-worker/src/main/java/io/mantisrx/server/worker/jobmaster/control/controllers/PIDController.java +++ b/mantis-server/mantis-server-worker/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 index 13465ef29..019c90e30 100644 --- 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() }