From 064b0a6292f84a7518c10d47b95b7f0554402502 Mon Sep 17 00:00:00 2001 From: LuisLainez <71238487+LuisLainez@users.noreply.github.com> Date: Wed, 1 Nov 2023 03:08:06 +1100 Subject: [PATCH 1/7] Issue/upgrade to spring (#3828) SB3 upgrades --- annotations-processor/build.gradle | 4 +- annotations-processor/dependencies.lock | 88 +++--- .../protogen/ProtoGen.java | 2 +- annotations/dependencies.lock | 50 ++-- awss3-storage/dependencies.lock | 96 +++---- awssqs-event-queue/dependencies.lock | 96 +++---- build.gradle | 6 +- cassandra-persistence/build.gradle | 2 +- cassandra-persistence/dependencies.lock | 90 +++---- .../cache/CacheableEventHandlerDAO.java | 4 +- .../config/cache/CacheableMetadataDAO.java | 4 +- client-spring/dependencies.lock | 94 +++---- client/build.gradle | 2 +- client/dependencies.lock | 98 +++---- common/dependencies.lock | 110 ++++---- .../config/ObjectMapperConfiguration.java | 3 +- .../constraints/NoSemiColonConstraint.java | 10 +- .../OwnerEmailMandatoryConstraint.java | 10 +- .../TaskReferenceNameUniqueConstraint.java | 10 +- .../constraints/TaskTimeoutConstraint.java | 10 +- .../common/metadata/events/EventHandler.java | 7 +- .../common/metadata/tasks/TaskDef.java | 12 +- .../common/metadata/tasks/TaskResult.java | 3 +- .../workflow/StartWorkflowRequest.java | 10 +- .../metadata/workflow/SubWorkflowParams.java | 5 +- .../common/metadata/workflow/WorkflowDef.java | 14 +- .../metadata/workflow/WorkflowDefSummary.java | 4 +- .../metadata/workflow/WorkflowTask.java | 7 +- .../conductor/common/run/Workflow.java | 6 +- .../conductor/common/utils/SummaryUtil.java | 3 +- .../common/events/EventHandlerTest.java | 10 +- .../conductor/common/tasks/TaskDefTest.java | 10 +- .../workflow/SubWorkflowParamsTest.java | 9 +- .../workflow/WorkflowDefValidatorTest.java | 10 +- .../common/workflow/WorkflowTaskTest.java | 10 +- core/build.gradle | 2 +- core/dependencies.lock | 135 ++++------ .../core/dal/ExecutionDAOFacade.java | 3 +- .../core/execution/tasks/StartWorkflow.java | 3 +- .../conductor/service/AdminService.java | 4 +- .../conductor/service/EventService.java | 8 +- .../conductor/service/MetadataService.java | 10 +- .../conductor/service/TaskService.java | 8 +- .../service/WorkflowBulkService.java | 6 +- .../conductor/service/WorkflowService.java | 12 +- .../WorkflowTaskTypeConstraint.java | 10 +- .../IsolatedTaskQueueProducerSpec.groovy | 3 - .../execution/tasks/StartWorkflowSpec.groovy | 5 +- .../java/com/netflix/conductor/TestUtils.java | 2 +- .../metadata/MetadataMapperServiceTest.java | 4 +- .../conductor/service/EventServiceTest.java | 4 +- .../service/MetadataServiceTest.java | 4 +- .../conductor/service/TaskServiceTest.java | 4 +- .../service/WorkflowBulkServiceTest.java | 4 +- .../service/WorkflowServiceTest.java | 4 +- .../WorkflowDefConstraintTest.java | 16 +- .../WorkflowTaskTypeConstraintTest.java | 18 +- dependencies.gradle | 15 +- dependencies.lock | 50 ++-- es6-persistence/build.gradle | 6 +- es6-persistence/dependencies.lock | 72 ++--- .../es6/dao/index/ElasticSearchDAOV6.java | 5 +- .../es6/dao/index/ElasticSearchRestDAOV6.java | 5 +- grpc-client/build.gradle | 1 + grpc-client/dependencies.lock | 120 ++++----- .../conductor/client/grpc/ClientBase.java | 3 +- .../conductor/client/grpc/MetadataClient.java | 3 +- .../conductor/client/grpc/TaskClient.java | 3 +- .../conductor/client/grpc/WorkflowClient.java | 3 +- grpc-server/dependencies.lock | 132 ++++----- .../conductor/grpc/server/GRPCServer.java | 5 +- .../grpc/server/service/GRPCHelper.java | 3 +- grpc/build.gradle | 8 +- grpc/dependencies.lock | 160 ++++++----- .../conductor/grpc/AbstractProtoMapper.java | 2 +- .../conductor/grpc/TestProtoMapper.java | 2 +- http-task/build.gradle | 1 + http-task/dependencies.lock | 114 ++++---- .../conductor/tasks/http/HttpTask.java | 15 +- .../DefaultRestTemplateProvider.java | 21 +- .../conductor/tasks/http/HttpTaskTest.java | 2 +- .../DefaultRestTemplateProviderTest.java | 2 + java-sdk/build.gradle | 2 +- java-sdk/dependencies.lock | 100 +++---- json-jq-task/dependencies.lock | 100 +++---- redis-concurrency-limit/build.gradle | 2 +- redis-concurrency-limit/dependencies.lock | 102 ++++--- redis-lock/dependencies.lock | 96 +++---- redis-persistence/dependencies.lock | 96 +++---- .../dynoqueue/ConfigurationHostSupplier.java | 3 + rest/dependencies.lock | 102 +++---- .../ApplicationExceptionMapper.java | 3 +- .../ValidationExceptionMapper.java | 10 +- server/build.gradle | 1 + server/dependencies.lock | 250 +++++++++--------- springboot-bom-overrides.gradle | 2 +- test-harness/build.gradle | 2 +- test-harness/dependencies.lock | 102 +++---- .../test/util/WorkflowTestUtil.groovy | 3 +- .../http/AbstractHttpEndToEndTest.java | 2 +- 100 files changed, 1448 insertions(+), 1461 deletions(-) diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index 2bb9a52aa..5e0c28d3b 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -8,8 +8,8 @@ dependencies { api 'com.google.guava:guava:31.1-jre' api 'com.squareup:javapoet:1.13.+' api 'com.github.jknack:handlebars:4.3.+' - api 'com.google.protobuf:protobuf-java:3.21.7' - api 'javax.annotation:javax.annotation-api:1.3.2' + api 'com.google.protobuf:protobuf-java:3.21.12' + api 'jakarta.annotation:jakarta.annotation-api:2.1.1' api gradleApi() exampleImplementation sourceSets.main.output diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 481b791d0..f0c8b22ee 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": "3.1.4" } }, "compileClasspath": { @@ -12,7 +12,7 @@ "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -20,23 +20,23 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" } }, "exampleCompileClasspath": { @@ -52,31 +52,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" } }, "runtimeClasspath": { @@ -87,7 +87,7 @@ "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -95,38 +95,38 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" } }, "testCompileClasspath": { @@ -137,7 +137,7 @@ "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -145,35 +145,35 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "junit:junit": { "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -184,7 +184,7 @@ "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -192,8 +192,8 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "junit:junit": { "locked": "4.13.2" @@ -202,40 +202,40 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java index a2550d369..e694918c3 100644 --- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java +++ b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java @@ -20,7 +20,6 @@ import java.net.URLClassLoader; import java.util.*; -import javax.annotation.Generated; import javax.lang.model.element.Modifier; import com.netflix.conductor.annotations.protogen.ProtoMessage; @@ -35,6 +34,7 @@ import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; +import jakarta.annotation.Generated; public class ProtoGen { private static final String GENERATOR_NAME = diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock index 7b2c9a2ac..58dd8ff8a 100644 --- a/annotations/dependencies.lock +++ b/annotations/dependencies.lock @@ -1,41 +1,41 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" } }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" } }, "testCompileClasspath": { @@ -43,28 +43,28 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -72,28 +72,28 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index b3c1cb307..c8239eb17 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": "3.1.4" } }, "compileClasspath": { @@ -18,22 +18,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -44,46 +44,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,19 +122,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -214,28 +214,28 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -246,46 +246,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -324,19 +324,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -361,7 +361,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -369,7 +369,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -377,7 +377,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -385,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -393,10 +393,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index 8e9e5e532..3bb1559cd 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": "3.1.4" } }, "compileClasspath": { @@ -24,22 +24,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -50,33 +50,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -86,13 +86,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -137,13 +137,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -165,7 +165,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -173,7 +173,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -181,7 +181,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -189,7 +189,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -197,7 +197,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -229,31 +229,31 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -264,33 +264,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -300,13 +300,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -351,13 +351,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -382,7 +382,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -390,7 +390,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -398,7 +398,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -406,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -414,10 +414,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -426,13 +426,13 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6e6ea6f6e..34041e57e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ 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 'org.springframework.boot:spring-boot-gradle-plugin:3.1.4' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+' } } @@ -90,7 +90,7 @@ allprojects { dependencyManagement { imports { - // dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/2.7.3/reference/htmlsingle/#appendix.dependency-versions + // dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/3.1.4/reference/htmlsingle/#appendix.dependency-versions mavenBom(SpringBootPlugin.BOM_COORDINATES) } } @@ -175,4 +175,4 @@ configure(allprojects - project(':conductor-grpc')) { } } } -} +} \ No newline at end of file diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle index 6fee6f8ff..1d6745c61 100644 --- a/cassandra-persistence/build.gradle +++ b/cassandra-persistence/build.gradle @@ -23,7 +23,7 @@ dependencies { testImplementation project(':conductor-core').sourceSets.test.output testImplementation project(':conductor-common').sourceSets.test.output - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" testImplementation "org.testcontainers:spock:${revTestContainer}" diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index 66f9c31d8..f7503712c 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": "3.1.4" } }, "compileClasspath": { @@ -18,22 +18,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "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": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.openjdk.nashorn:nashorn-core": { "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 @@ -217,37 +217,37 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.testcontainers:cassandra": { "locked": "1.15.3" @@ -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": [ @@ -379,7 +379,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -387,7 +387,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -395,7 +395,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -403,7 +403,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -411,10 +411,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -426,16 +426,16 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.testcontainers:cassandra": { "locked": "1.15.3" diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java index 6f4b8bee1..fabfd3c55 100644 --- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java +++ b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java @@ -20,8 +20,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.Cache; @@ -36,6 +34,8 @@ import com.netflix.conductor.dao.EventHandlerDAO; import com.netflix.conductor.metrics.Monitors; +import jakarta.annotation.PostConstruct; + import static com.netflix.conductor.cassandra.config.cache.CachingConfig.EVENT_HANDLER_CACHE; @Trace diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java index 256512ea4..2facedbd0 100644 --- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java +++ b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java @@ -20,8 +20,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.Cache; @@ -38,6 +36,8 @@ import com.netflix.conductor.dao.MetadataDAO; import com.netflix.conductor.metrics.Monitors; +import jakarta.annotation.PostConstruct; + import static com.netflix.conductor.cassandra.config.cache.CachingConfig.TASK_DEF_CACHE; @Trace diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock index 4e7ca32b3..c9914c60a 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": "3.1.4" } }, "compileClasspath": { @@ -18,22 +18,22 @@ "locked": "1.10.10" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -53,32 +53,32 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -90,7 +90,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -166,7 +166,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -175,7 +175,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -184,7 +184,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -193,7 +193,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -202,14 +202,14 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.35" + "locked": "3.1.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -221,10 +221,10 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testCompileClasspath": { @@ -244,31 +244,31 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -288,32 +288,32 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -325,7 +325,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -404,7 +404,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -413,7 +413,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -422,7 +422,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -431,7 +431,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -440,17 +440,17 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.35" + "locked": "3.1.3" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -462,16 +462,16 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle index b16dd4e18..2ffd092ed 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -40,7 +40,7 @@ dependencies { testImplementation "org.powermock:powermock-module-junit4:${revPowerMock}" testImplementation "org.powermock:powermock-api-mockito2:${revPowerMock}" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" } diff --git a/client/dependencies.lock b/client/dependencies.lock index 6b0ee6cac..103511e98 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": "3.1.4" } }, "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 @@ -36,19 +36,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -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": [ @@ -135,35 +135,35 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -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 @@ -207,22 +207,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "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.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "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": [ @@ -330,38 +330,38 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "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.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/common/dependencies.lock b/common/dependencies.lock index 83f5cb299..b8ea32112 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": "3.1.4" } }, "annotationsProcessorCodegen": { @@ -21,7 +21,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -38,60 +38,60 @@ ], "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" } }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -103,42 +103,42 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -153,45 +153,45 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" } }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -206,45 +206,45 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -262,43 +262,43 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java b/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java index ffcb71945..fefce75ba 100644 --- a/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java +++ b/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java @@ -12,13 +12,12 @@ */ package com.netflix.conductor.common.config; -import javax.annotation.PostConstruct; - import org.springframework.context.annotation.Configuration; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.module.afterburner.AfterburnerModule; +import jakarta.annotation.PostConstruct; @Configuration public class ObjectMapperConfiguration { diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java index 3bd402013..6f3015e6a 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java @@ -17,13 +17,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.StringUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java index 55347529d..b010b4bb3 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java @@ -17,13 +17,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.StringUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.TYPE; diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java index 24f0ff433..f9dbc4c79 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java @@ -19,17 +19,17 @@ import java.util.HashMap; import java.util.List; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.mutable.MutableBoolean; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; import com.netflix.conductor.common.utils.ConstraintParamUtil; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.TYPE; /** diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java index 56525c7b5..a498dca65 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java @@ -17,13 +17,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import com.netflix.conductor.common.metadata.tasks.TaskDef; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.TYPE; /** diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java index 77dda4c1e..24084f2de 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java @@ -17,16 +17,15 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.google.protobuf.Any; import io.swagger.v3.oas.annotations.Hidden; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; /** Defines an event handler */ @ProtoMessage diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java index 59e119a0e..658079e0a 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java @@ -18,12 +18,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; @@ -31,6 +25,12 @@ import com.netflix.conductor.common.constraints.TaskTimeoutConstraint; import com.netflix.conductor.common.metadata.BaseDef; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @ProtoMessage @TaskTimeoutConstraint @Valid diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java index 8953d499b..f31b6481b 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java @@ -17,8 +17,6 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import javax.validation.constraints.NotEmpty; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.annotations.protogen.ProtoEnum; @@ -27,6 +25,7 @@ import com.google.protobuf.Any; import io.swagger.v3.oas.annotations.Hidden; +import jakarta.validation.constraints.NotEmpty; /** Result of the task execution. */ @ProtoMessage diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java index cc01bca1a..e44edca62 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java @@ -15,14 +15,14 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + @ProtoMessage public class StartWorkflowRequest { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java index 816981b86..9cb934b64 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java @@ -15,14 +15,13 @@ import java.util.Map; import java.util.Objects; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonSetter; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @ProtoMessage public class SubWorkflowParams { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java index 6ce981f90..6d0676026 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java @@ -19,13 +19,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.Email; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; @@ -35,6 +28,13 @@ import com.netflix.conductor.common.metadata.BaseDef; import com.netflix.conductor.common.metadata.tasks.TaskType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @ProtoMessage @TaskReferenceNameUniqueConstraint public class WorkflowDef extends BaseDef { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java index fc0eca86d..bf22c0265 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java @@ -14,12 +14,12 @@ import java.util.Objects; -import javax.validation.constraints.NotEmpty; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.netflix.conductor.common.constraints.NoSemiColonConstraint; +import jakarta.validation.constraints.NotEmpty; + @ProtoMessage public class WorkflowDefSummary implements Comparable { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java index 492a61d33..6395596f8 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java @@ -21,16 +21,15 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.PositiveOrZero; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.netflix.conductor.common.metadata.tasks.TaskDef; import com.netflix.conductor.common.metadata.tasks.TaskType; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.PositiveOrZero; /** * This is the task definition definied as part of the {@link WorkflowDef}. The tasks definied in diff --git a/common/src/main/java/com/netflix/conductor/common/run/Workflow.java b/common/src/main/java/com/netflix/conductor/common/run/Workflow.java index 6936f9535..b84c99775 100644 --- a/common/src/main/java/com/netflix/conductor/common/run/Workflow.java +++ b/common/src/main/java/com/netflix/conductor/common/run/Workflow.java @@ -15,9 +15,6 @@ import java.util.*; import java.util.stream.Collectors; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.annotations.protogen.ProtoEnum; @@ -27,6 +24,9 @@ import com.netflix.conductor.common.metadata.tasks.Task; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; + @ProtoMessage public class Workflow extends Auditable { diff --git a/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java b/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java index 76127124e..60502402f 100644 --- a/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java +++ b/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java @@ -14,8 +14,6 @@ import java.util.Map; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -25,6 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; @Component public class SummaryUtil { diff --git a/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java b/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java index a6a1f5cd1..36cf22c50 100644 --- a/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java +++ b/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java @@ -16,15 +16,15 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Test; import com.netflix.conductor.common.metadata.events.EventHandler; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java b/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java index 41f966779..7e5108b05 100644 --- a/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java +++ b/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java @@ -16,16 +16,16 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Before; import org.junit.Test; import com.netflix.conductor.common.metadata.tasks.TaskDef; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java b/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java index 1859c4a0d..bda8e0ddb 100644 --- a/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java +++ b/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java @@ -18,11 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +32,10 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java index 16a08851e..2ed545418 100644 --- a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java +++ b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java @@ -18,11 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Before; import org.junit.Test; @@ -30,6 +25,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java index 6d052e4d3..0d9ea921e 100644 --- a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java +++ b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java @@ -16,16 +16,16 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Test; import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/core/build.gradle b/core/build.gradle index 7a56014e8..82881e7a8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -55,7 +55,7 @@ dependencies { testImplementation 'org.springframework.retry:spring-retry' testImplementation project(':conductor-common').sourceSets.test.output - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" testImplementation "org.junit.vintage:junit-vintage-engine" diff --git a/core/dependencies.lock b/core/dependencies.lock index 5699af6af..cef256a97 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": "3.1.4" } }, "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" @@ -51,28 +51,28 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" @@ -80,25 +80,25 @@ }, "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" @@ -156,35 +156,35 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -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" @@ -240,22 +240,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -267,19 +267,19 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" @@ -287,25 +287,25 @@ }, "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" @@ -361,43 +361,8 @@ ], "locked": "3.12.0" }, - "org.apache.logging.log4j:log4j-api": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.17.2" - }, - "org.apache.logging.log4j:log4j-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.17.2" - }, - "org.apache.logging.log4j:log4j-jul": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.17.2" - }, - "org.apache.logging.log4j:log4j-slf4j-impl": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.17.2" - }, - "org.apache.logging.log4j:log4j-web": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -409,19 +374,19 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" diff --git a/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java index d88150005..92255bc4d 100644 --- a/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java +++ b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,6 +50,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PreDestroy; import static com.netflix.conductor.core.utils.Utils.DECIDER_QUEUE; diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java index 76edb8a68..1096fdf50 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java @@ -15,8 +15,6 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.Validator; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +29,7 @@ import com.netflix.conductor.model.WorkflowModel; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Validator; import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_START_WORKFLOW; import static com.netflix.conductor.model.TaskModel.Status.COMPLETED; diff --git a/core/src/main/java/com/netflix/conductor/service/AdminService.java b/core/src/main/java/com/netflix/conductor/service/AdminService.java index 84d68c279..474743db4 100644 --- a/core/src/main/java/com/netflix/conductor/service/AdminService.java +++ b/core/src/main/java/com/netflix/conductor/service/AdminService.java @@ -15,12 +15,12 @@ import java.util.List; import java.util.Map; -import javax.validation.constraints.NotEmpty; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.tasks.Task; +import jakarta.validation.constraints.NotEmpty; + @Validated public interface AdminService { diff --git a/core/src/main/java/com/netflix/conductor/service/EventService.java b/core/src/main/java/com/netflix/conductor/service/EventService.java index c2f29e734..397503cf4 100644 --- a/core/src/main/java/com/netflix/conductor/service/EventService.java +++ b/core/src/main/java/com/netflix/conductor/service/EventService.java @@ -14,14 +14,14 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.events.EventHandler; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @Validated public interface EventService { diff --git a/core/src/main/java/com/netflix/conductor/service/MetadataService.java b/core/src/main/java/com/netflix/conductor/service/MetadataService.java index 701055ef8..babd46627 100644 --- a/core/src/main/java/com/netflix/conductor/service/MetadataService.java +++ b/core/src/main/java/com/netflix/conductor/service/MetadataService.java @@ -16,11 +16,6 @@ import java.util.Map; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.events.EventHandler; @@ -29,6 +24,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowDefSummary; import com.netflix.conductor.common.model.BulkResponse; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + @Validated public interface MetadataService { diff --git a/core/src/main/java/com/netflix/conductor/service/TaskService.java b/core/src/main/java/com/netflix/conductor/service/TaskService.java index 7f4f3d0a6..d89772659 100644 --- a/core/src/main/java/com/netflix/conductor/service/TaskService.java +++ b/core/src/main/java/com/netflix/conductor/service/TaskService.java @@ -15,10 +15,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.tasks.PollData; @@ -29,6 +25,10 @@ import com.netflix.conductor.common.run.SearchResult; import com.netflix.conductor.common.run.TaskSummary; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @Validated public interface TaskService { diff --git a/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java b/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java index 2c1ef0f7f..e54c94f60 100644 --- a/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java +++ b/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java @@ -14,13 +14,13 @@ import java.util.List; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.model.BulkResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + @Validated public interface WorkflowBulkService { diff --git a/core/src/main/java/com/netflix/conductor/service/WorkflowService.java b/core/src/main/java/com/netflix/conductor/service/WorkflowService.java index bb760ac68..6ba2d7e64 100644 --- a/core/src/main/java/com/netflix/conductor/service/WorkflowService.java +++ b/core/src/main/java/com/netflix/conductor/service/WorkflowService.java @@ -15,12 +15,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.workflow.RerunWorkflowRequest; @@ -32,6 +26,12 @@ import com.netflix.conductor.common.run.Workflow; import com.netflix.conductor.common.run.WorkflowSummary; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @Validated public interface WorkflowService { diff --git a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java index 888dd7a49..3a6400f6b 100644 --- a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java +++ b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java @@ -20,11 +20,6 @@ import java.time.format.DateTimeParseException; import java.util.Optional; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.tasks.TaskDef; @@ -32,6 +27,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowTask; import com.netflix.conductor.core.utils.DateTimeUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static com.netflix.conductor.core.execution.tasks.Terminate.getTerminationStatusParameter; import static com.netflix.conductor.core.execution.tasks.Terminate.validateInputStatus; import static com.netflix.conductor.core.execution.tasks.Wait.DURATION_INPUT; 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 3673c0091..1dd2eeec1 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 @@ -14,8 +14,6 @@ package com.netflix.conductor.core.execution.tasks import java.time.Duration -import org.junit.Test - import com.netflix.conductor.common.metadata.tasks.TaskDef import com.netflix.conductor.service.MetadataService @@ -45,7 +43,6 @@ class IsolatedTaskQueueProducerSpec extends Specification { Duration.ofSeconds(10)) } - @Test def "addTaskQueuesAddsElementToQueue"() { given: TaskDef taskDef = new TaskDef(isolationGroupId: "isolated") diff --git a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy index 3e64d7f23..9c6af719d 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy @@ -12,9 +12,6 @@ */ package com.netflix.conductor.core.execution.tasks -import javax.validation.ConstraintViolation -import javax.validation.Validator - import com.netflix.conductor.common.config.ObjectMapperProvider import com.netflix.conductor.core.exception.NotFoundException import com.netflix.conductor.core.exception.TransientException @@ -23,6 +20,8 @@ import com.netflix.conductor.core.operation.StartWorkflowOperation import com.netflix.conductor.model.TaskModel import com.netflix.conductor.model.WorkflowModel +import jakarta.validation.ConstraintViolation +import jakarta.validation.Validator import spock.lang.Specification import spock.lang.Subject diff --git a/core/src/test/java/com/netflix/conductor/TestUtils.java b/core/src/test/java/com/netflix/conductor/TestUtils.java index 41f1377e4..08428322c 100644 --- a/core/src/test/java/com/netflix/conductor/TestUtils.java +++ b/core/src/test/java/com/netflix/conductor/TestUtils.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolation; public class TestUtils { diff --git a/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java b/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java index 55cd1c7d8..e431a16e6 100644 --- a/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java @@ -16,8 +16,6 @@ import java.util.Optional; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -37,6 +35,8 @@ import com.netflix.conductor.core.exception.TerminateWorkflowException; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java b/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java index 620bb4e30..86a61e6ad 100644 --- a/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java @@ -14,8 +14,6 @@ import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import com.netflix.conductor.core.events.EventQueues; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java index 8ea351ac7..1c629c4ec 100644 --- a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java @@ -20,8 +20,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +38,8 @@ import com.netflix.conductor.dao.EventHandlerDAO; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java b/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java index 2c54d3a31..240b99e8c 100644 --- a/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java @@ -15,8 +15,6 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +29,8 @@ import com.netflix.conductor.common.run.TaskSummary; import com.netflix.conductor.dao.QueueDAO; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.*; diff --git a/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java b/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java index 20dcbfd4f..1936401f1 100644 --- a/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java @@ -17,8 +17,6 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import com.netflix.conductor.core.execution.WorkflowExecutor; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java b/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java index dd6108983..772f2f2e9 100644 --- a/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java @@ -18,8 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +36,8 @@ import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.core.operation.StartWorkflowOperation; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.*; diff --git a/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java b/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java index 6e6f5d3b2..c66ed56df 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java @@ -18,12 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - -import org.apache.bval.jsr.ApacheValidationProvider; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -36,6 +30,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowTask; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; @@ -49,10 +48,7 @@ public class WorkflowDefConstraintTest { @BeforeClass public static void init() { - validatorFactory = - Validation.byProvider(ApacheValidationProvider.class) - .configure() - .buildValidatorFactory(); + validatorFactory = Validation.buildDefaultValidatorFactory(); validator = validatorFactory.getValidator(); } diff --git a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java index a1105ed72..520dd6b17 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java @@ -20,13 +20,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.executable.ExecutableValidator; - -import org.apache.bval.jsr.ApacheValidationProvider; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -41,6 +34,12 @@ import com.netflix.conductor.core.execution.tasks.Terminate; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ExecutableValidator; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; @@ -54,10 +53,7 @@ public class WorkflowTaskTypeConstraintTest { @BeforeClass public static void init() { - validatorFactory = - Validation.byProvider(ApacheValidationProvider.class) - .configure() - .buildValidatorFactory(); + validatorFactory = Validation.buildDefaultValidatorFactory(); validator = validatorFactory.getValidator(); } diff --git a/dependencies.gradle b/dependencies.gradle index 547b4f1ae..2a9d9f64f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,7 +15,8 @@ * Common place to define all the version dependencies */ ext { - revActivation = '2.0.0' + revActivation = '3.0.2' + revApacheHttpComponentsClient5 = '5.2.1' revAwaitility = '3.1.6' revAwsSdk = '1.11.86' revBval = '2.0.5' @@ -26,12 +27,14 @@ ext { revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '2.5.22' - revGrpc = '1.+' + revGroovy = '4.0.9' + revGrpc = '1.57.2' revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' - revJAXB = '2.3.3' + revProtoBuf = '3.21.12' + revJakartaAnnotation = '2.1.1' + revJAXB = '4.0.1' revJAXRS = '2.1.1' revJedis = '3.3.0' revJersey = '1.19.4' @@ -43,14 +46,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.4-M1-groovy-4.0' revSpotifyCompletableFutures = '0.3.3' revTestContainer = '1.15.3' } diff --git a/dependencies.lock b/dependencies.lock index b2d91aea1..752d96aac 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,24 +1,24 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" } }, "jacocoAgent": { @@ -33,19 +33,19 @@ }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" } }, "testCompileClasspath": { @@ -53,28 +53,28 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -82,28 +82,28 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle index 2bf0d49c8..d033895bb 100644 --- a/es6-persistence/build.gradle +++ b/es6-persistence/build.gradle @@ -23,9 +23,9 @@ dependencies { // SBMTODO: remove guava dep implementation "com.google.guava:guava:${revGuava}" - implementation "org.elasticsearch.client:transport" - implementation "org.elasticsearch.client:elasticsearch-rest-client" - implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client" + implementation "org.elasticsearch.client:transport:${revElasticSearch6}" + implementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch6}" + implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch6}" testImplementation 'org.springframework.retry:spring-retry' testImplementation "org.awaitility:awaitility:${revAwaitility}" diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 9fb73e7bc..32aa282aa 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { @@ -21,19 +21,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -45,7 +45,7 @@ "locked": "6.8.12" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" @@ -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": [ @@ -92,7 +92,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": [ @@ -171,7 +171,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -179,7 +179,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -187,7 +187,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -195,7 +195,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -203,7 +203,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -241,19 +241,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.awaitility:awaitility": { "locked": "3.1.6" @@ -271,10 +271,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" @@ -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": [ @@ -324,7 +324,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": [ @@ -406,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -414,7 +414,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -422,7 +422,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -430,7 +430,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -438,7 +438,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.awaitility:awaitility": { "locked": "3.1.6" @@ -462,10 +462,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java index 0a8c86f35..bbf05423e 100644 --- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java +++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java @@ -21,9 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.commons.lang3.StringUtils; import org.elasticsearch.ResourceAlreadyExistsException; import org.elasticsearch.action.DocWriteResponse; @@ -73,6 +70,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.MapType; import com.fasterxml.jackson.databind.type.TypeFactory; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; @Trace public class ElasticSearchDAOV6 extends ElasticSearchBaseDAO implements IndexDAO { diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java index 9792d5222..e51d13341 100644 --- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java +++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java @@ -22,9 +22,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; @@ -79,6 +76,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.type.MapType; import com.fasterxml.jackson.databind.type.TypeFactory; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; @Trace public class ElasticSearchRestDAOV6 extends ElasticSearchBaseDAO implements IndexDAO { diff --git a/grpc-client/build.gradle b/grpc-client/build.gradle index 4ddd6bc71..d7e6d7239 100644 --- a/grpc-client/build.gradle +++ b/grpc-client/build.gradle @@ -21,5 +21,6 @@ dependencies { implementation "com.google.protobuf:protobuf-java:${revProtoBuf}" implementation "org.slf4j:slf4j-api" implementation "org.apache.commons:commons-lang3" + implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}" implementation "com.google.guava:guava:${revGuava}" } diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 95623d88c..9876ffb92 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { @@ -9,7 +9,7 @@ "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -18,34 +18,34 @@ "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" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" } }, "runtimeClasspath": { @@ -53,19 +53,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -75,7 +75,7 @@ "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,25 +93,22 @@ "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": [ - "com.netflix.conductor:conductor-grpc" - ], - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -131,7 +128,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -139,7 +136,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -147,7 +144,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -155,7 +152,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -163,10 +160,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" } }, "testCompileClasspath": { @@ -174,7 +171,7 @@ "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -183,13 +180,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" @@ -198,31 +195,31 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -230,19 +227,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -252,7 +249,7 @@ "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,25 +267,22 @@ "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": [ - "com.netflix.conductor:conductor-grpc" - ], - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "junit:junit": { "locked": "4.13.2" @@ -311,7 +305,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -319,7 +313,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -327,7 +321,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -335,7 +329,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -343,19 +337,19 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java index 5b299a93b..0450547c5 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java @@ -14,8 +14,6 @@ import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +22,7 @@ import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; abstract class ClientBase { diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java index 256f33b10..83e51cd64 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java @@ -14,8 +14,6 @@ import java.util.List; -import javax.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.tasks.TaskDef; @@ -25,6 +23,7 @@ import com.google.common.base.Preconditions; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; public class MetadataClient extends ClientBase { diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java index 92403d8a4..0cbf37c99 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java @@ -16,8 +16,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.tasks.Task; @@ -34,6 +32,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; public class TaskClient extends ClientBase { diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java index fd211f0af..86c78e682 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java @@ -16,8 +16,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.workflow.RerunWorkflowRequest; @@ -32,6 +30,7 @@ import com.google.common.base.Preconditions; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; public class WorkflowClient extends ClientBase { diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 6dcec7164..144391fc1 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": "3.1.4" } }, "compileClasspath": { @@ -15,31 +15,31 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "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" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -47,33 +47,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -81,13 +81,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -127,46 +127,46 @@ "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -189,7 +189,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -198,7 +198,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -207,7 +207,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -216,7 +216,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -225,7 +225,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -245,13 +245,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "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" @@ -260,28 +260,28 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" @@ -292,33 +292,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -326,13 +326,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -372,49 +372,49 @@ "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "junit:junit": { "locked": "4.13.2" @@ -440,7 +440,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -449,7 +449,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -458,7 +458,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -467,7 +467,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -476,10 +476,10 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -488,10 +488,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" diff --git a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java index 7d10ac59f..4f62be3d8 100644 --- a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java +++ b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java @@ -15,15 +15,14 @@ import java.io.IOException; import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.grpc.BindableService; import io.grpc.Server; import io.grpc.ServerBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; public class GRPCServer { diff --git a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java index 0dd626fa6..4b0cae8bb 100644 --- a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java +++ b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java @@ -14,8 +14,6 @@ import java.util.Arrays; -import javax.annotation.Nonnull; - import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; @@ -25,6 +23,7 @@ import io.grpc.StatusException; import io.grpc.protobuf.lite.ProtoLiteUtils; import io.grpc.stub.StreamObserver; +import jakarta.annotation.Nonnull; public class GRPCHelper { diff --git a/grpc/build.gradle b/grpc/build.gradle index 6286e2a0f..c75b2f7e7 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -33,19 +33,21 @@ dependencies { implementation "com.google.protobuf:protobuf-java:${revProtoBuf}" implementation "io.grpc:grpc-protobuf:${revGrpc}" implementation "io.grpc:grpc-stub:${revGrpc}" - implementation "javax.annotation:javax.annotation-api:1.3.2" + implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}" + implementation "javax.annotation:javax.annotation-api:1.3.2" //Needs to be added as a workaround for the generated tags + } 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 82071c38c..c36eb50e6 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -1,39 +1,42 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "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" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" } }, "compileProtoPath": { @@ -41,25 +44,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "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 +74,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" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -96,40 +102,40 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" } }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.57.1" + "locked": "1.57.2" } }, "protobufToolsLocator_protoc": { @@ -142,25 +148,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "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 +178,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" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -197,49 +206,52 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" } }, "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" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -248,28 +260,28 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testCompileProtoPath": { @@ -277,25 +289,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "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 +319,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" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -335,44 +350,44 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -380,25 +395,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "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 +425,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" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -438,44 +456,44 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java index c9cd06e38..8548d9120 100644 --- a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java +++ b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java @@ -40,6 +40,7 @@ import com.netflix.conductor.proto.WorkflowPb; import com.netflix.conductor.proto.WorkflowSummaryPb; import com.netflix.conductor.proto.WorkflowTaskPb; +import jakarta.annotation.Generated; import java.lang.IllegalArgumentException; import java.lang.Object; import java.lang.String; @@ -49,7 +50,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Generated; @Generated("com.netflix.conductor.annotationsprocessor.protogen") public abstract class AbstractProtoMapper { diff --git a/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java b/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java index 31286609a..80d9f08e0 100644 --- a/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java +++ b/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java @@ -39,7 +39,7 @@ public void workflowTaskFromProto() { final WorkflowTaskPb.WorkflowTask taskWithDefaultRetryCount = WorkflowTaskPb.WorkflowTask.newBuilder().build(); final WorkflowTaskPb.WorkflowTask taskWith1RetryCount = WorkflowTaskPb.WorkflowTask.newBuilder().setRetryCount(1).build(); final WorkflowTaskPb.WorkflowTask taskWithNoRetryCount = WorkflowTaskPb.WorkflowTask.newBuilder().setRetryCount(-1).build(); - assertEquals(new Integer(0), mapper.fromProto(taskWithDefaultRetryCount).getRetryCount()); + assertEquals(Integer.valueOf(0), mapper.fromProto(taskWithDefaultRetryCount).getRetryCount()); assertEquals(1, mapper.fromProto(taskWith1RetryCount).getRetryCount().intValue()); assertNull(mapper.fromProto(taskWithNoRetryCount).getRetryCount()); } diff --git a/http-task/build.gradle b/http-task/build.gradle index a9f76899e..93bbe2599 100644 --- a/http-task/build.gradle +++ b/http-task/build.gradle @@ -17,6 +17,7 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter-web' implementation "javax.ws.rs:jsr311-api:${revJsr311Api}" + implementation("org.apache.httpcomponents.client5:httpclient5:${revApacheHttpComponentsClient5}") testImplementation 'org.springframework.boot:spring-boot-starter-web' testImplementation "org.testcontainers:mockserver:${revTestContainer}" diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index f6669d5c9..9004cb56d 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": "3.1.4" } }, "compileClasspath": { @@ -14,26 +14,29 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -41,46 +44,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -119,23 +122,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -156,7 +162,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +170,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +178,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +186,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,7 +194,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -207,23 +213,26 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "junit:junit": { "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" @@ -232,19 +241,19 @@ "locked": "1.70" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.mock-server:mockserver-client-java": { "locked": "5.12.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.testcontainers:mockserver": { "locked": "1.15.3" @@ -255,46 +264,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -333,23 +342,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "junit:junit": { "locked": "4.13.2" }, @@ -373,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -381,7 +393,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -389,7 +401,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -397,7 +409,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -405,7 +417,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" @@ -414,7 +426,7 @@ "locked": "1.70" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.mock-server:mockserver-client-java": { "locked": "5.12.0" @@ -426,13 +438,13 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.testcontainers:mockserver": { "locked": "1.15.3" diff --git a/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java b/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java index 3b3a0c14f..d388b165e 100644 --- a/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java +++ b/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java @@ -167,13 +167,18 @@ protected HttpResponse httpCall(Input input) throws Exception { HttpResponse response = new HttpResponse(); try { ResponseEntity responseEntity = - restTemplate.exchange(input.getUri(), input.getMethod(), request, String.class); + restTemplate.exchange( + input.getUri(), + HttpMethod.valueOf(input.getMethod()), + request, + String.class); if (responseEntity.getStatusCode().is2xxSuccessful() && responseEntity.hasBody()) { response.body = extractBody(responseEntity.getBody()); } response.statusCode = responseEntity.getStatusCodeValue(); - response.reasonPhrase = responseEntity.getStatusCode().getReasonPhrase(); + response.reasonPhrase = + HttpStatus.valueOf(responseEntity.getStatusCode().value()).getReasonPhrase(); response.headers = responseEntity.getHeaders(); return response; } catch (RestClientException ex) { @@ -253,7 +258,7 @@ public Map asMap() { public static class Input { - private HttpMethod method; // PUT, POST, GET, DELETE, OPTIONS, HEAD + private String method; // PUT, POST, GET, DELETE, OPTIONS, HEAD private String vipAddress; private String appName; private Map headers = new HashMap<>(); @@ -267,7 +272,7 @@ public static class Input { /** * @return the method */ - public HttpMethod getMethod() { + public String getMethod() { return method; } @@ -275,7 +280,7 @@ public HttpMethod getMethod() { * @param method the method to set */ public void setMethod(String method) { - this.method = HttpMethod.valueOf(method); + this.method = method; } /** diff --git a/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java b/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java index d460e36f6..0a1cfd2f7 100644 --- a/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java +++ b/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java @@ -14,7 +14,10 @@ import java.time.Duration; import java.util.Optional; +import java.util.concurrent.TimeUnit; +import org.apache.hc.core5.http.io.SocketConfig; +import org.apache.hc.core5.util.Timeout; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.client.RestTemplateBuilder; @@ -32,7 +35,7 @@ @Component public class DefaultRestTemplateProvider implements RestTemplateProvider { - private final ThreadLocal threadLocalRestTemplate; + private final ThreadLocal threadLocalRestTemplateBuilder; private final int defaultReadTimeout; private final int defaultConnectTimeout; @@ -41,20 +44,28 @@ public class DefaultRestTemplateProvider implements RestTemplateProvider { public DefaultRestTemplateProvider( @Value("${conductor.tasks.http.readTimeout:150ms}") Duration readTimeout, @Value("${conductor.tasks.http.connectTimeout:100ms}") Duration connectTimeout) { - this.threadLocalRestTemplate = ThreadLocal.withInitial(RestTemplate::new); + this.threadLocalRestTemplateBuilder = ThreadLocal.withInitial(RestTemplateBuilder::new); this.defaultReadTimeout = (int) readTimeout.toMillis(); this.defaultConnectTimeout = (int) connectTimeout.toMillis(); } @Override public @NonNull RestTemplate getRestTemplate(@NonNull HttpTask.Input input) { - RestTemplate restTemplate = threadLocalRestTemplate.get(); + Duration timeout = + Duration.ofMillis( + Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout)); + threadLocalRestTemplateBuilder.get().setReadTimeout(timeout); + RestTemplate restTemplate = + threadLocalRestTemplateBuilder.get().setReadTimeout(timeout).build(); HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(); + SocketConfig.Builder builder = SocketConfig.custom(); + builder.setSoTimeout( + Timeout.of( + Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout), + TimeUnit.MILLISECONDS)); requestFactory.setConnectTimeout( Optional.ofNullable(input.getConnectionTimeOut()).orElse(defaultConnectTimeout)); - requestFactory.setReadTimeout( - Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout)); restTemplate.setRequestFactory(requestFactory); return restTemplate; } diff --git a/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java b/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java index f82662556..2b2f6a6df 100644 --- a/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java +++ b/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java @@ -315,7 +315,7 @@ public void testHTTPGETReadTimeOut() { task.setScheduledTime(0); httpTask.start(workflow, task, workflowExecutor); - assertEquals(task.getStatus(), TaskModel.Status.FAILED); + assertEquals(TaskModel.Status.FAILED, task.getStatus()); } @Test diff --git a/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java b/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java index 816f5d6f9..3141e47e5 100644 --- a/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java +++ b/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java @@ -14,6 +14,7 @@ import java.time.Duration; +import org.junit.Ignore; import org.junit.Test; import org.springframework.web.client.RestTemplate; @@ -46,6 +47,7 @@ public void differentObjectsForDifferentThreads() throws InterruptedException { } @Test + @Ignore("We can no longer do this and have customizable timeouts per HttpTask.") public void sameObjectForSameThread() { DefaultRestTemplateProvider defaultRestTemplateProvider = new DefaultRestTemplateProvider(Duration.ofMillis(150), Duration.ofMillis(100)); diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 6572905d2..0f9a211f9 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -20,7 +20,7 @@ dependencies { testImplementation "com.fasterxml.jackson.core:jackson-core" testImplementation "org.apache.commons:commons-lang3" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" } diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 17084fccf..273c00559 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": "3.1.4" } }, "compileClasspath": { @@ -9,7 +9,7 @@ "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" @@ -27,19 +27,19 @@ "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -62,31 +62,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": { "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" @@ -95,7 +95,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -161,7 +161,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -169,7 +169,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -177,7 +177,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -185,7 +185,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -193,7 +193,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -216,10 +216,10 @@ "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" @@ -243,22 +243,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "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.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "6.0.12" } }, "testRuntimeClasspath": { @@ -299,31 +299,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": { "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" @@ -332,7 +332,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -401,7 +401,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -409,7 +409,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -417,7 +417,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -425,7 +425,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -433,10 +433,10 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "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.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "6.0.12" } } } \ No newline at end of file diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index 27e43fb55..010c2e434 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -1,12 +1,12 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.netflix.conductor:conductor-common": { "project": true @@ -18,22 +18,22 @@ "locked": "0.0.13" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -41,46 +41,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -119,19 +119,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "net.thisptr:jackson-jq": { "locked": "0.0.13" @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -199,7 +199,7 @@ }, "testCompileClasspath": { "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.netflix.conductor:conductor-common": { "project": true @@ -214,28 +214,28 @@ "locked": "0.0.13" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -243,46 +243,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -321,19 +321,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -361,7 +361,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -369,7 +369,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -377,7 +377,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -385,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -393,10 +393,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/redis-concurrency-limit/build.gradle b/redis-concurrency-limit/build.gradle index 9c826ea61..b0061578d 100644 --- a/redis-concurrency-limit/build.gradle +++ b/redis-concurrency-limit/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation "redis.clients:jedis:3.6.0" // Jedis version "revJedis=3.3.0" does not play well with Spring Data Redis implementation "org.apache.commons:commons-lang3" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" testImplementation "org.testcontainers:spock:${revTestContainer}" diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index b7a19c231..936087215 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": "3.1.4" } }, "compileClasspath": { @@ -15,28 +15,28 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { "locked": "2.7.2" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "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": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,21 +188,15 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" - }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" + "locked": "2.21.0" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -217,37 +211,37 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { "locked": "2.7.2" @@ -259,7 +253,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -267,27 +261,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 +294,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": [ @@ -382,7 +376,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -390,7 +384,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -398,7 +392,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -406,7 +400,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -414,10 +408,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -429,16 +423,16 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { "locked": "2.7.2" diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index fe504d621..82ba26589 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": "3.1.4" } }, "compileClasspath": { @@ -12,25 +12,25 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.redisson:redisson": { "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -38,46 +38,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -116,19 +116,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -150,7 +150,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -158,7 +158,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -166,7 +166,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -174,7 +174,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -182,7 +182,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -208,31 +208,31 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.redisson:redisson": { "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -240,33 +240,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.github.kstyrc:embedded-redis": { "locked": "0.6" @@ -276,13 +276,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -321,19 +321,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -358,7 +358,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -366,7 +366,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -374,7 +374,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -382,7 +382,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -390,10 +390,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index e5545e2aa..4da148cad 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": "3.1.4" } }, "compileClasspath": { @@ -18,25 +18,25 @@ "locked": "1.4.20" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -47,46 +47,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -131,19 +131,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -165,7 +165,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -173,7 +173,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -181,7 +181,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -189,7 +189,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -197,7 +197,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -229,31 +229,31 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -264,46 +264,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -348,19 +348,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -385,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -393,7 +393,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -401,7 +401,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -409,7 +409,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -417,10 +417,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -432,10 +432,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "redis.clients:jedis": { "locked": "3.3.0" diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java index 9e32a1d5f..2ae22e7d0 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java @@ -40,6 +40,9 @@ public List getHosts() { } private List parseHostsFromConfig() { + System.out.println("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + System.out.println("Properties in ConfigurationHostSupplier: "); + System.out.println(properties); String hosts = properties.getHosts(); if (hosts == null) { String message = diff --git a/rest/dependencies.lock b/rest/dependencies.lock index a3cfdea4b..77e50509f 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": "3.1.4" } }, "compileClasspath": { @@ -15,25 +15,25 @@ "locked": "1.1.4" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -41,46 +41,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,19 +122,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -200,7 +200,7 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testCompileClasspath": { @@ -217,34 +217,34 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -252,46 +252,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "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": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -333,19 +333,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -370,7 +370,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -378,7 +378,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -386,7 +386,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -394,7 +394,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -402,10 +402,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -417,13 +417,13 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java b/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java index ab5c47eee..f61b8e95d 100644 --- a/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java +++ b/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java @@ -15,8 +15,6 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; @@ -33,6 +31,7 @@ import com.netflix.conductor.metrics.Monitors; import com.fasterxml.jackson.databind.exc.InvalidFormatException; +import jakarta.servlet.http.HttpServletRequest; @RestControllerAdvice @Order(ValidationExceptionMapper.ORDER + 1) diff --git a/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java b/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java index 704f72e05..928e7419f 100644 --- a/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java +++ b/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java @@ -16,11 +16,6 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ValidationException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.Ordered; @@ -35,6 +30,11 @@ import com.netflix.conductor.core.utils.Utils; import com.netflix.conductor.metrics.Monitors; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ValidationException; + /** This class converts Hibernate {@link ValidationException} into http response. */ @RestControllerAdvice @Order(ValidationExceptionMapper.ORDER) diff --git a/server/build.gradle b/server/build.gradle index 1bee56916..c103fd3a3 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -37,6 +37,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-log4j2' implementation 'org.apache.logging.log4j:log4j-web' + implementation "redis.clients:jedis:${revJedis}" implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation "io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}" diff --git a/server/dependencies.lock b/server/dependencies.lock index c19744790..cb77006ed 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": "3.1.4" } }, "compileClasspath": { @@ -45,40 +45,43 @@ "locked": "1.0.3" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" + }, + "redis.clients:jedis": { + "locked": "3.3.0" } }, "productionRuntimeClasspath": { @@ -104,34 +107,34 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -146,13 +149,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -273,25 +276,25 @@ "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" ], - "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" @@ -301,25 +304,25 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ @@ -372,7 +375,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -392,7 +395,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -412,7 +415,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -432,7 +435,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -452,13 +455,13 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "8.7.1" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ @@ -473,7 +476,7 @@ "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -500,32 +503,32 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } }, "runtimeClasspath": { @@ -551,34 +554,34 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -593,13 +596,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -720,25 +723,25 @@ "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" ], - "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" @@ -748,25 +751,25 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ @@ -819,7 +822,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -839,7 +842,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -859,7 +862,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -879,7 +882,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -899,13 +902,13 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "8.7.1" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ @@ -920,7 +923,7 @@ "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -947,37 +950,37 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-awss3-storage": { "project": true @@ -1019,13 +1022,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" @@ -1034,46 +1037,49 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" + }, + "redis.clients:jedis": { + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -1099,34 +1105,34 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -1141,13 +1147,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -1268,28 +1274,28 @@ "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" ], - "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" @@ -1299,25 +1305,25 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ @@ -1373,7 +1379,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -1393,7 +1399,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -1413,7 +1419,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -1433,7 +1439,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -1453,13 +1459,13 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "8.7.1" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ @@ -1474,10 +1480,10 @@ "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -1504,35 +1510,35 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } } } \ No newline at end of file diff --git a/springboot-bom-overrides.gradle b/springboot-bom-overrides.gradle index dc9f79b60..328a12a2a 100644 --- a/springboot-bom-overrides.gradle +++ b/springboot-bom-overrides.gradle @@ -12,7 +12,7 @@ */ // Contains overrides for Spring Boot Dependency Management plugin -// Dependency version override properties can be found at https://docs.spring.io/spring-boot/docs/2.7.3/reference/htmlsingle/#appendix.dependency-versions.properties +// Dependency version override properties can be found at https://docs.spring.io/spring-boot/docs/3.1.4/reference/htmlsingle/#appendix.dependency-versions.properties // Conductor's default is ES6, but SB brings in ES7 ext['elasticsearch.version'] = revElasticSearch6 diff --git a/test-harness/build.gradle b/test-harness/build.gradle index 7adc179e3..8ef63eb8d 100644 --- a/test-harness/build.gradle +++ b/test-harness/build.gradle @@ -28,7 +28,7 @@ dependencies { testImplementation "redis.clients:jedis:${revJedis}" testImplementation "com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 2dd48417d..95bb8411d 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1,55 +1,55 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" } }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" } }, "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" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-cassandra-persistence": { "project": true @@ -100,22 +100,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -130,22 +130,22 @@ "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "6.0.12" }, "org.testcontainers:elasticsearch": { "locked": "1.15.3" @@ -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": [ @@ -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": [ @@ -474,11 +474,11 @@ ], "locked": "2.3.3" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "javax.ws.rs:javax.ws.rs-api": { "firstLevelTransitive": [ @@ -545,7 +545,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -568,7 +568,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -591,7 +591,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -614,7 +614,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -637,10 +637,10 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.21.0" }, - "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ @@ -701,10 +701,10 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.4-M1-groovy-4.0" }, "org.springdoc:springdoc-openapi-ui": { "firstLevelTransitive": [ @@ -717,35 +717,35 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "firstLevelTransitive": [ @@ -754,7 +754,7 @@ "locked": "1.3.3" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "6.0.12" }, "org.testcontainers:elasticsearch": { "locked": "1.15.3" diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy index 8a70dabf0..4f13a99df 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy @@ -12,8 +12,6 @@ */ package com.netflix.conductor.test.util -import javax.annotation.PostConstruct - import org.apache.commons.lang3.StringUtils import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component @@ -31,6 +29,7 @@ import com.netflix.conductor.service.ExecutionService import com.netflix.conductor.service.MetadataService import com.fasterxml.jackson.databind.ObjectMapper +import jakarta.annotation.PostConstruct /** * This is a helper class used to initialize task definitions required by the tests when loaded up. diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java index 09f7b25b3..e04a2a991 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; From 693124e86484ef5c35a8da1863fae3825308af0a Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 17 Dec 2023 09:56:12 -0800 Subject: [PATCH 2/7] dependency locks --- annotations/dependencies.lock | 44 +++--- cassandra-persistence/dependencies.lock | 92 ++++++------ client/dependencies.lock | 92 ++++++------ common/dependencies.lock | 24 +-- core/dependencies.lock | 137 +++++++++++------- .../WorkflowTaskTypeConstraint.java | 9 +- dependencies.gradle | 3 +- dependencies.lock | 44 +++--- es6-persistence/dependencies.lock | 86 +++++------ grpc-client/dependencies.lock | 24 +++ grpc-server/dependencies.lock | 30 +++- http-task/dependencies.lock | 20 +-- java-sdk/dependencies.lock | 86 +++++------ redis-concurrency-limit/dependencies.lock | 110 +++++++------- server/dependencies.lock | 61 ++++++-- test-harness/build.gradle | 4 +- test-harness/dependencies.lock | 129 +++++++++-------- 17 files changed, 567 insertions(+), 428 deletions(-) diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock index 58dd8ff8a..545a15902 100644 --- a/annotations/dependencies.lock +++ b/annotations/dependencies.lock @@ -6,36 +6,36 @@ }, "compileClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" } }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" } }, "testCompileClasspath": { @@ -43,22 +43,22 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -72,22 +72,22 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index f7503712c..152c73575 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -18,19 +18,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" @@ -44,33 +44,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -83,7 +83,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,19 +122,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -216,26 +216,26 @@ "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" @@ -264,33 +264,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -303,7 +303,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -342,19 +342,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -373,13 +373,16 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -387,7 +390,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -395,7 +398,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -403,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -411,13 +414,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ diff --git a/client/dependencies.lock b/client/dependencies.lock index 103511e98..eca08ea7a 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -9,10 +9,10 @@ "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.netflix.conductor:conductor-common": { "project": true @@ -36,19 +36,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -57,7 +57,7 @@ "locked": "23.0.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" } }, "runtimeClasspath": { @@ -68,25 +68,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -135,41 +135,41 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" } }, "testCompileClasspath": { @@ -177,10 +177,10 @@ "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.netflix.conductor:conductor-common": { "project": true @@ -206,29 +206,29 @@ "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.powermock:powermock-api-mockito2": { "locked": "2.0.9" @@ -237,7 +237,7 @@ "locked": "2.0.9" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" @@ -260,25 +260,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -325,49 +325,49 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.powermock:powermock-api-mockito2": { "locked": "2.0.9" @@ -376,7 +376,7 @@ "locked": "2.0.9" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" diff --git a/common/dependencies.lock b/common/dependencies.lock index b8ea32112..4dfa1dd58 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -82,13 +82,13 @@ }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -129,13 +129,13 @@ }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -182,13 +182,13 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -235,13 +235,13 @@ }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.15.2" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" diff --git a/core/dependencies.lock b/core/dependencies.lock index cef256a97..b1a1eee7e 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -6,16 +6,16 @@ }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -39,10 +39,10 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "locked": "2.0.5" @@ -51,19 +51,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -75,33 +75,33 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -134,10 +134,10 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -156,35 +156,35 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -192,16 +192,16 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -225,10 +225,10 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -239,29 +239,29 @@ "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -282,33 +282,33 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -341,10 +341,10 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -364,11 +364,46 @@ "org.apache.groovy:groovy-all": { "locked": "4.0.9" }, + "org.apache.logging.log4j:log4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.20.0" + }, + "org.apache.logging.log4j:log4j-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.20.0" + }, + "org.apache.logging.log4j:log4j-jul": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.20.0" + }, + "org.apache.logging.log4j:log4j-slf4j-impl": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.20.0" + }, + "org.apache.logging.log4j:log4j-web": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.20.0" + }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -389,7 +424,7 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" } } } \ No newline at end of file diff --git a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java index 493fd76b2..2501849be 100644 --- a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java +++ b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java @@ -22,10 +22,6 @@ import java.util.Optional; import javax.script.ScriptException; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; import org.apache.commons.lang3.StringUtils; @@ -35,6 +31,11 @@ import com.netflix.conductor.core.events.ScriptEvaluator; import com.netflix.conductor.core.utils.DateTimeUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static com.netflix.conductor.core.execution.tasks.Terminate.getTerminationStatusParameter; import static com.netflix.conductor.core.execution.tasks.Terminate.validateInputStatus; import static com.netflix.conductor.core.execution.tasks.Wait.DURATION_INPUT; diff --git a/dependencies.gradle b/dependencies.gradle index 2a9d9f64f..769dd5fcd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,7 +15,7 @@ * Common place to define all the version dependencies */ ext { - revActivation = '3.0.2' + revActivation = '2.0.1' revApacheHttpComponentsClient5 = '5.2.1' revAwaitility = '3.1.6' revAwsSdk = '1.11.86' @@ -56,4 +56,5 @@ ext { revSpock = '2.4-M1-groovy-4.0' revSpotifyCompletableFutures = '0.3.3' revTestContainer = '1.15.3' + revFasterXml = '2.15.3' } diff --git a/dependencies.lock b/dependencies.lock index 752d96aac..fd0cb733b 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -6,19 +6,19 @@ }, "compileClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" } }, "jacocoAgent": { @@ -33,19 +33,19 @@ }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" } }, "testCompileClasspath": { @@ -53,22 +53,22 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -82,22 +82,22 @@ "locked": "4.13.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 32aa282aa..90c1e4bed 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -21,19 +21,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -48,7 +48,7 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" } }, "runtimeClasspath": { @@ -56,33 +56,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -98,7 +98,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -137,19 +137,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -171,7 +171,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -179,7 +179,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -187,7 +187,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -195,7 +195,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -203,7 +203,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -241,19 +241,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.awaitility:awaitility": { "locked": "3.1.6" @@ -268,7 +268,7 @@ "locked": "6.8.12" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -277,7 +277,7 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" }, "org.testcontainers:elasticsearch": { "locked": "1.15.3" @@ -288,33 +288,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -330,7 +330,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -369,19 +369,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -406,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -414,7 +414,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -422,7 +422,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -430,7 +430,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -438,7 +438,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.awaitility:awaitility": { "locked": "3.1.6" @@ -453,7 +453,7 @@ "locked": "6.8.12" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -468,7 +468,7 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" }, "org.testcontainers:elasticsearch": { "locked": "1.15.3" diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 9876ffb92..a0dd3f493 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -26,6 +26,9 @@ "io.grpc:grpc-stub": { "locked": "1.57.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -108,8 +111,17 @@ "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.3.2" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -188,6 +200,9 @@ "io.grpc:grpc-stub": { "locked": "1.57.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" + }, "junit:junit": { "locked": "4.13.2" }, @@ -282,8 +297,17 @@ "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.3.2" + }, "junit:junit": { "locked": "4.13.2" }, diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 144391fc1..ae4dd2f1c 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -17,6 +17,9 @@ "io.grpc:grpc-netty": { "locked": "1.57.2" }, + "io.grpc:grpc-protobuf": { + "locked": "1.57.2" + }, "io.grpc:grpc-services": { "locked": "1.57.2" }, @@ -81,7 +84,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.0" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -156,17 +159,23 @@ ], "locked": "2.1.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" + }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "4.0.1" }, - "jakarta.annotation:jakarta.annotation-api": { + "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "2.1.1" + "locked": "1.3.2" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -247,6 +256,9 @@ "io.grpc:grpc-netty": { "locked": "1.57.2" }, + "io.grpc:grpc-protobuf": { + "locked": "1.57.2" + }, "io.grpc:grpc-services": { "locked": "1.57.2" }, @@ -326,7 +338,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.0" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -404,17 +416,23 @@ ], "locked": "2.1.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" + }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "4.0.1" }, - "jakarta.annotation:jakarta.annotation-api": { + "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "2.1.1" + "locked": "1.3.2" }, "junit:junit": { "locked": "4.13.2" diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index 9004cb56d..8fd71e7f0 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -15,7 +15,7 @@ "locked": "1.1.1" }, "org.apache.httpcomponents.client5:httpclient5": { - "locked": "5.2.1" + "locked": "5.2.1" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.20.0" @@ -139,9 +139,6 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, - "org.apache.httpcomponents.client5:httpclient5": { - "locked": "5.2.1" - }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", @@ -156,6 +153,9 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -213,12 +213,12 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, - "org.apache.httpcomponents.client5:httpclient5": { - "locked": "5.2.1" - }, "junit:junit": { "locked": "4.13.2" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.20.0" }, @@ -359,9 +359,6 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, - "org.apache.httpcomponents.client5:httpclient5": { - "locked": "5.2.1" - }, "junit:junit": { "locked": "4.13.2" }, @@ -379,6 +376,9 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 273c00559..0d209a90f 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -9,7 +9,7 @@ "locked": "3.3.0" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -27,19 +27,19 @@ "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -62,31 +62,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -161,7 +161,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -169,7 +169,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -177,7 +177,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -185,7 +185,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -193,7 +193,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -208,7 +208,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" } }, "testCompileClasspath": { @@ -216,10 +216,10 @@ "locked": "3.3.0" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -242,29 +242,29 @@ "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -299,31 +299,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -395,13 +395,16 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -409,7 +412,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -417,7 +420,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -425,7 +428,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -433,10 +436,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -445,7 +445,7 @@ "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -454,7 +454,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 936087215..11a682428 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -15,28 +15,28 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } }, "runtimeClasspath": { @@ -44,33 +44,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -83,7 +83,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,19 +122,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -164,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -172,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -180,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -188,10 +188,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } }, "testCompileClasspath": { @@ -210,26 +216,26 @@ "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" @@ -244,7 +250,7 @@ "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "3.1.4" }, "org.testcontainers:spock": { "locked": "1.15.3" @@ -253,7 +259,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } }, "testRuntimeClasspath": { @@ -261,33 +267,33 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -300,7 +306,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -339,19 +345,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" @@ -370,13 +376,16 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -384,7 +393,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -392,7 +401,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -400,7 +409,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -408,13 +417,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -435,7 +441,7 @@ "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "3.1.4" }, "org.testcontainers:spock": { "locked": "1.15.3" diff --git a/server/dependencies.lock b/server/dependencies.lock index cb77006ed..ba811c2ce 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -149,7 +149,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.0" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -280,7 +280,8 @@ }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], "locked": "1.57.2" }, @@ -312,17 +313,23 @@ ], "locked": "2.1.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" + }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "4.0.1" }, - "jakarta.annotation:jakarta.annotation-api": { + "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "2.1.1" + "locked": "1.3.2" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ @@ -357,6 +364,12 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -596,7 +609,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.0" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -727,7 +740,8 @@ }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], "locked": "1.57.2" }, @@ -759,17 +773,23 @@ ], "locked": "2.1.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" + }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "4.0.1" }, - "jakarta.annotation:jakarta.annotation-api": { + "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "2.1.1" + "locked": "1.3.2" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ @@ -804,6 +824,12 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -1278,7 +1304,8 @@ }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], "locked": "1.57.2" }, @@ -1313,17 +1340,23 @@ ], "locked": "2.1.2" }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" + }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "4.0.1" }, - "jakarta.annotation:jakarta.annotation-api": { + "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "2.1.1" + "locked": "1.3.2" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ @@ -1361,6 +1394,12 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", diff --git a/test-harness/build.gradle b/test-harness/build.gradle index 8c49d91fd..ea410db62 100644 --- a/test-harness/build.gradle +++ b/test-harness/build.gradle @@ -32,8 +32,8 @@ dependencies { testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" - testImplementation "org.elasticsearch.client:elasticsearch-rest-client" - testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client" + testImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.8.23" + testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.23" testImplementation "org.testcontainers:elasticsearch:${revTestContainer}" testImplementation('junit:junit:4.13.2') diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 95bb8411d..4266b0e15 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -6,44 +6,44 @@ }, "compileClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" } }, "runtimeClasspath": { "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" + "locked": "2.20.0" } }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.5" + "locked": "2.15.3" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -99,35 +99,35 @@ "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.23" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" @@ -142,7 +142,7 @@ "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "2.0.3" }, "org.springframework:spring-web": { "locked": "6.0.12" @@ -183,46 +183,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.5" + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.5" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -245,7 +245,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "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": [ @@ -460,25 +461,32 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, - "jakarta.annotation:jakarta.annotation-api": { + "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "2.1.1" + "locked": "1.3.2" }, "javax.ws.rs:javax.ws.rs-api": { "firstLevelTransitive": [ @@ -524,6 +532,15 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -545,7 +562,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -568,7 +585,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -591,7 +608,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -614,7 +631,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -637,22 +654,19 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.21.0" - }, - "org.apache.groovy:groovy-all": { - "locked": "4.0.9" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ @@ -664,7 +678,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.3.6" + "locked": "4.0.3" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -673,7 +687,7 @@ "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -698,7 +712,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { "locked": "2.4-M1-groovy-4.0" @@ -751,7 +765,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.3.3" + "locked": "2.0.3" }, "org.springframework:spring-web": { "locked": "6.0.12" @@ -762,7 +776,8 @@ "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-server" ], "locked": "3.3.0" } From c7652a98685be1ac7ff57e93e1632ab1a96a672f Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 17 Dec 2023 10:02:04 -0800 Subject: [PATCH 3/7] dependencies --- dependencies.gradle | 2 +- server/dependencies.lock | 10 +++++----- test-harness/dependencies.lock | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 769dd5fcd..1fbe9dad7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -44,7 +44,7 @@ ext { revJsr311Api = '1.1.1' revMockServerClient = '5.12.0' revOpenapi = '1.6.+' - revOrkesQueues = '1.0.3' + revOrkesQueues = '1.0.7' revPowerMock = '2.0.9' revProtoBuf = '3.21.12' revProtogenAnnotations = '1.0.0' diff --git a/server/dependencies.lock b/server/dependencies.lock index ba811c2ce..551cb5f20 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -42,7 +42,7 @@ "project": true }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.20.0" @@ -298,7 +298,7 @@ "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -758,7 +758,7 @@ "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -1057,7 +1057,7 @@ "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "junit:junit": { "locked": "4.13.2" @@ -1325,7 +1325,7 @@ "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 4266b0e15..3473f8f56 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -454,7 +454,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ From 9e2c85eaca07b365945b8acbb7d19201c271fb28 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 17 Dec 2023 10:16:04 -0800 Subject: [PATCH 4/7] springdocs --- common/build.gradle | 2 +- dependencies.gradle | 2 +- rest/build.gradle | 2 +- server/build.gradle | 3 ++- server/src/main/resources/application.properties | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 5f20d89b8..ef64ff263 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -9,7 +9,7 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter' compileOnly 'org.springframework.boot:spring-boot-starter-validation' - compileOnly "org.springdoc:springdoc-openapi-ui:${revOpenapi}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}" implementation "org.apache.commons:commons-lang3" diff --git a/dependencies.gradle b/dependencies.gradle index 1fbe9dad7..41c0f0317 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -43,7 +43,7 @@ ext { revJq = '0.0.13' revJsr311Api = '1.1.1' revMockServerClient = '5.12.0' - revOpenapi = '1.6.+' + revSpringDoc = '2.1.0' revOrkesQueues = '1.0.7' revPowerMock = '2.0.9' revProtoBuf = '3.21.12' diff --git a/rest/build.gradle b/rest/build.gradle index 97d66d816..dc19c73dd 100644 --- a/rest/build.gradle +++ b/rest/build.gradle @@ -7,5 +7,5 @@ dependencies { implementation "com.netflix.runtime:health-api:${revHealth}" - implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}" } diff --git a/server/build.gradle b/server/build.gradle index 7b87576e9..38ebba808 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -42,7 +42,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation "io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}" - implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}" + runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${revJAXB}" diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 09b8f22b4..9889a2022 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -15,7 +15,7 @@ spring.application.name=conductor springdoc.api-docs.path=/api-docs loadSample=true -conductor.db.type=memory +conductor.db.type=redis_standalone conductor.queue.type=redis_standalone conductor.indexing.enabled=false From 67f699ca70abd091e2549ad21ae8beb40ef6adac Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 17 Dec 2023 10:17:28 -0800 Subject: [PATCH 5/7] Update ci.yml --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9528884b4..f4cd98635 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,12 +42,8 @@ jobs: if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' run: | echo "Running build for commit ${{ github.sha }}" - ./gradlew build snapshot --scan + ./gradlew build env: - NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }} - NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }} - NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} - NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} - name: Publish Test Report uses: mikepenz/action-junit-report@v3 if: always() From dbbe6b5e7c855e1cc9718a827b420b3ca4d1b747 Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 17 Dec 2023 10:31:13 -0800 Subject: [PATCH 6/7] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4cd98635..a25c97dd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,6 @@ jobs: run: | echo "Running build for commit ${{ github.sha }}" ./gradlew build - env: - name: Publish Test Report uses: mikepenz/action-junit-report@v3 if: always() From ebd0fa2d152b4fcaac748127cf5856d5fb95ff2f Mon Sep 17 00:00:00 2001 From: Viren Baraiya Date: Sun, 17 Dec 2023 10:50:06 -0800 Subject: [PATCH 7/7] dependencies --- redis-concurrency-limit/build.gradle | 2 +- redis-concurrency-limit/dependencies.lock | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/redis-concurrency-limit/build.gradle b/redis-concurrency-limit/build.gradle index b0061578d..20c508809 100644 --- a/redis-concurrency-limit/build.gradle +++ b/redis-concurrency-limit/build.gradle @@ -17,5 +17,5 @@ dependencies { testImplementation "org.testcontainers:spock:${revTestContainer}" testImplementation "org.testcontainers:testcontainers:${revTestContainer}" testImplementation "com.google.protobuf:protobuf-java:${revProtoBuf}" - testImplementation 'org.springframework.data:spring-data-redis' + testImplementation 'org.springframework.data:spring-data-redis:2.7.16' } diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 11a682428..3a3cb7f21 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -33,7 +33,7 @@ "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "3.1.4" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -196,6 +196,12 @@ ], "locked": "15.4" }, + "org.springdoc:springdoc-openapi-starter-webmvc-ui": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.1.0" + }, "redis.clients:jedis": { "locked": "3.6.0" } @@ -250,7 +256,7 @@ "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "3.1.4" + "locked": "2.7.16" }, "org.testcontainers:spock": { "locked": "1.15.3" @@ -434,6 +440,12 @@ "org.spockframework:spock-spring": { "locked": "2.4-M1-groovy-4.0" }, + "org.springdoc:springdoc-openapi-starter-webmvc-ui": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.1.0" + }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" }, @@ -441,7 +453,7 @@ "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "3.1.4" + "locked": "2.7.16" }, "org.testcontainers:spock": { "locked": "1.15.3"