From 74e00376b94e1c2cfb544ebc09d0cdc7a0c1ac11 Mon Sep 17 00:00:00 2001 From: Tao Jiang Date: Mon, 18 Oct 2021 16:28:34 -0500 Subject: [PATCH] Remove dependency on Netflix Servo (#2503) Netflix Servo is a deprecated library. Conductor's dependency on Servo can be simply removed due to code related to Servo Stopwatch is not used anywhere. Also need to explicitly add Guava after removing servo dependency. Build and test pass except cassandraDaoTest during test teardown for cleanupData. Will investigate more on explicitly adding guava dependency causing test failure. Update dependencis lock Force downgrade guava version on cassandra persistence dependencies due to incompatible with cassandra test. Signed-off-by: Tao Jiang --- azureblob-storage/dependencies.lock | 24 +++++++------- cassandra-persistence/build.gradle | 8 ++++- cassandra-persistence/dependencies.lock | 27 +++++++++------- contribs/dependencies.lock | 18 ++++------- core/build.gradle | 3 +- core/dependencies.lock | 24 +++++++------- .../netflix/conductor/metrics/Monitors.java | 31 ++++--------------- dependencies.gradle | 1 - es6-persistence/dependencies.lock | 18 ++++------- es7-persistence/dependencies.lock | 18 ++++------- grpc-server/dependencies.lock | 24 +++++++------- mysql-persistence/dependencies.lock | 18 ++++------- postgres-persistence/dependencies.lock | 18 ++++------- redis-lock/dependencies.lock | 24 +++++++------- redis-persistence/dependencies.lock | 24 +++++++------- rest/dependencies.lock | 24 +++++++------- server/dependencies.lock | 21 ++----------- test-harness/dependencies.lock | 7 +---- zookeeper-lock/dependencies.lock | 24 +++++++------- 19 files changed, 148 insertions(+), 208 deletions(-) diff --git a/azureblob-storage/dependencies.lock b/azureblob-storage/dependencies.lock index e7d445dda..93be47b91 100644 --- a/azureblob-storage/dependencies.lock +++ b/azureblob-storage/dependencies.lock @@ -57,6 +57,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -79,12 +85,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -192,6 +192,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -214,12 +220,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle index af41a7906..6c1161eee 100644 --- a/cassandra-persistence/build.gradle +++ b/cassandra-persistence/build.gradle @@ -18,13 +18,19 @@ dependencies { implementation "com.datastax.cassandra:cassandra-driver-core:${revCassandra}" implementation "org.apache.commons:commons-lang3" - implementation 'org.apache.logging.log4j:log4j-web' testImplementation("org.cassandraunit:cassandra-unit:${revCassandraUnit}") { exclude group: "com.datastax.cassandra", module: "cassandra-driver-core" } + // Using higher guava version than the following causes test failure. + testImplementation ('com.google.guava:guava') { + version { + strictly '23.6.1-jre' + } + } + testImplementation project(':conductor-core').sourceSets.test.output testImplementation project(':conductor-common').sourceSets.test.output } diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index 2e8520260..68b3ec22d 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -60,6 +60,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -82,12 +88,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -146,6 +146,9 @@ "com.datastax.cassandra:cassandra-driver-core": { "locked": "3.10.2" }, + "com.google.guava:guava": { + "locked": "23.6.1-jre" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -204,6 +207,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "23.6.1-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -226,12 +235,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/contribs/dependencies.lock b/contribs/dependencies.lock index 4c1926b28..e5fca2c5c 100644 --- a/contribs/dependencies.lock +++ b/contribs/dependencies.lock @@ -100,6 +100,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -124,12 +127,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -313,6 +310,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -337,12 +337,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/core/build.gradle b/core/build.gradle index c78e76463..1347aa5e3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -34,7 +34,8 @@ dependencies { implementation "io.reactivex:rxjava:${revRxJava}" - implementation "com.netflix.servo:servo-core:${revServo}" + implementation "com.google.guava:guava:${revGuava}" + implementation "com.netflix.spectator:spectator-api:${revSpectator}" implementation "org.apache.bval:bval-jsr:${revBval}" diff --git a/core/dependencies.lock b/core/dependencies.lock index db2a4b70a..5ae4c111c 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -14,6 +14,9 @@ "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.11.4" }, + "com.google.guava:guava": { + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "locked": "3.13.0" }, @@ -23,9 +26,6 @@ "com.netflix.conductor:conductor-common": { "project": true }, - "com.netflix.servo:servo-core": { - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "locked": "0.122.0" }, @@ -85,6 +85,9 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -97,9 +100,6 @@ "com.netflix.conductor:conductor-common": { "project": true }, - "com.netflix.servo:servo-core": { - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "locked": "0.122.0" }, @@ -141,6 +141,9 @@ "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.11.4" }, + "com.google.guava:guava": { + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "locked": "3.13.0" }, @@ -150,9 +153,6 @@ "com.netflix.conductor:conductor-common": { "project": true }, - "com.netflix.servo:servo-core": { - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "locked": "0.122.0" }, @@ -227,6 +227,9 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -239,9 +242,6 @@ "com.netflix.conductor:conductor-common": { "project": true }, - "com.netflix.servo:servo-core": { - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "locked": "0.122.0" }, diff --git a/core/src/main/java/com/netflix/conductor/metrics/Monitors.java b/core/src/main/java/com/netflix/conductor/metrics/Monitors.java index c01e99f52..5bb9a612b 100644 --- a/core/src/main/java/com/netflix/conductor/metrics/Monitors.java +++ b/core/src/main/java/com/netflix/conductor/metrics/Monitors.java @@ -15,8 +15,6 @@ import com.netflix.conductor.common.metadata.tasks.Task; import com.netflix.conductor.common.metadata.tasks.Task.Status; import com.netflix.conductor.common.run.Workflow.WorkflowStatus; -import com.netflix.servo.monitor.BasicStopwatch; -import com.netflix.servo.monitor.Stopwatch; import com.netflix.spectator.api.Counter; import com.netflix.spectator.api.DistributionSummary; import com.netflix.spectator.api.Gauge; @@ -49,18 +47,6 @@ public class Monitors { private Monitors() { } - /** - * @param className Name of the class - * @param methodName Method name - */ - public static void error(String className, String methodName) { - getCounter(className, "workflow_server_error", "methodName", methodName).increment(); - } - - public static Stopwatch start(String className, String name, String... additionalTags) { - return start(getTimer(className, name, additionalTags)); - } - /** * Increment a counter that is used to measure the rate at which some event is occurring. Consider a simple queue, * counters would be used to measure things like the rate at which items are being inserted and removed. @@ -148,18 +134,13 @@ private static Map toMap(String className, String... additionalT return tags; } - private static Stopwatch start(Timer sm) { - Stopwatch sw = new BasicStopwatch() { - @Override - public void stop() { - super.stop(); - long duration = getDuration(TimeUnit.MILLISECONDS); - sm.record(duration, TimeUnit.MILLISECONDS); - } - }; - sw.start(); - return sw; + /** + * @param className Name of the class + * @param methodName Method name + */ + public static void error(String className, String methodName) { + getCounter(className, "workflow_server_error", "methodName", methodName).increment(); } public static void recordGauge(String name, long count, String... tags) { diff --git a/dependencies.gradle b/dependencies.gradle index b2052796c..c6b835d67 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -56,7 +56,6 @@ ext { revRarefiedRedis = '0.0.17' revRedisson = '3.13.3' revRxJava = '1.2.2' - revServo = '0.13.0' revSpectator = '0.122.0' revSpock = '1.3-groovy-2.5' revSpotifyCompletableFutures = '0.3.3' diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 39c76944a..85418edd4 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -67,6 +67,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -91,12 +94,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -229,6 +226,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -253,12 +253,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/es7-persistence/dependencies.lock b/es7-persistence/dependencies.lock index da95a024f..8b14c83b7 100644 --- a/es7-persistence/dependencies.lock +++ b/es7-persistence/dependencies.lock @@ -70,6 +70,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -94,12 +97,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -237,6 +234,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -261,12 +261,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index cd62be0c8..cf4fd2684 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -60,6 +60,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -87,12 +93,6 @@ "com.netflix.conductor:conductor-grpc": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -233,6 +233,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -260,12 +266,6 @@ "com.netflix.conductor:conductor-grpc": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/mysql-persistence/dependencies.lock b/mysql-persistence/dependencies.lock index 99163a100..d32e02e0a 100644 --- a/mysql-persistence/dependencies.lock +++ b/mysql-persistence/dependencies.lock @@ -70,6 +70,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -94,12 +97,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -232,6 +229,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -256,12 +256,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/postgres-persistence/dependencies.lock b/postgres-persistence/dependencies.lock index 47afe4b84..dc9573001 100644 --- a/postgres-persistence/dependencies.lock +++ b/postgres-persistence/dependencies.lock @@ -70,6 +70,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -94,12 +97,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -232,6 +229,9 @@ "locked": "1.0.0" }, "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { @@ -256,12 +256,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index 6cc55675e..aa77c4013 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -54,6 +54,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -76,12 +82,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -195,6 +195,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -217,12 +223,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index e7e13477e..39e550940 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -57,6 +57,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -82,12 +88,6 @@ "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -201,6 +201,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -226,12 +232,6 @@ "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/rest/dependencies.lock b/rest/dependencies.lock index b5ac16cbd..53f7af6ae 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -54,6 +54,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -79,12 +85,6 @@ "com.netflix.runtime:health-api": { "locked": "1.1.4" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -198,6 +198,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -223,12 +229,6 @@ "com.netflix.runtime:health-api": { "locked": "1.1.4" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/server/dependencies.lock b/server/dependencies.lock index 5bf7a7056..49d7dbf1b 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -124,6 +124,7 @@ "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", + "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-postgres-persistence" @@ -222,12 +223,6 @@ ], "locked": "1.1.4" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -531,6 +526,7 @@ "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", + "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-postgres-persistence" @@ -629,12 +625,6 @@ ], "locked": "1.1.4" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1018,6 +1008,7 @@ "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", + "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-postgres-persistence" @@ -1116,12 +1107,6 @@ ], "locked": "1.1.4" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index ea021035e..7d19295a7 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -179,6 +179,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-contribs", + "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-mysql-persistence", @@ -328,12 +329,6 @@ ], "locked": "1.1.4" }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client", diff --git a/zookeeper-lock/dependencies.lock b/zookeeper-lock/dependencies.lock index ab2ee5474..84b9f2696 100644 --- a/zookeeper-lock/dependencies.lock +++ b/zookeeper-lock/dependencies.lock @@ -54,6 +54,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -76,12 +82,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -192,6 +192,12 @@ ], "locked": "1.0.0" }, + "com.google.guava:guava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "30.0-jre" + }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -214,12 +220,6 @@ "com.netflix.conductor:conductor-core": { "project": true }, - "com.netflix.servo:servo-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "0.13.0" - }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core"