#2638 removed health-guice library and other related deprecated depen…

…dencies. The apis relying on those libraries were removed too.
Netflix · Jan 31, 2022 · a85f68f · a85f68f
1 parent 0f45ac9
commit a85f68f
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 375 deletions.
diff --git a/contribs/dependencies.lock b/contribs/dependencies.lock
@@ -7,7 +7,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.12.130"
+            "locked": "1.12.146"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -184,7 +184,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.12.130"
+            "locked": "1.12.146"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -348,7 +348,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.12.130"
+            "locked": "1.12.146"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [
@@ -527,7 +527,7 @@
             "locked": "1.11.86"
         },
         "com.amazonaws:aws-java-sdk-sqs": {
-            "locked": "1.12.130"
+            "locked": "1.12.146"
         },
         "com.fasterxml.jackson.core:jackson-core": {
             "firstLevelTransitive": [

diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock
@@ -78,12 +78,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -262,12 +256,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -436,12 +424,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -616,12 +598,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"

diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock
@@ -78,12 +78,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -265,12 +259,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -442,12 +430,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -634,12 +616,6 @@
         "com.netflix.conductor:conductor-grpc": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-grpc"
-            ],
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"

diff --git a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCModule.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCModule.java
@@ -7,20 +7,14 @@
 import com.netflix.conductor.grpc.TaskServiceGrpc;
 import com.netflix.conductor.grpc.WorkflowServiceGrpc;
 import com.netflix.conductor.grpc.server.service.EventServiceImpl;
-import com.netflix.conductor.grpc.server.service.HealthServiceImpl;
 import com.netflix.conductor.grpc.server.service.MetadataServiceImpl;
 import com.netflix.conductor.grpc.server.service.TaskServiceImpl;
 import com.netflix.conductor.grpc.server.service.WorkflowServiceImpl;
 
-import io.grpc.health.v1.HealthGrpc;
-
 public class GRPCModule extends AbstractModule {
 
     @Override
     protected void configure() {
-
-        bind(HealthGrpc.HealthImplBase.class).to(HealthServiceImpl.class);
-
         bind(EventServiceGrpc.EventServiceImplBase.class).to(EventServiceImpl.class);
         bind(MetadataServiceGrpc.MetadataServiceImplBase.class).to(MetadataServiceImpl.class);
         bind(TaskServiceGrpc.TaskServiceImplBase.class).to(TaskServiceImpl.class);

diff --git a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/HealthServiceImpl.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/HealthServiceImpl.java
diff --git a/...server/src/test/java/com/netflix/conductor/grpc/server/service/HealthServiceImplTest.java b/...server/src/test/java/com/netflix/conductor/grpc/server/service/HealthServiceImplTest.java
diff --git a/grpc/build.gradle b/grpc/build.gradle
@@ -17,8 +17,6 @@ dependencies {
     compile "com.google.api.grpc:proto-google-common-protos:1.0.0"
     compile "io.grpc:grpc-protobuf:${revGrpc}"
     compile "io.grpc:grpc-stub:${revGrpc}"
-
-    compile "com.netflix.runtime:health-api:${revHealth}"
 }
 
 protobuf {

diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock
@@ -68,9 +68,6 @@
         "com.netflix.conductor:conductor-core": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -217,9 +214,6 @@
         "com.netflix.conductor:conductor-core": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -386,9 +380,6 @@
         "com.netflix.conductor:conductor-core": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -535,9 +526,6 @@
         "com.netflix.conductor:conductor-core": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -690,9 +678,6 @@
         "com.netflix.conductor:conductor-core": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"
@@ -845,9 +830,6 @@
         "com.netflix.conductor:conductor-core": {
             "project": true
         },
-        "com.netflix.runtime:health-api": {
-            "locked": "1.1.4"
-        },
         "com.netflix.servo:servo-core": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-core"

diff --git a/jersey/build.gradle b/jersey/build.gradle
@@ -3,8 +3,6 @@ dependencies {
     compile project(':conductor-common')
     compile project(':conductor-core')
 
-    compile "com.netflix.runtime:health-api:${revHealth}"
-
     compile "javax.ws.rs:jsr311-api:${revJsr311Api}"
     compile "io.swagger:swagger-jaxrs:${revSwagger}"
     compile "com.sun.jersey:jersey-bundle:${revJerseyBundle}"