Temporarily revert 5a0dcc1 to make dyno-queues default again

conductor-oss · Jan 3, 2024 · 6f60dbd · 6f60dbd
1 parent b26cea5
commit 6f60dbd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -44,7 +44,6 @@ ext {
     revJsr311Api = '1.1.1'
     revMockServerClient = '5.12.0'
     revSpringDoc = '2.1.0'
-    revOrkesQueues = '1.0.7'
     revPowerMock = '2.0.9'
     revProtoBuf = '3.21.12'
     revProtogenAnnotations = '1.0.0'

diff --git a/server/build.gradle b/server/build.gradle
@@ -67,7 +67,6 @@ dependencies {
     implementation "redis.clients:jedis:${revJedis}"
 
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation "io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}"
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
 

diff --git a/server/dependencies.lock b/server/dependencies.lock
@@ -71,9 +71,6 @@
         "com.netflix.conductor:conductor-workflow-event-listener": {
             "project": true
         },
-        "io.orkes.queues:orkes-conductor-queues": {
-            "locked": "1.0.7"
-        },
         "org.apache.logging.log4j:log4j-api": {
             "locked": "2.20.0"
         },
@@ -141,7 +138,9 @@
         },
         "com.fasterxml.jackson.core:jackson-annotations": {
             "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-core"
+                "com.netflix.conductor:conductor-core",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server"
             ],
             "locked": "2.15.2"
         },
@@ -151,6 +150,8 @@
                 "com.netflix.conductor:conductor-common-persistence",
                 "com.netflix.conductor:conductor-core",
                 "com.netflix.conductor:conductor-es7-persistence",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server",
                 "com.netflix.conductor:conductor-mysql-persistence",
                 "com.netflix.conductor:conductor-postgres-persistence"
             ],
@@ -162,6 +163,8 @@
                 "com.netflix.conductor:conductor-common-persistence",
                 "com.netflix.conductor:conductor-core",
                 "com.netflix.conductor:conductor-es7-persistence",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server",
                 "com.netflix.conductor:conductor-mysql-persistence",
                 "com.netflix.conductor:conductor-postgres-persistence"
             ],
@@ -460,9 +463,6 @@
             ],
             "locked": "2.15.6"
         },
-        "io.orkes.queues:orkes-conductor-queues": {
-            "locked": "1.0.7"
-        },
         "io.prometheus:simpleclient": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-metrics"
@@ -851,7 +851,9 @@
         },
         "com.fasterxml.jackson.core:jackson-annotations": {
             "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-core"
+                "com.netflix.conductor:conductor-core",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server"
             ],
             "locked": "2.15.2"
         },
@@ -861,6 +863,8 @@
                 "com.netflix.conductor:conductor-common-persistence",
                 "com.netflix.conductor:conductor-core",
                 "com.netflix.conductor:conductor-es7-persistence",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server",
                 "com.netflix.conductor:conductor-mysql-persistence",
                 "com.netflix.conductor:conductor-postgres-persistence"
             ],
@@ -872,6 +876,8 @@
                 "com.netflix.conductor:conductor-common-persistence",
                 "com.netflix.conductor:conductor-core",
                 "com.netflix.conductor:conductor-es7-persistence",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server",
                 "com.netflix.conductor:conductor-mysql-persistence",
                 "com.netflix.conductor:conductor-postgres-persistence"
             ],
@@ -1170,9 +1176,6 @@
             ],
             "locked": "2.15.6"
         },
-        "io.orkes.queues:orkes-conductor-queues": {
-            "locked": "1.0.7"
-        },
         "io.prometheus:simpleclient": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-metrics"
@@ -1616,9 +1619,6 @@
         "io.grpc:grpc-testing": {
             "locked": "1.57.2"
         },
-        "io.orkes.queues:orkes-conductor-queues": {
-            "locked": "1.0.7"
-        },
         "junit:junit": {
             "locked": "4.13.2"
         },
@@ -1695,7 +1695,9 @@
         },
         "com.fasterxml.jackson.core:jackson-annotations": {
             "firstLevelTransitive": [
-                "com.netflix.conductor:conductor-core"
+                "com.netflix.conductor:conductor-core",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server"
             ],
             "locked": "2.15.2"
         },
@@ -1705,6 +1707,8 @@
                 "com.netflix.conductor:conductor-common-persistence",
                 "com.netflix.conductor:conductor-core",
                 "com.netflix.conductor:conductor-es7-persistence",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server",
                 "com.netflix.conductor:conductor-mysql-persistence",
                 "com.netflix.conductor:conductor-postgres-persistence"
             ],
@@ -1716,6 +1720,8 @@
                 "com.netflix.conductor:conductor-common-persistence",
                 "com.netflix.conductor:conductor-core",
                 "com.netflix.conductor:conductor-es7-persistence",
+                "com.netflix.conductor:conductor-grpc",
+                "com.netflix.conductor:conductor-grpc-server",
                 "com.netflix.conductor:conductor-mysql-persistence",
                 "com.netflix.conductor:conductor-postgres-persistence"
             ],
@@ -2017,9 +2023,6 @@
             ],
             "locked": "2.15.6"
         },
-        "io.orkes.queues:orkes-conductor-queues": {
-            "locked": "1.0.7"
-        },
         "io.prometheus:simpleclient": {
             "firstLevelTransitive": [
                 "com.netflix.conductor:conductor-metrics"

diff --git a/server/src/main/java/com/netflix/conductor/Conductor.java b/server/src/main/java/com/netflix/conductor/Conductor.java
@@ -21,14 +21,12 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.io.FileSystemResource;
 
 // Prevents from the datasource beans to be loaded, AS they are needed only for specific databases.
 // In case that SQL database is selected this class will be imported back in the appropriate
 // database persistence module.
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
-@ComponentScan(basePackages = {"com.netflix.conductor", "io.orkes.conductor"})
 public class Conductor {
 
     private static final Logger log = LoggerFactory.getLogger(Conductor.class);