sb3

archive/build.gradle

@@ -1,8 +1,8 @@
 dependencies {
 
-    implementation "com.netflix.conductor:conductor-common:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-core:${versions.revConductor}"
-    implementation ("com.netflix.conductor:conductor-postgres-persistence:${versions.revConductor}")
+    implementation "org.conductoross:conductor-common:${versions.revConductor}"
+    implementation "org.conductoross:conductor-core:${versions.revConductor}"
+    implementation ("org.conductoross:conductor-postgres-persistence:${versions.revConductor}")
 
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'

archive/src/main/java/io/orkes/conductor/dao/postgres/archive/PostgresArchiveDAOConfiguration.java

@@ -12,7 +12,6 @@
  */
 package io.orkes.conductor.dao.postgres.archive;
 
-import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 
 import org.apache.logging.log4j.util.Strings;
@@ -36,6 +35,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

build.gradle

@@ -1,12 +1,12 @@
 buildscript {
     dependencies {
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:2.5.15"
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.1.4'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
     }
 }
 
 plugins {
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'io.spring.dependency-management' version '1.0.13.RELEASE'
 }
 
 ext {
@@ -15,7 +15,7 @@ ext {
     springBootVersion = '2.7.6'
 
     versions = [
-            revConductor            : '3.15.0',
+            revConductor            : '3.16.0',
             revTestContainer        : '1.17.2',
             revGuava                : '32.0.0-jre',
             revLog4j                : '2.17.1',
@@ -75,28 +75,30 @@ subprojects {
         }
     }
 
-    dependencies {
 
+
+    dependencies {
         implementation('net.minidev:json-smart') {
             version {
                 strictly '2.4.10'
             }
         }
 
-        implementation 'com.amazonaws:aws-java-sdk-s3:1.12.548'
-        implementation "redis.clients:jedis:${versions.revJedis}"
-
-        implementation "org.apache.logging.log4j:log4j-core:${versions.revLog4j}!!"
-        implementation "org.apache.logging.log4j:log4j-api:${versions.revLog4j}!!"
-        implementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.revLog4j}!!"
-        implementation "org.apache.logging.log4j:log4j-jul:${versions.revLog4j}!!"
-        implementation "org.apache.logging.log4j:log4j-web:${versions.revLog4j}!!"
-        implementation "org.apache.logging.log4j:log4j-to-slf4j:${versions.revLog4j}!!"
-
+        implementation('org.apache.logging.log4j:log4j-core')
+        implementation('org.apache.logging.log4j:log4j-api')
+        implementation('org.apache.logging.log4j:log4j-slf4j-impl')
+        implementation('org.apache.logging.log4j:log4j-jul')
+        implementation('org.apache.logging.log4j:log4j-web')
+        annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
         compileOnly "org.projectlombok:lombok:${versions.revLombok}"
         annotationProcessor "org.projectlombok:lombok:${versions.revLombok}"
-        testAnnotationProcessor "org.projectlombok:lombok:${versions.revLombok}"
         implementation "org.apache.commons:commons-lang3:${versions.revCommonsLang}"
+
+        testImplementation('org.springframework.boot:spring-boot-starter-test')
+        testImplementation('org.springframework.boot:spring-boot-starter-log4j2')
+        testAnnotationProcessor "org.projectlombok:lombok:${versions.revLombok}"
+        testImplementation 'junit:junit'
+        testImplementation "org.junit.vintage:junit-vintage-engine"
     }
 
     allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

persistence/build.gradle

@@ -2,8 +2,8 @@ dependencies {
 
 
 
-    implementation "com.netflix.conductor:conductor-common:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-core:${versions.revConductor}"
+    implementation "org.conductoross:conductor-common:${versions.revConductor}"
+    implementation "org.conductoross:conductor-core:${versions.revConductor}"
     compileOnly 'org.springframework.boot:spring-boot-starter'
 
     implementation "redis.clients:jedis:${versions.revJedis}"

run_tests.sh

@@ -3,7 +3,7 @@ docker build -f docker/DockerfileStandalone . -t conductor_test_container
 docker run -dit --name conductor_test_container -p 8899:8080 -p 4535:5000 -t conductor_test_container
 COUNTER=0
 MAX_TIME=120
-while ! curl -s http://localhost:8899/api/metadata/workflow -o /dev/null
+while ! curl -s http://localhost:8080/api/metadata/workflow -o /dev/null
 do
   echo "$(date) - still trying - since $COUNTER second, will wait for $MAX_TIME"
   sleep 1

server/build.gradle

@@ -6,21 +6,21 @@ jar {
 }
 dependencies {
 
-    implementation "com.netflix.conductor:conductor-common:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-core:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-redis-lock:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-grpc:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-rest:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-redis-concurrency-limit:${versions.revConductor}"
-
-    implementation "com.netflix.conductor:conductor-http-task:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-awss3-storage:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-awssqs-event-queue:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-json-jq-task:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-amqp:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-nats:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-kafka:${versions.revConductor}"
-    implementation "com.netflix.conductor:conductor-metrics:${versions.revConductor}"
+    implementation "org.conductoross:conductor-common:${versions.revConductor}"
+    implementation "org.conductoross:conductor-core:${versions.revConductor}"
+    implementation "org.conductoross:conductor-redis-lock:${versions.revConductor}"
+    implementation "org.conductoross:conductor-grpc:${versions.revConductor}"
+    implementation "org.conductoross:conductor-rest:${versions.revConductor}"
+    implementation "org.conductoross:conductor-redis-concurrency-limit:${versions.revConductor}"
+
+    implementation "org.conductoross:conductor-http-task:${versions.revConductor}"
+    implementation "org.conductoross:conductor-awss3-storage:${versions.revConductor}"
+    implementation "org.conductoross:conductor-awssqs-event-queue:${versions.revConductor}"
+    implementation "org.conductoross:conductor-json-jq-task:${versions.revConductor}"
+    implementation "org.conductoross:conductor-amqp:${versions.revConductor}"
+    implementation "org.conductoross:conductor-nats:${versions.revConductor}"
+    implementation "org.conductoross:conductor-kafka:${versions.revConductor}"
+    implementation "org.conductoross:conductor-metrics:${versions.revConductor}"
 
     implementation "io.orkes.queues:orkes-conductor-queues:${versions.revOrkesQueues}"
     implementation project(":orkes-conductor-archive")
@@ -35,6 +35,7 @@ dependencies {
 
 
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-actuator-autoconfigure'
     implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -48,9 +49,20 @@ dependencies {
 
     runtimeOnly 'com.netflix.spectator:spectator-reg-micrometer'
     implementation "io.micrometer:micrometer-registry-prometheus:1.7.5"
-    implementation "io.micrometer:micrometer-core:1.8.0"
+    implementation "io.micrometer:micrometer-core:1.11.4"
+
+
+
+//    implementation "com.netflix.spectator:spectator-reg-metrics3:${revSpectator}"
+//    implementation "com.netflix.spectator:spectator-reg-micrometer:${revSpectator}"
+//    implementation "io.prometheus:simpleclient:${revPrometheus}"
+//    implementation "io.micrometer:micrometer-registry-prometheus:${revMicrometer}"
+
+
+
 
     implementation "com.jayway.jsonpath:json-path:${versions.revJsonPath}"
+    implementation "redis.clients:jedis:${versions.revJedis}"
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'

server/src/main/java/io/orkes/conductor/OrkesConductorApplication.java

@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import javax.annotation.PostConstruct;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +44,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.servers.Server;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

server/src/main/java/io/orkes/conductor/rest/WorkflowResourceSync.java

@@ -15,8 +15,6 @@
 import java.util.ArrayList;
 import java.util.concurrent.*;
 
-import javax.annotation.PostConstruct;
-
 import org.springframework.web.bind.annotation.*;
 
 import com.netflix.conductor.common.metadata.workflow.StartWorkflowRequest;
@@ -27,6 +25,7 @@
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

server/src/main/resources/application.properties

@@ -66,6 +66,7 @@ conductor.app.taskOutputPayloadSizeThreshold=102400
 conductor.app.taskInputPayloadSizeThreshold=102400
 
 # Additional modules for metrics collection exposed to Datadog (optional)
+management.datadog.metrics.export.enabled=false
 management.metrics.export.datadog.enabled=${conductor.metrics-datadog.enabled:false}
 management.metrics.export.datadog.api-key=${conductor.metrics-datadog.api-key:}
 

server/src/main/resources/banner.txt

@@ -1,16 +1,8 @@
 
-  ______   .______       __  ___  _______     _______.
- /  __  \  |   _  \     |  |/  / |   ____|   /       |
-|  |  |  | |  |_)  |    |  '  /  |  |__     |   (----`
-|  |  |  | |      /     |    <   |   __|     \   \
-|  `--'  | |  |\  \----.|  .  \  |  |____.----)   |
- \______/  | _| `._____||__|\__\ |_______|_______/
-
   ______   ______   .__   __.  _______   __    __    ______ .___________.  ______   .______
  /      | /  __  \  |  \ |  | |       \ |  |  |  |  /      ||           | /  __  \  |   _  \
 |  ,----'|  |  |  | |   \|  | |  .--.  ||  |  |  | |  ,----'`---|  |----`|  |  |  | |  |_)  |
 |  |     |  |  |  | |  . `  | |  |  |  ||  |  |  | |  |         |  |     |  |  |  | |      /
 |  `----.|  `--'  | |  |\   | |  '--'  ||  `--'  | |  `----.    |  |     |  `--'  | |  |\  \----.
  \______| \______/  |__| \__| |_______/  \______/   \______|    |__|      \______/  | _| `._____|
 
-Licensed under Orkes Conductor Community License

server/src/main/resources/logback-spring.xml

@@ -5,7 +5,7 @@
               class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
-                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1}): %msg%n%throwable
             </Pattern>
         </layout>
     </appender>

test-harness/src/test/java/io/orkes/conductor/client/e2e/AbstractConductorTest.java

@@ -1,22 +1,37 @@
+/*
+ * Copyright 2024 Orkes, Inc.
+ * <p>
+ * Licensed under the Orkes Community License (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * https://github.com/orkes-io/licenses/blob/main/community/LICENSE.txt
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
 package io.orkes.conductor.client.e2e;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.testcontainers.containers.GenericContainer;
+
 import com.netflix.conductor.common.config.ObjectMapperProvider;
 import com.netflix.conductor.common.metadata.workflow.WorkflowDef;
 import com.netflix.conductor.sdk.workflow.executor.WorkflowExecutor;
+
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.OrkesMetadataClient;
 import io.orkes.conductor.client.http.OrkesTaskClient;
 import io.orkes.conductor.client.http.OrkesWorkflowClient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.GenericContainer;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.List;
 
 @Slf4j
 public abstract class AbstractConductorTest {
@@ -31,7 +46,10 @@ public abstract class AbstractConductorTest {
     protected static io.orkes.conductor.client.MetadataClient metadataClient;
     protected static WorkflowExecutor executor;
 
-    protected static final String[] workflows = new String[]{"/metadata/rerun.json", "/metadata/popminmax.json", "/metadata/fail.json"};
+    protected static final String[] workflows =
+            new String[] {
+                "/metadata/rerun.json", "/metadata/popminmax.json", "/metadata/fail.json"
+            };
 
     @SneakyThrows
     @BeforeAll
@@ -46,7 +64,8 @@ public static final void setup() {
 
         for (String workflow : workflows) {
             InputStream resource = AbstractConductorTest.class.getResourceAsStream(workflow);
-            WorkflowDef workflowDef = objectMapper.readValue(new InputStreamReader(resource), WorkflowDef.class);
+            WorkflowDef workflowDef =
+                    objectMapper.readValue(new InputStreamReader(resource), WorkflowDef.class);
             metadataClient.updateWorkflowDefs(List.of(workflowDef), true);
         }
     }
@@ -55,10 +74,4 @@ public static final void setup() {
     public static void cleanup() {
         executor.shutdown();
     }
-
-
-
-
-
 }
-

test-harness/src/test/java/io/orkes/conductor/client/e2e/ConductorStartupTest.java

@@ -1,12 +1,21 @@
+/*
+ * Copyright 2024 Orkes, Inc.
+ * <p>
+ * Licensed under the Orkes Community License (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * https://github.com/orkes-io/licenses/blob/main/community/LICENSE.txt
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
 package io.orkes.conductor.client.e2e;
 
 import org.junit.jupiter.api.Test;
 
 public class ConductorStartupTest extends AbstractConductorTest {
 
-
     @Test
-    public void test() {
-
-    }
+    public void test() {}
 }