From 898187857aa3c059374a63686c2e8bfb533adda7 Mon Sep 17 00:00:00 2001 From: Young-Zen <40934357+Young-Zen@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:08:48 +0800 Subject: [PATCH 1/6] Fix JSONPath replace failed with line terminator (#3810) --- .../conductor/core/utils/ParametersUtils.java | 3 ++- .../core/utils/ParametersUtilsTest.java | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java b/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java index 1d8422bab1..15f8363f64 100644 --- a/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java +++ b/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java @@ -48,7 +48,8 @@ public class ParametersUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ParametersUtils.class); private static final Pattern PATTERN = Pattern.compile( - "(?=(?> map = new TypeReference<>() {}; diff --git a/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java b/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java index eb2f239219..2f3c207514 100644 --- a/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java +++ b/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java @@ -257,6 +257,30 @@ public void testNestedPathExpressions() throws Exception { assertEquals(5, replaced.get("k3")); } + @Test + public void testReplaceWithLineTerminators() throws Exception { + Map map = new HashMap<>(); + map.put("name", "conductor"); + map.put("version", 2); + + Map input = new HashMap<>(); + input.put("k1", "Name: ${name}; Version: ${version};"); + input.put("k2", "Name: ${name};\nVersion: ${version};"); + input.put("k3", "Name: ${name};\rVersion: ${version};"); + input.put("k4", "Name: ${name};\r\nVersion: ${version};"); + + Object jsonObj = objectMapper.readValue(objectMapper.writeValueAsString(map), Object.class); + + Map replaced = parametersUtils.replace(input, jsonObj); + + assertNotNull(replaced); + + assertEquals("Name: conductor; Version: 2;", replaced.get("k1")); + assertEquals("Name: conductor;\nVersion: 2;", replaced.get("k2")); + assertEquals("Name: conductor;\rVersion: 2;", replaced.get("k3")); + assertEquals("Name: conductor;\r\nVersion: 2;", replaced.get("k4")); + } + @Test public void testReplaceWithEscapedTags() throws Exception { Map map = new HashMap<>(); From be790a45341495a319badc739d2c1beb07bb1a7d Mon Sep 17 00:00:00 2001 From: Weiying Hua <92573864+wy-hua@users.noreply.github.com> Date: Sun, 12 Nov 2023 11:10:41 +0800 Subject: [PATCH 2/6] Bugfix/Data inconsistency caused by updateEventHandler (#3843) * remove previous index of event handlers by event if event handler's event gets updated * run ./gradlew spotlessApply --- .../com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java index c3270706b0..e0aa0bfd8a 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java @@ -72,6 +72,9 @@ public void updateEventHandler(EventHandler eventHandler) { throw new NotFoundException( "EventHandler with name %s not found!", eventHandler.getName()); } + if (!existing.getEvent().equals(eventHandler.getEvent())) { + removeIndex(existing); + } index(eventHandler); jedisProxy.hset(nsKey(EVENT_HANDLERS), eventHandler.getName(), toJson(eventHandler)); recordRedisDaoRequests("updateEventHandler"); From de2ca100f7aefa2a2d2c3041139fad089f56a734 Mon Sep 17 00:00:00 2001 From: Bert Verstraete Date: Sun, 12 Nov 2023 09:51:54 +0100 Subject: [PATCH 3/6] Fix WorkflowRepairService and AsyncSystemTaskExecutor race condition (#3836) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue Summary: There's a race condition in the system involving async system tasks and the WorkflowRepairService. For example, when a SUB_WORKFLOW task starts, the WorkflowRepairService sometimes erroneously reinserts the task into the processing queue because it perceives the task as out-of-sync between the ExecutorDAO and the queueDAO. This issue stems from the AsyncSystemTaskExecutor updating a task's status only after it removes it from the queue, creating a window where the WorkflowRepairService can wrongly assess the task state. This leads to duplicate subworkflows/http/… tasks being executed concurrently, which complicates maintaining idempotency of Tasks. Proposed Solution: To resolve the issue, it's suggested that the AsyncSystemTaskExecutor should update the status of tasks before removing them from the queue. This should close the window where the WorkflowRepairService can misidentify the task state and prevent unnecessary re-queuing of tasks. An edge case we’ve considered is if the process crashes after the task is updated but before it's removed from the queue. If that happens, the executor will simply remove the task from the queue the next time it runs, thereby not affecting system correctness. Co-authored-by: Jaim Silva --- .../core/execution/AsyncSystemTaskExecutor.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java index dd7975425f..331a2b4ac9 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java @@ -110,6 +110,7 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { } boolean hasTaskExecutionCompleted = false; + boolean shouldRemoveTaskFromQueue = false; String workflowId = task.getWorkflowInstanceId(); // if we are here the Task object is updated and needs to be persisted regardless of an // exception @@ -130,7 +131,7 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { String.format( "Workflow is in %s state", workflow.getStatus().toString())); } - queueDAO.remove(queueName, task.getTaskId()); + shouldRemoveTaskFromQueue = true; return; } @@ -156,13 +157,12 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { // Update message in Task queue based on Task status // Remove asyncComplete system tasks from the queue that are not in SCHEDULED state if (isTaskAsyncComplete && task.getStatus() != TaskModel.Status.SCHEDULED) { - queueDAO.remove(queueName, task.getTaskId()); + shouldRemoveTaskFromQueue = true; hasTaskExecutionCompleted = true; } else if (task.getStatus().isTerminal()) { task.setEndTime(System.currentTimeMillis()); - queueDAO.remove(queueName, task.getTaskId()); + shouldRemoveTaskFromQueue = true; hasTaskExecutionCompleted = true; - LOGGER.debug("{} removed from queue: {}", task, queueName); } else { task.setCallbackAfterSeconds(systemTaskCallbackTime); systemTask @@ -188,6 +188,10 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { LOGGER.error("Error executing system task - {}, with id: {}", systemTask, taskId, e); } finally { executionDAOFacade.updateTask(task); + if (shouldRemoveTaskFromQueue) { + queueDAO.remove(queueName, task.getTaskId()); + LOGGER.debug("{} removed from queue: {}", task, queueName); + } // if the current task execution has completed, then the workflow needs to be evaluated if (hasTaskExecutionCompleted) { workflowExecutor.decide(workflowId); From f9b7e5cd0aad18d9f6ff0eda42464e53d206123f Mon Sep 17 00:00:00 2001 From: Richard Meng Date: Sun, 12 Nov 2023 16:52:31 +0800 Subject: [PATCH 4/6] Update versions (#3792) * Version updates --- annotations-processor/build.gradle | 4 +- annotations-processor/dependencies.lock | 26 ++-- annotations/dependencies.lock | 10 +- awss3-storage/dependencies.lock | 36 ++--- awssqs-event-queue/dependencies.lock | 48 +++--- build.gradle | 17 +- cassandra-persistence/dependencies.lock | 58 +++---- client-spring/dependencies.lock | 50 +++--- client/dependencies.lock | 58 +++---- common/dependencies.lock | 62 ++++---- core/dependencies.lock | 80 +++++----- .../IsolatedTaskQueueProducerSpec.groovy | 1 - dependencies.gradle | 14 +- dependencies.lock | 10 +- es6-persistence/dependencies.lock | 54 +++---- grpc-client/dependencies.lock | 66 ++++---- grpc-server/build.gradle | 2 + grpc-server/dependencies.lock | 66 ++++---- grpc/build.gradle | 4 +- grpc/dependencies.lock | 86 +++++----- http-task/dependencies.lock | 46 +++--- java-sdk/dependencies.lock | 68 ++++---- json-jq-task/dependencies.lock | 36 ++--- redis-concurrency-limit/dependencies.lock | 64 ++++---- redis-lock/dependencies.lock | 36 ++--- redis-persistence/dependencies.lock | 36 ++--- rest/dependencies.lock | 42 ++--- server/build.gradle | 4 + server/dependencies.lock | 147 +++++++++--------- test-harness/dependencies.lock | 81 +++++----- 30 files changed, 665 insertions(+), 647 deletions(-) diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index 2bb9a52aa3..008983429f 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -5,10 +5,10 @@ sourceSets { dependencies { implementation project(':conductor-annotations') - api 'com.google.guava:guava:31.1-jre' + api 'com.google.guava:guava:32.1.2-jre' api 'com.squareup:javapoet:1.13.+' api 'com.github.jknack:handlebars:4.3.+' - api 'com.google.protobuf:protobuf-java:3.21.7' + api 'com.google.protobuf:protobuf-java:3.21.12' api 'javax.annotation:javax.annotation-api:1.3.2' api gradleApi() diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 481b791d0a..bb22aff8c3 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -9,10 +9,10 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -84,10 +84,10 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -134,10 +134,10 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -170,10 +170,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -181,10 +181,10 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -232,10 +232,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock index 7b2c9a2acf..14b3eca049 100644 --- a/annotations/dependencies.lock +++ b/annotations/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -61,10 +61,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -90,10 +90,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index b3c1cb3078..4fb904f6d2 100644 --- a/awss3-storage/dependencies.lock +++ b/awss3-storage/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -44,27 +44,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -77,7 +77,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -232,10 +232,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -246,27 +246,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -279,7 +279,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -346,7 +346,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index 8e9e5e5328..671cb6d474 100644 --- a/awssqs-event-queue/dependencies.lock +++ b/awssqs-event-queue/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -9,7 +9,7 @@ "locked": "1.11.86" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -39,7 +39,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -50,27 +50,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -79,14 +79,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -150,7 +150,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -211,7 +211,7 @@ "locked": "1.11.86" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -247,13 +247,13 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -264,27 +264,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -293,14 +293,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -367,7 +367,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -426,13 +426,13 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6e6ea6f6ec..a003f4e2e7 100644 --- a/build.gradle +++ b/build.gradle @@ -8,18 +8,18 @@ buildscript { } } dependencies { - classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0' - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.3' + classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.16' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+' } } plugins { - id 'io.spring.dependency-management' version '1.0.13.RELEASE' + id 'io.spring.dependency-management' version '1.1.3' id 'java' id 'application' id 'jacoco' - id 'nebula.netflixoss' version '10.6.0' + id 'com.netflix.nebula.netflixoss' version '11.3.2' id 'org.sonarqube' version '3.4.0.2513' } @@ -47,13 +47,16 @@ apply from: "$rootDir/dependencies.gradle" apply from: "$rootDir/springboot-bom-overrides.gradle" allprojects { - apply plugin: 'nebula.netflixoss' + apply plugin: 'com.netflix.nebula.netflixoss' apply plugin: 'io.spring.dependency-management' apply plugin: 'java-library' apply plugin: 'project-report' - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } group = 'com.netflix.conductor' diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index 66f9c31d8c..63bdd05b9f 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -44,27 +44,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -77,7 +77,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -202,7 +202,7 @@ "locked": "3.10.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -232,28 +232,28 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testcontainers:cassandra": { - "locked": "1.15.3" + "locked": "1.18.3" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.18.3" } }, "testRuntimeClasspath": { @@ -264,27 +264,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -297,7 +297,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -364,7 +364,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -414,7 +414,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -426,22 +426,22 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testcontainers:cassandra": { - "locked": "1.15.3" + "locked": "1.18.3" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.18.3" } } } \ No newline at end of file diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock index 4e7ca32b3c..aac7041258 100644 --- a/client-spring/dependencies.lock +++ b/client-spring/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -53,44 +53,44 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-java-sdk" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -150,7 +150,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -224,7 +224,7 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testCompileClasspath": { @@ -262,13 +262,13 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -288,44 +288,44 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-java-sdk" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -388,7 +388,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -465,13 +465,13 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/client/dependencies.lock b/client/dependencies.lock index 6b0ee6cac9..d070447de8 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -9,10 +9,10 @@ "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.netflix.conductor:conductor-common": { "project": true @@ -68,31 +68,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,7 +122,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -177,10 +177,10 @@ "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.netflix.conductor:conductor-common": { "project": true @@ -222,7 +222,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -240,16 +240,16 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -260,31 +260,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -317,7 +317,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -361,7 +361,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -379,16 +379,16 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/common/dependencies.lock b/common/dependencies.lock index 83f5cb299a..9310ea3944 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "annotationsProcessorCodegen": { @@ -15,13 +15,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -82,22 +82,22 @@ }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -121,30 +121,30 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -182,16 +182,16 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -200,7 +200,7 @@ "locked": "4.13.2" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -224,27 +224,27 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -253,7 +253,7 @@ "locked": "4.13.2" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -292,13 +292,13 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/core/dependencies.lock b/core/dependencies.lock index 5699af6af0..47426a63a3 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -1,24 +1,24 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -45,7 +45,7 @@ "locked": "2.3.3" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -69,36 +69,36 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" @@ -107,7 +107,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -143,7 +143,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -192,19 +192,19 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -234,7 +234,7 @@ "locked": "4.13.2" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -255,7 +255,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -267,45 +267,45 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" @@ -314,7 +314,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -353,7 +353,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -397,7 +397,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -409,22 +409,22 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } } } \ No newline at end of file diff --git a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy index 3673c00911..f9270d336e 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy @@ -45,7 +45,6 @@ class IsolatedTaskQueueProducerSpec extends Specification { Duration.ofSeconds(10)) } - @Test def "addTaskQueuesAddsElementToQueue"() { given: TaskDef taskDef = new TaskDef(isolationGroupId: "isolated") diff --git a/dependencies.gradle b/dependencies.gradle index 547b4f1aee..34b0a7cab7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -18,7 +18,7 @@ ext { revActivation = '2.0.0' revAwaitility = '3.1.6' revAwsSdk = '1.11.86' - revBval = '2.0.5' + revBval = '2.0.6' revCassandra = '3.10.2' revCassandraUnit = '3.11.2.0' revCommonsIo = '2.7' @@ -26,9 +26,9 @@ ext { revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '2.5.22' - revGrpc = '1.+' - revGuava = '30.0-jre' + revGroovy = '3.0.19' + revGrpc = '1.57.+' + revGuava = '32.1.2-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' revJAXB = '2.3.3' @@ -43,14 +43,14 @@ ext { revOpenapi = '1.6.+' revOrkesQueues = '1.0.3' revPowerMock = '2.0.9' - revProtoBuf = '3.21.7' + revProtoBuf = '3.21.12' revProtogenAnnotations = '1.0.0' revProtogenCodegen = '1.4.0' revRarefiedRedis = '0.0.17' revRedisson = '3.13.3' revRxJava = '1.2.2' revSpectator = '0.122.0' - revSpock = '1.3-groovy-2.5' + revSpock = '2.3-groovy-3.0' revSpotifyCompletableFutures = '0.3.3' - revTestContainer = '1.15.3' + revTestContainer = '1.18.3' } diff --git a/dependencies.lock b/dependencies.lock index b2d91aea12..a5a57a3279 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -71,10 +71,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -100,10 +100,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 9fb73e7bc5..d121a0ec45 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -1,12 +1,12 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -45,10 +45,10 @@ "locked": "6.8.12" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "runtimeClasspath": { @@ -56,27 +56,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -85,14 +85,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -223,7 +223,7 @@ }, "testCompileClasspath": { "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -271,16 +271,16 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" } }, "testRuntimeClasspath": { @@ -288,27 +288,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -317,14 +317,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -391,7 +391,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -462,16 +462,16 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" } } } \ No newline at end of file diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 95623d88c3..b1099e000f 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -1,15 +1,15 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -18,13 +18,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -53,29 +53,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -93,19 +93,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -117,7 +117,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -171,10 +171,10 @@ }, "testCompileClasspath": { "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -183,13 +183,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "junit:junit": { "locked": "4.13.2" @@ -219,10 +219,10 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -230,29 +230,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -270,19 +270,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -297,7 +297,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -352,10 +352,10 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/grpc-server/build.gradle b/grpc-server/build.gradle index d17d784a40..eb80c22c68 100644 --- a/grpc-server/build.gradle +++ b/grpc-server/build.gradle @@ -7,8 +7,10 @@ dependencies { implementation "io.grpc:grpc-netty:${revGrpc}" implementation "io.grpc:grpc-services:${revGrpc}" + implementation "io.grpc:grpc-protobuf:${revGrpc}" implementation "org.apache.commons:commons-lang3" testImplementation "io.grpc:grpc-testing:${revGrpc}" + testImplementation "io.grpc:grpc-protobuf:${revGrpc}" testImplementation "org.testinfected.hamcrest-matchers:all-matchers:${revHamcrestAllMatchers}" } diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 6dcec71647..b33fc69669 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -15,10 +15,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.57.2" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -39,7 +42,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -47,27 +50,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -127,22 +130,22 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -173,7 +176,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -245,13 +248,16 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.57.2" }, "junit:junit": { "locked": "4.13.2" @@ -278,10 +284,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" @@ -292,27 +298,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -372,25 +378,25 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -424,7 +430,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -488,10 +494,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" diff --git a/grpc/build.gradle b/grpc/build.gradle index 6286e2a0f6..fabaac0d42 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -39,13 +39,13 @@ dependencies { def artifactName = 'com.google.protobuf:protoc:3.14.0:osx-x86_64' switch (org.gradle.internal.os.OperatingSystem.current()) { case org.gradle.internal.os.OperatingSystem.LINUX: - artifactName = "com.google.protobuf:protoc:3.21.7" + artifactName = "com.google.protobuf:protoc:3.21.12" break; case org.gradle.internal.os.OperatingSystem.MAC_OS: artifactName = "com.google.protobuf:protoc:3.14.0:osx-x86_64" break; case org.gradle.internal.os.OperatingSystem.WINDOWS: - artifactName = "com.google.protobuf:protoc:3.21.7" + artifactName = "com.google.protobuf:protoc:3.21.12" break; } diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 82071c38cb..f508c75425 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -1,21 +1,21 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -41,25 +41,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -71,10 +71,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -83,7 +83,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -129,12 +129,12 @@ }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.57.1" + "locked": "1.57.2" } }, "protobufToolsLocator_protoc": { "com.google.protobuf:protoc": { - "locked": "3.14.0" + "locked": "3.21.12" } }, "runtimeClasspath": { @@ -142,25 +142,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -172,10 +172,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -184,7 +184,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -230,16 +230,16 @@ }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -266,10 +266,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testCompileProtoPath": { @@ -277,25 +277,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -307,10 +307,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -322,7 +322,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -369,10 +369,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -380,25 +380,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -410,10 +410,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -425,7 +425,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -472,10 +472,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index f6669d5c91..3d3972570d 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -30,10 +30,10 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -41,27 +41,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -238,16 +238,16 @@ "locked": "5.12.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testcontainers:mockserver": { - "locked": "1.15.3" + "locked": "1.18.3" } }, "testRuntimeClasspath": { @@ -255,27 +255,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -288,7 +288,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -358,7 +358,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -426,16 +426,16 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testcontainers:mockserver": { - "locked": "1.15.3" + "locked": "1.18.3" } } } \ No newline at end of file diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 17084fccf3..5e4ce49e65 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -9,10 +9,10 @@ "locked": "3.3.0" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-client": { "project": true @@ -62,40 +62,40 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -146,7 +146,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -216,13 +216,13 @@ "locked": "3.3.0" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-client": { "project": true @@ -258,7 +258,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -270,19 +270,19 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.30" } }, "testRuntimeClasspath": { @@ -299,40 +299,40 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -386,7 +386,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -436,7 +436,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -457,19 +457,19 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.30" } } } \ No newline at end of file diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index 27e43fb550..c33e34a503 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -41,27 +41,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -232,10 +232,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -243,27 +243,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -276,7 +276,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -346,7 +346,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index b7a19c2311..9f6e0322e0 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -30,10 +30,10 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -44,27 +44,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -77,7 +77,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -202,7 +202,7 @@ }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -232,31 +232,31 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "2.7.16" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.18.3" }, "org.testcontainers:testcontainers": { - "locked": "1.15.3" + "locked": "1.18.3" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -267,27 +267,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -300,7 +300,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -367,7 +367,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -417,7 +417,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -429,25 +429,25 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "2.7.16" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.18.3" }, "org.testcontainers:testcontainers": { - "locked": "1.15.3" + "locked": "1.18.3" }, "redis.clients:jedis": { "locked": "3.6.0" diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index fe504d621d..e853fb5003 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -30,7 +30,7 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -38,27 +38,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -71,7 +71,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -135,7 +135,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -229,10 +229,10 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -240,27 +240,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -276,7 +276,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -343,7 +343,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index e5545e2aa9..72f660c988 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -36,7 +36,7 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -47,27 +47,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -80,7 +80,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -150,7 +150,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -250,10 +250,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -264,27 +264,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -297,7 +297,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -370,7 +370,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -432,10 +432,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.3.0" diff --git a/rest/dependencies.lock b/rest/dependencies.lock index a3cfdea4b4..6ce7d3209a 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -41,27 +41,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -200,7 +200,7 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testCompileClasspath": { @@ -238,13 +238,13 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -252,27 +252,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -285,7 +285,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -355,7 +355,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -417,13 +417,13 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 1bee569167..7870d4df0e 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -62,6 +62,10 @@ bootJar { classifier = 'boot' } +// https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#integrating-with-actuator.build-info +// This will configure a BuildInfo task named bootBuildInfo springBoot { buildInfo() } + +compileJava.dependsOn bootBuildInfo diff --git a/server/dependencies.lock b/server/dependencies.lock index c197447906..e080cc121e 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -63,22 +63,22 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "productionRuntimeClasspath": { @@ -104,27 +104,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -138,7 +138,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -273,25 +273,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -338,7 +339,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -500,25 +501,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "redis.clients:jedis": { "firstLevelTransitive": [ @@ -551,27 +552,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -585,7 +586,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -720,25 +721,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -785,7 +787,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -947,25 +949,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "redis.clients:jedis": { "firstLevelTransitive": [ @@ -977,7 +979,7 @@ }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-awss3-storage": { "project": true @@ -1019,13 +1021,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1055,25 +1057,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "testRuntimeClasspath": { @@ -1099,27 +1101,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -1133,7 +1135,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -1141,7 +1143,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -1268,28 +1270,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1339,7 +1342,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -1504,28 +1507,28 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "redis.clients:jedis": { "firstLevelTransitive": [ diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 2dd48417dc..26d8e5c867 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -40,16 +40,16 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-cassandra-persistence": { "project": true @@ -115,7 +115,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -130,25 +130,25 @@ "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.30" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -183,39 +183,39 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -230,7 +230,7 @@ "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -239,7 +239,7 @@ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -427,27 +427,28 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", - "com.netflix.conductor:conductor-grpc-client" + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "firstLevelTransitive": [ @@ -506,7 +507,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -640,7 +641,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ @@ -664,7 +665,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.3.6" + "locked": "2.3.8" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -701,10 +702,10 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springdoc:springdoc-openapi-ui": { "firstLevelTransitive": [ @@ -717,47 +718,47 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.3.3" + "locked": "1.3.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.30" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ From b3a11965e08f4a10e52715e91ad2f3b37a7e408b Mon Sep 17 00:00:00 2001 From: Young-Zen <40934357+Young-Zen@users.noreply.github.com> Date: Sun, 12 Nov 2023 16:53:11 +0800 Subject: [PATCH 5/6] Fix: include monaco sources into bundle (#3796) * Fix: include monaco sources into bundle --- .gitignore | 1 + docker/README.md | 4 ++-- docker/server/Dockerfile | 4 +++- docker/ui/Dockerfile | 5 ++++- ui/package.json | 3 ++- ui/src/App.jsx | 6 ++++++ ui/yarn.lock | 24 ++++++++++++++---------- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6bf71b0ef6..95729213ae 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ buildscan.log # JS & UI Related node_modules /ui/build +/ui/public/monaco-editor # publishing secrets secrets/signing-key diff --git a/docker/README.md b/docker/README.md index b45b2d9bc6..e19a916ee0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -11,7 +11,7 @@ Conductor server with support for the following backend: ### Docker File for Server and UI -[Docker Image Source for Server with UI](docker/server/DockerFile) +[Docker Image Source for Server with UI](server/Dockerfile) ### Configuration Guide for Conductor Server Conductor uses a persistent store for managing state. @@ -48,4 +48,4 @@ TODO: Link to the helm charts |--------------------------------------------------------------|----------------------------| | [docker-compose.yaml](docker-compose.yaml) | Redis + Elasticsearch 7 | | [docker-compose-postgres.yaml](docker-compose-postgres.yaml) | Postgres + Elasticsearch 7 | -| [docker-compose-postgres.yaml](docker-compose-mysql.yaml) | Mysql + Elasticsearch 7 | +| [docker-compose-mysql.yaml](docker-compose-mysql.yaml) | Mysql + Elasticsearch 7 | diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index ab6b099b50..793cb830ae 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -20,7 +20,9 @@ RUN apk add --update nodejs npm yarn COPY . /conductor WORKDIR /conductor/ui -RUN yarn install && yarn build +# Include monaco sources into bundle (instead of using CDN) +ENV REACT_APP_MONACO_EDITOR_USING_CDN=false +RUN yarn install && cp -r node_modules/monaco-editor public/ && yarn build RUN ls -ltr RUN echo "Done building UI" diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index b7967b9a00..5762f7d1ff 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -16,10 +16,13 @@ WORKDIR /usr/src/app COPY ./ui/package.json ./ # Installs all node packages. Cached unless package.json changes -RUN yarn install +RUN yarn install && mkdir -p public && cp -r node_modules/monaco-editor public/ # Copies everything else over to Docker environment # node_modules excluded in .dockerignore. COPY ./ui . +# Include monaco sources into bundle (instead of using CDN) +ENV REACT_APP_MONACO_EDITOR_USING_CDN=false + CMD [ "yarn", "start" ] diff --git a/ui/package.json b/ui/package.json index ac64a7d716..33b909bb13 100644 --- a/ui/package.json +++ b/ui/package.json @@ -6,7 +6,7 @@ "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.60", "@material-ui/styles": "^4.11.4", - "@monaco-editor/react": "^4.3.1", + "@monaco-editor/react": "^4.4.0", "clsx": "^1.1.1", "cronstrue": "^1.72.0", "d3": "^6.2.0", @@ -18,6 +18,7 @@ "json-bigint-string": "^1.0.0", "lodash": "^4.17.20", "moment": "^2.29.2", + "monaco-editor": "^0.44.0", "node-forge": "^1.3.0", "parse-svg-path": "^0.1.2", "prop-types": "^15.7.2", diff --git a/ui/src/App.jsx b/ui/src/App.jsx index 512065581e..64292db5ab 100644 --- a/ui/src/App.jsx +++ b/ui/src/App.jsx @@ -2,6 +2,7 @@ import React from "react"; import { Route, Switch } from "react-router-dom"; import { makeStyles } from "@material-ui/styles"; +import { loader } from '@monaco-editor/react'; import { Button, AppBar, Toolbar } from "@material-ui/core"; import AppLogo from "./plugins/AppLogo"; import NavLink from "./components/NavLink"; @@ -132,3 +133,8 @@ export default function App() { ); } + +if (process.env.REACT_APP_MONACO_EDITOR_USING_CDN === "false") { + // Change the source of the monaco files, see https://github.com/suren-atoyan/monaco-react/issues/168#issuecomment-762336713 + loader.config({ paths: { vs: '/monaco-editor/min/vs' } }); +} diff --git a/ui/yarn.lock b/ui/yarn.lock index 6d4df6a9f2..43d8cb9222 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1678,20 +1678,19 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@monaco-editor/loader@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.3.2.tgz#04effbb87052d19cd7d3c9d81c0635490f9bb6d8" - integrity sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g== +"@monaco-editor/loader@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.4.0.tgz#f08227057331ec890fa1e903912a5b711a2ad558" + integrity sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg== dependencies: state-local "^1.0.6" -"@monaco-editor/react@^4.3.1": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.5.tgz#beabe491efeb2457441a00d1c7651c653697f65b" - integrity sha512-IImtzU7sRc66OOaQVCG+5PFHkSWnnhrUWGBuH6zNmH2h0YgmAhcjHZQc/6MY9JWEbUtVF1WPBMJ9u1XuFbRrVA== +"@monaco-editor/react@^4.4.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.6.0.tgz#bcc68671e358a21c3814566b865a54b191e24119" + integrity sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw== dependencies: - "@monaco-editor/loader" "^1.3.2" - prop-types "^15.7.2" + "@monaco-editor/loader" "^1.4.0" "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -7966,6 +7965,11 @@ moment@^2.29.2: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +monaco-editor@^0.44.0: + version "0.44.0" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.44.0.tgz#3c0fe3655923bbf7dd647057302070b5095b6c59" + integrity sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" From 9669d469c0ed8b077ec6378e620a2a482bee30d3 Mon Sep 17 00:00:00 2001 From: wildMythicWest Date: Mon, 13 Nov 2023 10:05:50 +0200 Subject: [PATCH 6/6] Optimizing reading from datastore during WorkflowSweeper#sweep (#3816) * Optimizing reading from datastore during WorkflowSweeper#sweep * Added javadoc to decideWithLock method --------- Co-authored-by: Boyan Georgiev --- .../core/execution/WorkflowExecutor.java | 26 +++++++++++++++++++ .../reconciliation/WorkflowRepairService.java | 5 ++++ .../core/reconciliation/WorkflowSweeper.java | 12 ++++++--- .../reconciliation/TestWorkflowSweeper.java | 9 ++++++- 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java index e9c326410b..6070741a29 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java @@ -1027,6 +1027,32 @@ public WorkflowModel decide(String workflowId) { } } + /** + * This method overloads the {@link #decide(String)}. It will acquire a lock and evaluate the + * state of the workflow. + * + * @param workflow the workflow to evaluate the state for + * @return the workflow + */ + public WorkflowModel decideWithLock(WorkflowModel workflow) { + if (workflow == null) { + return null; + } + StopWatch watch = new StopWatch(); + watch.start(); + if (!executionLockService.acquireLock(workflow.getWorkflowId())) { + return null; + } + try { + return decide(workflow); + + } finally { + executionLockService.releaseLock(workflow.getWorkflowId()); + watch.stop(); + Monitors.recordWorkflowDecisionTime(watch.getTime()); + } + } + /** * @param workflow the workflow to evaluate the state for * @return true if the workflow has completed (success or failed), false otherwise. Note: This diff --git a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java index ad47595232..49ca8a632d 100644 --- a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java +++ b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java @@ -109,6 +109,11 @@ public void verifyAndRepairWorkflowTasks(String workflowId) { () -> new NotFoundException( "Could not find workflow: " + workflowId)); + verifyAndRepairWorkflowTasks(workflow); + } + + /** Verify and repair tasks in a workflow. */ + public void verifyAndRepairWorkflowTasks(WorkflowModel workflow) { workflow.getTasks().forEach(this::verifyAndRepairTask); // repair the parent workflow if needed verifyAndRepairWorkflow(workflow.getParentWorkflowId()); diff --git a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java index 46e8ca6f55..cd4b46be75 100644 --- a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java +++ b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java @@ -28,6 +28,7 @@ import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.core.WorkflowContext; import com.netflix.conductor.core.config.ConductorProperties; +import com.netflix.conductor.core.dal.ExecutionDAOFacade; import com.netflix.conductor.core.exception.NotFoundException; import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.dao.QueueDAO; @@ -48,6 +49,7 @@ public class WorkflowSweeper { private final WorkflowExecutor workflowExecutor; private final WorkflowRepairService workflowRepairService; private final QueueDAO queueDAO; + private final ExecutionDAOFacade executionDAOFacade; private static final String CLASS_NAME = WorkflowSweeper.class.getSimpleName(); @@ -56,10 +58,12 @@ public WorkflowSweeper( WorkflowExecutor workflowExecutor, Optional workflowRepairService, ConductorProperties properties, - QueueDAO queueDAO) { + QueueDAO queueDAO, + ExecutionDAOFacade executionDAOFacade) { this.properties = properties; this.queueDAO = queueDAO; this.workflowExecutor = workflowExecutor; + this.executionDAOFacade = executionDAOFacade; this.workflowRepairService = workflowRepairService.orElse(null); LOGGER.info("WorkflowSweeper initialized."); } @@ -77,12 +81,14 @@ public void sweep(String workflowId) { WorkflowContext.set(workflowContext); LOGGER.debug("Running sweeper for workflow {}", workflowId); + workflow = executionDAOFacade.getWorkflowModel(workflowId, true); + if (workflowRepairService != null) { // Verify and repair tasks in the workflow. - workflowRepairService.verifyAndRepairWorkflowTasks(workflowId); + workflowRepairService.verifyAndRepairWorkflowTasks(workflow); } - workflow = workflowExecutor.decide(workflowId); + workflow = workflowExecutor.decideWithLock(workflow); if (workflow != null && workflow.getStatus().isTerminal()) { queueDAO.remove(DECIDER_QUEUE, workflowId); return; diff --git a/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java b/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java index 1ed45dd7bd..7951d5e923 100644 --- a/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java +++ b/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java @@ -23,6 +23,7 @@ import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.core.config.ConductorProperties; +import com.netflix.conductor.core.dal.ExecutionDAOFacade; import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.dao.QueueDAO; import com.netflix.conductor.model.TaskModel; @@ -42,6 +43,7 @@ public class TestWorkflowSweeper { private WorkflowExecutor workflowExecutor; private WorkflowRepairService workflowRepairService; private QueueDAO queueDAO; + private ExecutionDAOFacade executionDAOFacade; private WorkflowSweeper workflowSweeper; private int defaultPostPoneOffSetSeconds = 1800; @@ -52,9 +54,14 @@ public void setUp() { workflowExecutor = mock(WorkflowExecutor.class); queueDAO = mock(QueueDAO.class); workflowRepairService = mock(WorkflowRepairService.class); + executionDAOFacade = mock(ExecutionDAOFacade.class); workflowSweeper = new WorkflowSweeper( - workflowExecutor, Optional.of(workflowRepairService), properties, queueDAO); + workflowExecutor, + Optional.of(workflowRepairService), + properties, + queueDAO, + executionDAOFacade); } @Test