From 78b46dc15d2c1cb2f395f706b3d85d3e7252d469 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 07:40:37 +1100 Subject: [PATCH 01/30] Upgrade to Spring3 --- README.md | 2 +- WHOSUSING.md | 3 +- annotations-processor/dependencies.lock | 60 ++--- annotations/dependencies.lock | 50 ++-- awss3-storage/dependencies.lock | 64 +++-- awssqs-event-queue/dependencies.lock | 68 +++-- build.gradle | 77 ++---- cassandra-persistence/dependencies.lock | 68 +++-- .../cache/CacheableEventHandlerDAO.java | 2 +- .../config/cache/CacheableMetadataDAO.java | 2 +- client-spring/dependencies.lock | 70 +++-- client/dependencies.lock | 54 ++-- common/dependencies.lock | 68 ++--- .../config/ObjectMapperConfiguration.java | 2 +- .../constraints/NoSemiColonConstraint.java | 8 +- .../OwnerEmailMandatoryConstraint.java | 8 +- .../TaskReferenceNameUniqueConstraint.java | 8 +- .../constraints/TaskTimeoutConstraint.java | 8 +- .../common/metadata/events/EventHandler.java | 6 +- .../common/metadata/tasks/TaskDef.java | 10 +- .../common/metadata/tasks/TaskResult.java | 2 +- .../common/metadata/tasks/TaskType.java | 4 +- .../workflow/StartWorkflowRequest.java | 8 +- .../metadata/workflow/SubWorkflowParams.java | 4 +- .../common/metadata/workflow/WorkflowDef.java | 12 +- .../metadata/workflow/WorkflowDefSummary.java | 2 +- .../metadata/workflow/WorkflowTask.java | 6 +- .../conductor/common/run/Workflow.java | 4 +- .../conductor/common/utils/SummaryUtil.java | 2 +- .../common/events/EventHandlerTest.java | 8 +- .../conductor/common/tasks/TaskDefTest.java | 8 +- .../workflow/SubWorkflowParamsTest.java | 8 +- .../workflow/WorkflowDefValidatorTest.java | 8 +- .../common/workflow/WorkflowTaskTest.java | 8 +- core/build.gradle | 2 + core/dependencies.lock | 99 +++---- .../core/dal/ExecutionDAOFacade.java | 2 +- .../core/events/ScriptEvaluator.java | 9 +- .../core/execution/WorkflowExecutor.java | 6 +- .../core/execution/mapper/NoopTaskMapper.java | 46 ++++ .../core/execution/mapper/WaitTaskMapper.java | 56 ++++ .../conductor/core/execution/tasks/Noop.java | 36 +++ .../core/execution/tasks/StartWorkflow.java | 2 +- .../conductor/core/execution/tasks/Wait.java | 52 +--- .../core/storage/DummyPayloadStorage.java | 68 ++++- .../conductor/core/utils/ParametersUtils.java | 124 ++++++--- .../conductor/service/AdminService.java | 2 +- .../conductor/service/EventService.java | 6 +- .../conductor/service/MetadataService.java | 8 +- .../conductor/service/TaskService.java | 6 +- .../service/WorkflowBulkService.java | 4 +- .../conductor/service/WorkflowService.java | 10 +- .../WorkflowTaskTypeConstraint.java | 8 +- .../execution/tasks/StartWorkflowSpec.groovy | 4 +- .../java/com/netflix/conductor/TestUtils.java | 2 +- .../core/execution/TestWorkflowExecutor.java | 5 +- .../execution/mapper/NoopTaskMapperTest.java | 57 ++++ .../execution/mapper/WaitTaskMapperTest.java | 148 ++++++++++ .../core/execution/tasks/TestNoop.java | 36 +++ .../core/execution/tasks/TestWait.java | 109 -------- .../metadata/MetadataMapperServiceTest.java | 2 +- .../core/storage/DummyPayloadStorageTest.java | 92 +++++++ .../core/utils/ParametersUtilsTest.java | 24 ++ .../conductor/service/EventServiceTest.java | 2 +- .../service/MetadataServiceTest.java | 2 +- .../conductor/service/TaskServiceTest.java | 2 +- .../service/WorkflowBulkServiceTest.java | 2 +- .../service/WorkflowServiceTest.java | 2 +- .../WorkflowDefConstraintTest.java | 8 +- .../WorkflowTaskTypeConstraintTest.java | 16 +- dependencies.gradle | 6 +- dependencies.lock | 50 ++-- docker/README.md | 52 +++- docker/ci/Dockerfile | 2 +- docker/docker-compose-dynomite.yaml | 31 --- ...compose.yaml => docker-compose-mysql.yaml} | 67 ++--- docker/docker-compose-postgres.yaml | 44 ++- docker/docker-compose-prometheus.yaml | 20 -- docker/docker-compose.yaml | 46 +--- docker/grpc/Makefile | 18 -- docker/server/Dockerfile | 54 +++- docker/server/README.md | 13 - docker/server/bin/startup.sh | 10 +- docker/server/config/config-local.properties | 36 --- .../config/config-mysql-grpc.properties | 39 --- docker/server/config/config-mysql.properties | 23 +- .../server/config/config-postgres.properties | 24 +- docker/server/config/config-redis.properties | 25 ++ docker/server/config/config.properties | 74 +++-- docker/server/config/log4j.properties | 1 + docker/server/config/redis.conf | 1 + docker/server/nginx/nginx.conf | 50 ++++ docker/serverAndUI/Dockerfile | 63 ----- docker/serverAndUI/README.md | 10 - docker/serverAndUI/bin/startup.sh | 36 --- .../config/config-local.properties | 33 --- docker/serverAndUI/config/config.properties | 35 --- docker/serverAndUI/nginx/nginx.conf | 20 -- docker/ui/Dockerfile | 14 +- docs/docs/gettingstarted/source.md | 2 +- es6-persistence/build.gradle | 6 +- es6-persistence/dependencies.lock | 64 +++-- .../es6/dao/index/ElasticSearchDAOV6.java | 4 +- .../es6/dao/index/ElasticSearchRestDAOV6.java | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- grpc-client/dependencies.lock | 74 ++--- grpc-server/dependencies.lock | 92 ++++--- .../conductor/grpc/server/GRPCServer.java | 4 +- grpc/dependencies.lock | 100 +++---- .../conductor/grpc/AbstractProtoMapper.java | 40 +-- grpc/src/main/proto/model/taskdef.proto | 10 +- http-task/build.gradle | 2 + http-task/dependencies.lock | 82 ++++-- .../conductor/tasks/http/HttpTask.java | 2 +- java-sdk/build.gradle | 1 + java-sdk/dependencies.lock | 66 +++-- .../sdk/workflow/def/tasks/Javascript.java | 4 +- .../workflow/def/WorkflowCreationTests.java | 6 + json-jq-task/dependencies.lock | 64 +++-- redis-concurrency-limit/dependencies.lock | 68 +++-- redis-lock/dependencies.lock | 64 +++-- redis-persistence/dependencies.lock | 64 +++-- rest/dependencies.lock | 70 +++-- .../ApplicationExceptionMapper.java | 2 +- .../ValidationExceptionMapper.java | 8 +- server/dependencies.lock | 252 ++++++++++-------- springboot-bom-overrides.gradle | 2 +- test-harness/dependencies.lock | 76 +++--- .../WorkflowAndTaskConfigurationSpec.groovy | 2 +- .../test/util/WorkflowTestUtil.groovy | 2 +- ui/src/pages/definition/SaveTaskDialog.jsx | 9 +- .../pages/definition/SaveWorkflowDialog.jsx | 9 +- ui/yarn.lock | 8 +- 133 files changed, 2155 insertions(+), 1790 deletions(-) create mode 100644 core/src/main/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapper.java create mode 100644 core/src/main/java/com/netflix/conductor/core/execution/tasks/Noop.java create mode 100644 core/src/test/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapperTest.java create mode 100644 core/src/test/java/com/netflix/conductor/core/execution/tasks/TestNoop.java delete mode 100644 core/src/test/java/com/netflix/conductor/core/execution/tasks/TestWait.java create mode 100644 core/src/test/java/com/netflix/conductor/core/storage/DummyPayloadStorageTest.java delete mode 100644 docker/docker-compose-dynomite.yaml rename docker/{grpc/docker-compose.yaml => docker-compose-mysql.yaml} (60%) delete mode 100644 docker/docker-compose-prometheus.yaml delete mode 100644 docker/grpc/Makefile delete mode 100644 docker/server/README.md delete mode 100755 docker/server/config/config-local.properties delete mode 100755 docker/server/config/config-mysql-grpc.properties create mode 100755 docker/server/config/config-redis.properties create mode 100644 docker/server/config/redis.conf create mode 100644 docker/server/nginx/nginx.conf delete mode 100644 docker/serverAndUI/Dockerfile delete mode 100644 docker/serverAndUI/README.md delete mode 100755 docker/serverAndUI/bin/startup.sh delete mode 100755 docker/serverAndUI/config/config-local.properties delete mode 100755 docker/serverAndUI/config/config.properties delete mode 100644 docker/serverAndUI/nginx/nginx.conf diff --git a/README.md b/README.md index 0b6c4f5adf..3a2c256e07 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Binaries are available from [Netflix OSS Maven](https://artifacts.netflix.net/ne * The indexing backend is [Elasticsearch](https://www.elastic.co/) (6.x) ## Other Requirements -* JDK 11+ +* JDK 17+ * UI requires Node 14 to build. Earlier Node versions may work but is untested. ## Get Support diff --git a/WHOSUSING.md b/WHOSUSING.md index e9b84e58c3..224d5f13fb 100644 --- a/WHOSUSING.md +++ b/WHOSUSING.md @@ -14,4 +14,5 @@ We would like to keep track of whose using Conductor. Please send a pull request * [Supercharge](https://supercharge.io)[[@team-supercharge](https://github.com/team-supercharge)] * [GE Healthcare](https://www.gehealthcare.com/) [[@flavioschuindt](https://github.com/flavioschuindt)] * [ReliaQuest](https://www.reliaquest.com/) [[@rq-dbrady](https://github.com/rq-dbrady)] [[@alexmay48](https://github.com/alexmay48)] -* [Clari](https://www.clari.com/) [[@TeamJOF](https://github.com/clari)] \ No newline at end of file +* [Clari](https://www.clari.com/) [[@TeamJOF](https://github.com/clari)] +* [Atlassian](https://www.atlassian.com/) [[@LuisLainez](https://github.com/LuisLainez)] [[@aradu](https://github.com/aradu-atlassian)] diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 481b791d0a..86919f9a80 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": { @@ -24,19 +24,19 @@ "locked": "1.3.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" } }, "exampleCompileClasspath": { @@ -52,31 +52,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" } }, "runtimeClasspath": { @@ -102,31 +102,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" } }, "testCompileClasspath": { @@ -152,28 +152,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": { @@ -202,40 +202,40 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "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/annotations/dependencies.lock b/annotations/dependencies.lock index 7b2c9a2acf..58dd8ff8ab 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 971612a83d..1cea207215 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.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": { @@ -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,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -208,28 +214,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.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": { @@ -355,7 +361,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": [ @@ -363,7 +369,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": [ @@ -371,7 +377,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": [ @@ -379,7 +385,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": [ @@ -387,16 +393,22 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "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 e22ed2403f..bb3abfa93d 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.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": { @@ -165,7 +165,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": [ @@ -173,7 +173,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": [ @@ -181,7 +181,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": [ @@ -189,7 +189,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": [ @@ -197,7 +197,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -223,31 +229,31 @@ "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.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "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": { @@ -376,7 +382,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": [ @@ -384,7 +390,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": [ @@ -392,7 +398,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": [ @@ -400,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-web": { "firstLevelTransitive": [ @@ -408,19 +414,25 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "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 f54100b911..d4a4c68fd5 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.+' } } @@ -52,8 +52,8 @@ allprojects { apply plugin: 'java-library' apply plugin: 'project-report' - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 group = 'com.netflix.conductor' @@ -90,57 +90,17 @@ 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) } } dependencies { - implementation('org.apache.logging.log4j:log4j-core') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-api') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-slf4j-impl') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-jul') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-web') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } + implementation('org.apache.logging.log4j:log4j-core') + implementation('org.apache.logging.log4j:log4j-api') + implementation('org.apache.logging.log4j:log4j-slf4j-impl') + implementation('org.apache.logging.log4j:log4j-jul') + implementation('org.apache.logging.log4j:log4j-web') annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' testImplementation('org.springframework.boot:spring-boot-starter-test') @@ -164,11 +124,11 @@ allprojects { } } -// all client and their related modules are published with Java 11 compatibility +// all client and their related modules are published with Java 17 compatibility ["annotations", "common", "client", "client-spring", "grpc", "grpc-client"].each { project(":conductor-$it") { compileJava { - options.release = 11 + options.release = 17 } } } @@ -216,3 +176,18 @@ configure(allprojects - project(':conductor-grpc')) { } } } + +tasks.register('resolveAndLockAll') { + notCompatibleWithConfigurationCache("Filters configurations at execution time") + + doLast { + configurations.findAll { + // Add any custom filtering on the configurations to be resolved + it.canBeResolved + }.each { it.resolve() } + } +} + +dependencyLocking { + lockAllConfigurations() +} \ No newline at end of file diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index c625d004bb..605c15c451 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": { @@ -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,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -211,22 +217,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.13" + "locked": "2.5.22" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -238,10 +244,10 @@ "locked": "1.3-groovy-2.5" }, "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" @@ -373,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": [ @@ -381,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": [ @@ -389,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": [ @@ -397,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": [ @@ -405,14 +411,20 @@ "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.13" + "locked": "2.5.22" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" + }, "org.spockframework:spock-core": { "locked": "1.3-groovy-2.5" }, @@ -420,10 +432,10 @@ "locked": "1.3-groovy-2.5" }, "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 6f4b8bee1e..764623a03c 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,7 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 256512ea44..b81614fff1 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,7 +20,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock index 4499a9a756..80b674bceb 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.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": { @@ -166,7 +166,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.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.21.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.21.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.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -202,7 +202,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -211,6 +211,12 @@ ], "locked": "2.35" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "15.4" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" @@ -218,7 +224,7 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testCompileClasspath": { @@ -238,31 +244,31 @@ "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": { - "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": { @@ -398,7 +404,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -407,7 +413,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -416,7 +422,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -425,7 +431,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -434,7 +440,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -446,6 +452,12 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "15.4" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" @@ -453,13 +465,13 @@ "locked": "1.7.36" }, "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/dependencies.lock b/client/dependencies.lock index c47e3c755b..874894fd28 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": { @@ -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" @@ -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" @@ -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.13" + "locked": "2.5.22" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -246,10 +246,10 @@ "locked": "1.3-groovy-2.5" }, "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": { @@ -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.13" + "locked": "2.5.22" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -385,10 +385,10 @@ "locked": "1.3-groovy-2.5" }, "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 83f5cb299a..14d22c236a 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": { @@ -49,35 +49,35 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.21.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.21.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.21.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.21.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.21.0" } }, "compileClasspath": { @@ -103,28 +103,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.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": { @@ -153,31 +153,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" } }, "testCompileClasspath": { @@ -206,31 +206,31 @@ "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.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" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -262,43 +262,43 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "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" }, "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 ffcb719457..d83eeb3e29 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,7 +12,7 @@ */ package com.netflix.conductor.common.config; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.context.annotation.Configuration; 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 3bd402013f..fd10fc8f9a 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,10 +17,10 @@ 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 jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.StringUtils; 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 55347529dd..878e279869 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,10 +17,10 @@ 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 jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.StringUtils; 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 24f0ff4330..1780fad5ac 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,10 +19,10 @@ 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 jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.mutable.MutableBoolean; 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 56525c7b54..25204db09f 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,10 +17,10 @@ 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 jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import com.netflix.conductor.common.metadata.tasks.TaskDef; 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 77dda4c1ef..898b34d6e9 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,9 +17,9 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; 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 59e119a0ec..6cde91ae7e 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,11 +18,11 @@ 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 jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; 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 8953d499bf..bafaa894de 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,7 +17,7 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskType.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskType.java index 58df74569f..235a0ac91b 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskType.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskType.java @@ -40,7 +40,8 @@ public enum TaskType { TERMINATE, KAFKA_PUBLISH, JSON_JQ_TRANSFORM, - SET_VARIABLE; + SET_VARIABLE, + NOOP; /** * TaskType constants representing each of the possible enumeration values. Motivation: to not @@ -69,6 +70,7 @@ public enum TaskType { public static final String TASK_TYPE_JSON_JQ_TRANSFORM = "JSON_JQ_TRANSFORM"; public static final String TASK_TYPE_SET_VARIABLE = "SET_VARIABLE"; public static final String TASK_TYPE_FORK = "FORK"; + public static final String TASK_TYPE_NOOP = "NOOP"; private static final Set BUILT_IN_TASKS = new HashSet<>(); 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 cc01bca1a6..343ca088d5 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,10 +15,10 @@ 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 jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; 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 816981b865..1c666000fd 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,8 +15,8 @@ import java.util.Map; import java.util.Objects; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; 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 6ce981f908..6ad8503b8e 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,12 +19,12 @@ 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 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; import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; 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 fc0eca86dd..f0799ec38f 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,7 +14,7 @@ import java.util.Objects; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; 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 492a61d330..e6e4c2d27a 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,9 +21,9 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.PositiveOrZero; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.PositiveOrZero; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; 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 6936f95354..5a5b104377 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,8 +15,8 @@ import java.util.*; import java.util.stream.Collectors; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import org.apache.commons.lang3.StringUtils; 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 76127124e6..fb20cdda7b 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,7 +14,7 @@ import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 a6a1f5cd1c..2ab51088c6 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,10 +16,10 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Test; 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 41f9667792..08529b190b 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,10 +16,10 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Before; import org.junit.Test; 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 1859c4a0d7..0f337f91f6 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,10 +18,10 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Test; import org.junit.runner.RunWith; 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 16a08851ea..c5988b3bdd 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,10 +18,10 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Before; import org.junit.Test; 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 6d052e4d33..581c205793 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,10 +16,10 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Test; diff --git a/core/build.gradle b/core/build.gradle index d76aa71402..7a56014e88 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -41,6 +41,8 @@ dependencies { implementation "com.github.ben-manes.caffeine:caffeine" + implementation "org.openjdk.nashorn:nashorn-core:15.4" + // JAXB is not bundled with Java 11, dependencies added explicitly // These are needed by Apache BVAL implementation "jakarta.xml.bind:jakarta.xml.bind-api:${revJAXB}" diff --git a/core/dependencies.lock b/core/dependencies.lock index b5d7024d30..9fd620f904 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { @@ -51,25 +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" @@ -153,35 +156,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.openjdk.nashorn:nashorn-core": { + "locked": "15.4" } }, "testCompileClasspath": { @@ -234,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.13" + "locked": "2.5.22" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -257,6 +263,9 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "locked": "15.4" + }, "org.spockframework:spock-core": { "locked": "1.3-groovy-2.5" }, @@ -264,13 +273,13 @@ "locked": "1.3-groovy-2.5" }, "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" @@ -352,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.13" + "locked": "2.5.22" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -396,6 +370,9 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "locked": "15.4" + }, "org.spockframework:spock-core": { "locked": "1.3-groovy-2.5" }, @@ -403,13 +380,13 @@ "locked": "1.3-groovy-2.5" }, "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 d881500058..5084f07b7c 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,7 +21,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/netflix/conductor/core/events/ScriptEvaluator.java b/core/src/main/java/com/netflix/conductor/core/events/ScriptEvaluator.java index 506ded2211..dc46354b0f 100644 --- a/core/src/main/java/com/netflix/conductor/core/events/ScriptEvaluator.java +++ b/core/src/main/java/com/netflix/conductor/core/events/ScriptEvaluator.java @@ -19,7 +19,7 @@ public class ScriptEvaluator { - private static final ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn"); + private static ScriptEngine engine; private ScriptEvaluator() {} @@ -45,6 +45,13 @@ public static Boolean evalBool(String script, Object input) throws ScriptExcepti * @return Generic object, the result of the evaluated expression. */ public static Object eval(String script, Object input) throws ScriptException { + if (engine == null) { + engine = new ScriptEngineManager().getEngineByName("Nashorn"); + } + if (engine == null) { + throw new RuntimeException( + "missing nashorn engine. Ensure you are running supported JVM"); + } Bindings bindings = engine.createBindings(); bindings.put("$", input); return engine.eval(script, bindings); diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java index 3a5c801aa8..e9c326410b 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java @@ -458,14 +458,12 @@ private void endExecution(WorkflowModel workflow, TaskModel terminateTask) { String terminationStatus = (String) terminateTask - .getWorkflowTask() - .getInputParameters() + .getInputData() .get(Terminate.getTerminationStatusParameter()); String reason = (String) terminateTask - .getWorkflowTask() - .getInputParameters() + .getInputData() .get(Terminate.getTerminationReasonParameter()); if (StringUtils.isBlank(reason)) { reason = diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapper.java new file mode 100644 index 0000000000..a7f9045820 --- /dev/null +++ b/core/src/main/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapper.java @@ -0,0 +1,46 @@ +/* + * Copyright 2023 Netflix, Inc. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.core.execution.mapper; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import com.netflix.conductor.common.metadata.tasks.TaskType; +import com.netflix.conductor.model.TaskModel; + +import static com.netflix.conductor.common.metadata.tasks.TaskType.*; + +@Component +public class NoopTaskMapper implements TaskMapper { + + public static final Logger logger = LoggerFactory.getLogger(NoopTaskMapper.class); + + @Override + public String getTaskType() { + return TaskType.NOOP.name(); + } + + @Override + public List getMappedTasks(TaskMapperContext taskMapperContext) { + logger.debug("TaskMapperContext {} in NoopTaskMapper", taskMapperContext); + + TaskModel task = taskMapperContext.createTaskModel(); + task.setTaskType(TASK_TYPE_NOOP); + task.setStartTime(System.currentTimeMillis()); + task.setStatus(TaskModel.Status.IN_PROGRESS); + return List.of(task); + } +} diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java index 18843debd7..6a3ca95d12 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java @@ -12,9 +12,14 @@ */ package com.netflix.conductor.core.execution.mapper; +import java.text.ParseException; +import java.time.Duration; +import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Optional; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -27,6 +32,11 @@ import com.netflix.conductor.model.WorkflowModel; import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_WAIT; +import static com.netflix.conductor.core.execution.tasks.Wait.DURATION_INPUT; +import static com.netflix.conductor.core.execution.tasks.Wait.UNTIL_INPUT; +import static com.netflix.conductor.core.utils.DateTimeUtils.parseDate; +import static com.netflix.conductor.core.utils.DateTimeUtils.parseDuration; +import static com.netflix.conductor.model.TaskModel.Status.FAILED_WITH_TERMINAL_ERROR; /** * An implementation of {@link TaskMapper} to map a {@link WorkflowTask} of type {@link @@ -69,6 +79,52 @@ public List getMappedTasks(TaskMapperContext taskMapperContext) { waitTask.setInputData(waitTaskInput); waitTask.setStartTime(System.currentTimeMillis()); waitTask.setStatus(TaskModel.Status.IN_PROGRESS); + setCallbackAfter(waitTask); return List.of(waitTask); } + + void setCallbackAfter(TaskModel task) { + String duration = + Optional.ofNullable(task.getInputData().get(DURATION_INPUT)).orElse("").toString(); + String until = + Optional.ofNullable(task.getInputData().get(UNTIL_INPUT)).orElse("").toString(); + + if (StringUtils.isNotBlank(duration) && StringUtils.isNotBlank(until)) { + task.setReasonForIncompletion( + "Both 'duration' and 'until' specified. Please provide only one input"); + task.setStatus(FAILED_WITH_TERMINAL_ERROR); + return; + } + + if (StringUtils.isNotBlank(duration)) { + + Duration timeDuration = parseDuration(duration); + long waitTimeout = System.currentTimeMillis() + (timeDuration.getSeconds() * 1000); + task.setWaitTimeout(waitTimeout); + long seconds = timeDuration.getSeconds(); + task.setCallbackAfterSeconds(seconds); + + } else if (StringUtils.isNotBlank(until)) { + try { + + Date expiryDate = parseDate(until); + long timeInMS = expiryDate.getTime(); + long now = System.currentTimeMillis(); + long seconds = ((timeInMS - now) / 1000); + if (seconds < 0) { + seconds = 0; + } + task.setCallbackAfterSeconds(seconds); + task.setWaitTimeout(timeInMS); + + } catch (ParseException parseException) { + task.setReasonForIncompletion( + "Invalid/Unsupported Wait Until format. Provided: " + until); + task.setStatus(FAILED_WITH_TERMINAL_ERROR); + } + } else { + // If there is no time duration specified then the WAIT task should wait forever + task.setCallbackAfterSeconds(Integer.MAX_VALUE); + } + } } diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/Noop.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/Noop.java new file mode 100644 index 0000000000..4b9de40a20 --- /dev/null +++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/Noop.java @@ -0,0 +1,36 @@ +/* + * Copyright 2023 Netflix, Inc. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.core.execution.tasks; + +import org.springframework.stereotype.Component; + +import com.netflix.conductor.core.execution.WorkflowExecutor; +import com.netflix.conductor.model.TaskModel; +import com.netflix.conductor.model.WorkflowModel; + +import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_NOOP; + +@Component(TASK_TYPE_NOOP) +public class Noop extends WorkflowSystemTask { + + public Noop() { + super(TASK_TYPE_NOOP); + } + + @Override + public boolean execute( + WorkflowModel workflow, TaskModel task, WorkflowExecutor workflowExecutor) { + task.setStatus(TaskModel.Status.COMPLETED); + return true; + } +} 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 76edb8a68f..e26486edaf 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,7 +15,7 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.Validator; +import jakarta.validation.Validator; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/Wait.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/Wait.java index 47db207273..903355aa6f 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/tasks/Wait.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/Wait.java @@ -12,12 +12,6 @@ */ package com.netflix.conductor.core.execution.tasks; -import java.text.ParseException; -import java.time.Duration; -import java.util.Date; -import java.util.Optional; - -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import com.netflix.conductor.core.execution.WorkflowExecutor; @@ -25,8 +19,6 @@ import com.netflix.conductor.model.WorkflowModel; import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_WAIT; -import static com.netflix.conductor.core.utils.DateTimeUtils.parseDate; -import static com.netflix.conductor.core.utils.DateTimeUtils.parseDuration; import static com.netflix.conductor.model.TaskModel.Status.*; @Component(TASK_TYPE_WAIT) @@ -39,46 +31,6 @@ public Wait() { super(TASK_TYPE_WAIT); } - @Override - public void start(WorkflowModel workflow, TaskModel task, WorkflowExecutor workflowExecutor) { - - String duration = - Optional.ofNullable(task.getInputData().get(DURATION_INPUT)).orElse("").toString(); - String until = - Optional.ofNullable(task.getInputData().get(UNTIL_INPUT)).orElse("").toString(); - - if (StringUtils.isNotBlank(duration) && StringUtils.isNotBlank(until)) { - task.setReasonForIncompletion( - "Both 'duration' and 'until' specified. Please provide only one input"); - task.setStatus(FAILED_WITH_TERMINAL_ERROR); - return; - } - - if (StringUtils.isNotBlank(duration)) { - - Duration timeDuration = parseDuration(duration); - long waitTimeout = System.currentTimeMillis() + (timeDuration.getSeconds() * 1000); - task.setWaitTimeout(waitTimeout); - - long seconds = timeDuration.getSeconds(); - task.setCallbackAfterSeconds(seconds); - } else if (StringUtils.isNotBlank(until)) { - try { - Date expiryDate = parseDate(until); - long timeInMS = expiryDate.getTime(); - long now = System.currentTimeMillis(); - long seconds = (timeInMS - now) / 1000; - task.setWaitTimeout(timeInMS); - - } catch (ParseException parseException) { - task.setReasonForIncompletion( - "Invalid/Unsupported Wait Until format. Provided: " + until); - task.setStatus(FAILED_WITH_TERMINAL_ERROR); - } - } - task.setStatus(IN_PROGRESS); - } - @Override public void cancel(WorkflowModel workflow, TaskModel task, WorkflowExecutor workflowExecutor) { task.setStatus(TaskModel.Status.CANCELED); @@ -98,4 +50,8 @@ public boolean execute( return false; } + + public boolean isAsync() { + return true; + } } diff --git a/core/src/main/java/com/netflix/conductor/core/storage/DummyPayloadStorage.java b/core/src/main/java/com/netflix/conductor/core/storage/DummyPayloadStorage.java index 47c94c761f..a04a43710b 100644 --- a/core/src/main/java/com/netflix/conductor/core/storage/DummyPayloadStorage.java +++ b/core/src/main/java/com/netflix/conductor/core/storage/DummyPayloadStorage.java @@ -12,28 +12,90 @@ */ package com.netflix.conductor.core.storage; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; +import java.util.UUID; + +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.netflix.conductor.common.run.ExternalStorageLocation; import com.netflix.conductor.common.utils.ExternalPayloadStorage; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * A dummy implementation of {@link ExternalPayloadStorage} used when no external payload is * configured */ public class DummyPayloadStorage implements ExternalPayloadStorage { + private static final Logger LOGGER = LoggerFactory.getLogger(DummyPayloadStorage.class); + + private ObjectMapper objectMapper; + private File payloadDir; + + public DummyPayloadStorage() { + try { + this.objectMapper = new ObjectMapper(); + this.payloadDir = Files.createTempDirectory("payloads").toFile(); + LOGGER.info( + "{} initialized in directory: {}", + this.getClass().getSimpleName(), + payloadDir.getAbsolutePath()); + } catch (IOException ioException) { + LOGGER.error( + "Exception encountered while creating payloads directory : {}", + ioException.getMessage()); + } + } + @Override public ExternalStorageLocation getLocation( Operation operation, PayloadType payloadType, String path) { - return null; + ExternalStorageLocation location = new ExternalStorageLocation(); + location.setPath(path + UUID.randomUUID() + ".json"); + return location; } @Override - public void upload(String path, InputStream payload, long payloadSize) {} + public void upload(String path, InputStream payload, long payloadSize) { + File file = new File(payloadDir, path); + String filePath = file.getAbsolutePath(); + try { + if (!file.exists() && file.createNewFile()) { + LOGGER.debug("Created file: {}", filePath); + } + IOUtils.copy(payload, new FileOutputStream(file)); + LOGGER.debug("Written to {}", filePath); + } catch (IOException e) { + // just handle this exception here and return empty map so that test will fail in case + // this exception is thrown + LOGGER.error("Error writing to {}", filePath); + } finally { + try { + if (payload != null) { + payload.close(); + } + } catch (IOException e) { + LOGGER.warn("Unable to close input stream when writing to file"); + } + } + } @Override public InputStream download(String path) { - return null; + try { + LOGGER.debug("Reading from {}", path); + return new FileInputStream(new File(payloadDir, path)); + } catch (IOException e) { + LOGGER.error("Error reading {}", path, e); + return null; + } } } diff --git a/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java b/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java index e76344ff8a..1d8422bab1 100644 --- a/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java +++ b/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java @@ -19,6 +19,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; +import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -44,6 +46,9 @@ public class ParametersUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ParametersUtils.class); + private static final Pattern PATTERN = + Pattern.compile( + "(?=(?> map = new TypeReference<>() {}; @@ -221,56 +226,58 @@ private Object replaceList(List values, String taskId, DocumentContext io) { private Object replaceVariables( String paramString, DocumentContext documentContext, String taskId) { - String[] values = paramString.split("(?=(?(); + while (matcher.find()) { + var start = matcher.start(); + var end = matcher.end(); + var match = paramString.substring(start, end); + String paramPath = match.substring(2, match.length() - 1); + paramPath = replaceVariables(paramPath, documentContext, taskId, depth + 1).toString(); + // if the paramPath is blank, meaning no value in between ${ and } + // like ${}, ${ } etc, set the value to empty string + if (StringUtils.isBlank(paramPath)) { + replacements.add(new Replacement("", start, end)); + continue; } - } - - Object retObj = convertedValues[0]; - // If the parameter String was "v1 v2 v3" then make sure to stitch it back - if (convertedValues.length > 1) { - for (int i = 0; i < convertedValues.length; i++) { - Object val = convertedValues[i]; - if (val == null) { - val = ""; + if (EnvUtils.isEnvironmentVariable(paramPath)) { + String sysValue = EnvUtils.getSystemParametersValue(paramPath, taskId); + if (sysValue != null) { + replacements.add(new Replacement(sysValue, start, end)); } - if (i == 0) { - retObj = val; - } else { - retObj = retObj + "" + val.toString(); + } else { + try { + replacements.add(new Replacement(documentContext.read(paramPath), start, end)); + } catch (Exception e) { + LOGGER.warn( + "Error reading documentContext for paramPath: {}. Exception: {}", + paramPath, + e); + replacements.add(new Replacement(null, start, end)); } } } - return retObj; + if (replacements.size() == 1 + && replacements.getFirst().getStartIndex() == 0 + && replacements.getFirst().getEndIndex() == paramString.length() + && depth == 0) { + return replacements.get(0).getReplacement(); + } + Collections.sort(replacements); + var builder = new StringBuilder(paramString); + for (int i = replacements.size() - 1; i >= 0; i--) { + var replacement = replacements.get(i); + builder.replace( + replacement.getStartIndex(), + replacement.getEndIndex(), + Objects.toString(replacement.getReplacement())); + } + return builder.toString().replaceAll("\\$\\$\\{", "\\${"); } @Deprecated @@ -321,4 +328,33 @@ public Map getWorkflowInput( } return inputParams; } + + private static class Replacement implements Comparable { + private final int startIndex; + private final int endIndex; + private final Object replacement; + + public Replacement(Object replacement, int startIndex, int endIndex) { + this.replacement = replacement; + this.startIndex = startIndex; + this.endIndex = endIndex; + } + + public Object getReplacement() { + return replacement; + } + + public int getStartIndex() { + return startIndex; + } + + public int getEndIndex() { + return endIndex; + } + + @Override + public int compareTo(Replacement o) { + return Long.compare(startIndex, o.startIndex); + } + } } 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 84d68c2792..10b5219381 100644 --- a/core/src/main/java/com/netflix/conductor/service/AdminService.java +++ b/core/src/main/java/com/netflix/conductor/service/AdminService.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import org.springframework.validation.annotation.Validated; 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 c2f29e7341..e445f64053 100644 --- a/core/src/main/java/com/netflix/conductor/service/EventService.java +++ b/core/src/main/java/com/netflix/conductor/service/EventService.java @@ -14,9 +14,9 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; 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 701055ef84..e81e789f38 100644 --- a/core/src/main/java/com/netflix/conductor/service/MetadataService.java +++ b/core/src/main/java/com/netflix/conductor/service/MetadataService.java @@ -16,10 +16,10 @@ 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 jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.springframework.validation.annotation.Validated; 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 7f4f3d0a67..26470f8884 100644 --- a/core/src/main/java/com/netflix/conductor/service/TaskService.java +++ b/core/src/main/java/com/netflix/conductor/service/TaskService.java @@ -15,9 +15,9 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; 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 2c1ef0f7fe..86cea6c57a 100644 --- a/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java +++ b/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java @@ -14,8 +14,8 @@ import java.util.List; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; import org.springframework.validation.annotation.Validated; 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 bb760ac684..3d1378b06a 100644 --- a/core/src/main/java/com/netflix/conductor/service/WorkflowService.java +++ b/core/src/main/java/com/netflix/conductor/service/WorkflowService.java @@ -15,11 +15,11 @@ 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 jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; 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 888dd7a49e..c720d0af5d 100644 --- a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java +++ b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java @@ -20,10 +20,10 @@ 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 jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import org.apache.commons.lang3.StringUtils; 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 3e64d7f235..7e856b1719 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,8 +12,8 @@ */ package com.netflix.conductor.core.execution.tasks -import javax.validation.ConstraintViolation -import javax.validation.Validator +import jakarta.validation.ConstraintViolation +import jakarta.validation.Validator import com.netflix.conductor.common.config.ObjectMapperProvider import com.netflix.conductor.core.exception.NotFoundException diff --git a/core/src/test/java/com/netflix/conductor/TestUtils.java b/core/src/test/java/com/netflix/conductor/TestUtils.java index 41f1377e4f..08428322c1 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/execution/TestWorkflowExecutor.java b/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java index 133db22ac7..bc3da8c609 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java @@ -316,8 +316,9 @@ public void testScheduleTask() { doAnswer(answer).when(queueDAO).push(any(), any(), anyInt(), anyLong()); boolean stateChanged = workflowExecutor.scheduleTask(workflow, tasks); - assertEquals(2, startedTaskCount.get()); - assertEquals(1, queuedTaskCount.get()); + // Wait task is no async to it will be queued. + assertEquals(1, startedTaskCount.get()); + assertEquals(2, queuedTaskCount.get()); assertTrue(stateChanged); assertFalse(httpTask.isStarted()); assertTrue(http2Task.isStarted()); diff --git a/core/src/test/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapperTest.java b/core/src/test/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapperTest.java new file mode 100644 index 0000000000..6c89af44f9 --- /dev/null +++ b/core/src/test/java/com/netflix/conductor/core/execution/mapper/NoopTaskMapperTest.java @@ -0,0 +1,57 @@ +/* + * Copyright 2023 Netflix, Inc. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.core.execution.mapper; + +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; + +import com.netflix.conductor.common.metadata.tasks.TaskDef; +import com.netflix.conductor.common.metadata.tasks.TaskType; +import com.netflix.conductor.common.metadata.workflow.WorkflowDef; +import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import com.netflix.conductor.core.utils.IDGenerator; +import com.netflix.conductor.model.TaskModel; +import com.netflix.conductor.model.WorkflowModel; + +public class NoopTaskMapperTest { + + @Test + public void getMappedTasks() { + + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setType(TaskType.TASK_TYPE_NOOP); + + String taskId = new IDGenerator().generate(); + + WorkflowDef workflowDef = new WorkflowDef(); + WorkflowModel workflow = new WorkflowModel(); + workflow.setWorkflowDefinition(workflowDef); + + TaskMapperContext taskMapperContext = + TaskMapperContext.newBuilder() + .withWorkflowModel(workflow) + .withTaskDefinition(new TaskDef()) + .withWorkflowTask(workflowTask) + .withRetryCount(0) + .withTaskId(taskId) + .build(); + + List mappedTasks = new NoopTaskMapper().getMappedTasks(taskMapperContext); + + Assert.assertNotNull(mappedTasks); + Assert.assertEquals(1, mappedTasks.size()); + Assert.assertEquals(TaskType.TASK_TYPE_NOOP, mappedTasks.get(0).getTaskType()); + } +} diff --git a/core/src/test/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapperTest.java b/core/src/test/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapperTest.java index 3b9071cef8..a1f2662dba 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapperTest.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapperTest.java @@ -12,8 +12,11 @@ */ package com.netflix.conductor.core.execution.mapper; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.junit.Test; @@ -21,6 +24,7 @@ import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import com.netflix.conductor.core.execution.tasks.Wait; import com.netflix.conductor.core.utils.IDGenerator; import com.netflix.conductor.core.utils.ParametersUtils; import com.netflix.conductor.model.TaskModel; @@ -29,6 +33,9 @@ import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_WAIT; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; public class WaitTaskMapperTest { @@ -65,4 +72,145 @@ public void getMappedTasks() { assertEquals(1, mappedTasks.size()); assertEquals(TASK_TYPE_WAIT, mappedTasks.get(0).getTaskType()); } + + @Test + public void testWaitForever() { + + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setName("Wait_task"); + workflowTask.setType(TaskType.WAIT.name()); + String taskId = new IDGenerator().generate(); + + ParametersUtils parametersUtils = mock(ParametersUtils.class); + WorkflowModel workflow = new WorkflowModel(); + WorkflowDef workflowDef = new WorkflowDef(); + workflow.setWorkflowDefinition(workflowDef); + + TaskMapperContext taskMapperContext = + TaskMapperContext.newBuilder() + .withWorkflowModel(workflow) + .withTaskDefinition(new TaskDef()) + .withWorkflowTask(workflowTask) + .withTaskInput(new HashMap<>()) + .withRetryCount(0) + .withTaskId(taskId) + .build(); + + WaitTaskMapper waitTaskMapper = new WaitTaskMapper(parametersUtils); + // When + List mappedTasks = waitTaskMapper.getMappedTasks(taskMapperContext); + assertEquals(1, mappedTasks.size()); + assertEquals(mappedTasks.get(0).getStatus(), TaskModel.Status.IN_PROGRESS); + assertTrue(mappedTasks.get(0).getOutputData().isEmpty()); + } + + @Test + public void testWaitUntil() { + + String dateFormat = "yyyy-MM-dd HH:mm"; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat); + LocalDateTime now = LocalDateTime.now(); + String formatted = formatter.format(now); + System.out.println(formatted); + + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setName("Wait_task"); + workflowTask.setType(TaskType.WAIT.name()); + String taskId = new IDGenerator().generate(); + Map input = Map.of(Wait.UNTIL_INPUT, formatted); + workflowTask.setInputParameters(input); + + ParametersUtils parametersUtils = mock(ParametersUtils.class); + doReturn(input).when(parametersUtils).getTaskInputV2(any(), any(), any(), any()); + + WorkflowModel workflow = new WorkflowModel(); + WorkflowDef workflowDef = new WorkflowDef(); + workflow.setWorkflowDefinition(workflowDef); + + TaskMapperContext taskMapperContext = + TaskMapperContext.newBuilder() + .withWorkflowModel(workflow) + .withTaskDefinition(new TaskDef()) + .withWorkflowTask(workflowTask) + .withTaskInput(Map.of(Wait.UNTIL_INPUT, formatted)) + .withRetryCount(0) + .withTaskId(taskId) + .build(); + + WaitTaskMapper waitTaskMapper = new WaitTaskMapper(parametersUtils); + // When + List mappedTasks = waitTaskMapper.getMappedTasks(taskMapperContext); + assertEquals(1, mappedTasks.size()); + assertEquals(mappedTasks.get(0).getStatus(), TaskModel.Status.IN_PROGRESS); + assertEquals(mappedTasks.get(0).getCallbackAfterSeconds(), 0L); + } + + @Test + public void testWaitDuration() { + + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setName("Wait_task"); + workflowTask.setType(TaskType.WAIT.name()); + String taskId = new IDGenerator().generate(); + Map input = Map.of(Wait.DURATION_INPUT, "1s"); + workflowTask.setInputParameters(input); + + ParametersUtils parametersUtils = mock(ParametersUtils.class); + doReturn(input).when(parametersUtils).getTaskInputV2(any(), any(), any(), any()); + WorkflowModel workflow = new WorkflowModel(); + WorkflowDef workflowDef = new WorkflowDef(); + workflow.setWorkflowDefinition(workflowDef); + + TaskMapperContext taskMapperContext = + TaskMapperContext.newBuilder() + .withWorkflowModel(workflow) + .withTaskDefinition(new TaskDef()) + .withWorkflowTask(workflowTask) + .withTaskInput(Map.of(Wait.DURATION_INPUT, "1s")) + .withRetryCount(0) + .withTaskId(taskId) + .build(); + + WaitTaskMapper waitTaskMapper = new WaitTaskMapper(parametersUtils); + // When + List mappedTasks = waitTaskMapper.getMappedTasks(taskMapperContext); + assertEquals(1, mappedTasks.size()); + assertEquals(mappedTasks.get(0).getStatus(), TaskModel.Status.IN_PROGRESS); + assertTrue(mappedTasks.get(0).getCallbackAfterSeconds() <= 1L); + } + + @Test + public void testInvalidWaitConfig() { + + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setName("Wait_task"); + workflowTask.setType(TaskType.WAIT.name()); + String taskId = new IDGenerator().generate(); + Map input = + Map.of(Wait.DURATION_INPUT, "1s", Wait.UNTIL_INPUT, "2022-12-12"); + workflowTask.setInputParameters(input); + + ParametersUtils parametersUtils = mock(ParametersUtils.class); + doReturn(input).when(parametersUtils).getTaskInputV2(any(), any(), any(), any()); + WorkflowModel workflow = new WorkflowModel(); + WorkflowDef workflowDef = new WorkflowDef(); + workflow.setWorkflowDefinition(workflowDef); + + TaskMapperContext taskMapperContext = + TaskMapperContext.newBuilder() + .withWorkflowModel(workflow) + .withTaskDefinition(new TaskDef()) + .withWorkflowTask(workflowTask) + .withTaskInput( + Map.of(Wait.DURATION_INPUT, "1s", Wait.UNTIL_INPUT, "2022-12-12")) + .withRetryCount(0) + .withTaskId(taskId) + .build(); + + WaitTaskMapper waitTaskMapper = new WaitTaskMapper(parametersUtils); + // When + List mappedTasks = waitTaskMapper.getMappedTasks(taskMapperContext); + assertEquals(1, mappedTasks.size()); + assertEquals(mappedTasks.get(0).getStatus(), TaskModel.Status.FAILED_WITH_TERMINAL_ERROR); + } } diff --git a/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestNoop.java b/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestNoop.java new file mode 100644 index 0000000000..1767f84ec9 --- /dev/null +++ b/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestNoop.java @@ -0,0 +1,36 @@ +/* + * Copyright 2023 Netflix, Inc. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.core.execution.tasks; + +import org.junit.Test; + +import com.netflix.conductor.core.execution.WorkflowExecutor; +import com.netflix.conductor.model.TaskModel; +import com.netflix.conductor.model.WorkflowModel; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +public class TestNoop { + + private final WorkflowExecutor executor = mock(WorkflowExecutor.class); + + @Test + public void should_do_nothing() { + WorkflowModel workflow = new WorkflowModel(); + Noop noopTask = new Noop(); + TaskModel task = new TaskModel(); + noopTask.execute(workflow, task, executor); + assertEquals(TaskModel.Status.COMPLETED, task.getStatus()); + } +} diff --git a/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestWait.java b/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestWait.java deleted file mode 100644 index e419d07951..0000000000 --- a/core/src/test/java/com/netflix/conductor/core/execution/tasks/TestWait.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright 2022 Netflix, Inc. - *

- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ -package com.netflix.conductor.core.execution.tasks; - -import java.text.ParseException; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - -import org.apache.commons.lang3.time.DateUtils; -import org.junit.Test; - -import com.netflix.conductor.model.TaskModel; -import com.netflix.conductor.model.WorkflowModel; - -import static org.junit.Assert.*; - -public class TestWait { - - private final Wait wait = new Wait(); - - @Test - public void testWaitForever() { - - TaskModel task = new TaskModel(); - task.setStatus(TaskModel.Status.SCHEDULED); - WorkflowModel model = new WorkflowModel(); - - wait.start(model, task, null); - assertEquals(TaskModel.Status.IN_PROGRESS, task.getStatus()); - assertTrue(task.getOutputData().isEmpty()); - } - - @Test - public void testWaitUntil() throws ParseException { - String dateFormat = "yyyy-MM-dd HH:mm"; - - WorkflowModel model = new WorkflowModel(); - - TaskModel task = new TaskModel(); - task.setStatus(TaskModel.Status.SCHEDULED); - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat); - LocalDateTime now = LocalDateTime.now(); - String formatted = formatter.format(now); - System.out.println(formatted); - - task.getInputData().put(Wait.UNTIL_INPUT, formatted); - Date parsed = DateUtils.parseDate(formatted, dateFormat); - - wait.start(model, task, null); - assertEquals(TaskModel.Status.IN_PROGRESS, task.getStatus()); - assertEquals(parsed.getTime(), task.getWaitTimeout()); - - // Execute runs when checking if the task has completed - boolean updated = wait.execute(model, task, null); - assertTrue(updated); - assertEquals(TaskModel.Status.COMPLETED, task.getStatus()); - } - - @Test - public void testWaitDuration() throws ParseException { - WorkflowModel model = new WorkflowModel(); - - TaskModel task = new TaskModel(); - task.setStatus(TaskModel.Status.SCHEDULED); - - task.getInputData().put(Wait.DURATION_INPUT, "1s"); - wait.start(model, task, null); - long now = System.currentTimeMillis(); - - assertEquals(TaskModel.Status.IN_PROGRESS, task.getStatus()); - assertEquals(now + 1000, task.getWaitTimeout()); - - try { - Thread.sleep(2_000); - } catch (InterruptedException e) { - } - - // Execute runs when checking if the task has completed - boolean updated = wait.execute(model, task, null); - assertTrue(updated); - assertEquals(TaskModel.Status.COMPLETED, task.getStatus()); - } - - @Test - public void testInvalidWaitConfig() throws ParseException { - WorkflowModel model = new WorkflowModel(); - - TaskModel task = new TaskModel(); - task.setStatus(TaskModel.Status.SCHEDULED); - - task.getInputData().put(Wait.DURATION_INPUT, "1s"); - task.getInputData().put(Wait.UNTIL_INPUT, "2022-12-12"); - wait.start(model, task, null); - assertEquals(TaskModel.Status.FAILED_WITH_TERMINAL_ERROR, task.getStatus()); - assertTrue(!task.getReasonForIncompletion().isEmpty()); - } -} 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 55cd1c7d82..3940e63d4e 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,7 +16,7 @@ import java.util.Optional; import java.util.Set; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.After; import org.junit.Assert; diff --git a/core/src/test/java/com/netflix/conductor/core/storage/DummyPayloadStorageTest.java b/core/src/test/java/com/netflix/conductor/core/storage/DummyPayloadStorageTest.java new file mode 100644 index 0000000000..e5fd2c04d2 --- /dev/null +++ b/core/src/test/java/com/netflix/conductor/core/storage/DummyPayloadStorageTest.java @@ -0,0 +1,92 @@ +/* + * Copyright 2023 Netflix, Inc. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.core.storage; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +import org.apache.commons.io.IOUtils; +import org.junit.Before; +import org.junit.Test; + +import com.netflix.conductor.common.run.ExternalStorageLocation; +import com.netflix.conductor.common.utils.ExternalPayloadStorage; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import static com.netflix.conductor.common.utils.ExternalPayloadStorage.PayloadType; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +public class DummyPayloadStorageTest { + + private DummyPayloadStorage dummyPayloadStorage; + + private static final String TEST_STORAGE_PATH = "test-storage"; + + private ExternalStorageLocation location; + + private ObjectMapper objectMapper; + + public static final String MOCK_PAYLOAD = "{\n" + "\"output\": \"TEST_OUTPUT\",\n" + "}\n"; + + @Before + public void setup() { + dummyPayloadStorage = new DummyPayloadStorage(); + objectMapper = new ObjectMapper(); + location = + dummyPayloadStorage.getLocation( + ExternalPayloadStorage.Operation.WRITE, + PayloadType.TASK_OUTPUT, + TEST_STORAGE_PATH); + try { + byte[] payloadBytes = MOCK_PAYLOAD.getBytes("UTF-8"); + dummyPayloadStorage.upload( + location.getPath(), + new ByteArrayInputStream(payloadBytes), + payloadBytes.length); + } catch (UnsupportedEncodingException unsupportedEncodingException) { + } + } + + @Test + public void testGetLocationNotNull() { + assertNotNull(location); + } + + @Test + public void testDownloadForValidPath() { + try (InputStream inputStream = dummyPayloadStorage.download(location.getPath())) { + Map payload = + objectMapper.readValue( + IOUtils.toString(inputStream, StandardCharsets.UTF_8), Map.class); + assertTrue(payload.containsKey("output")); + assertEquals(payload.get("output"), "TEST_OUTPUT"); + } catch (Exception e) { + assertTrue(e instanceof IOException); + } + } + + @Test + public void testDownloadForInvalidPath() { + InputStream inputStream = dummyPayloadStorage.download("testPath"); + assertNull(inputStream); + } +} diff --git a/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java b/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java index 9e5234001f..eb2f239219 100644 --- a/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java +++ b/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java @@ -233,6 +233,30 @@ public void testReplaceInputWithMapAndList() throws Exception { assertEquals("${version}", inputList.get(1)); } + @Test + public void testNestedPathExpressions() throws Exception { + Map map = new HashMap<>(); + map.put("name", "conductor"); + map.put("index", 1); + map.put("mapValue", "a"); + map.put("recordIds", List.of(1, 2, 3)); + map.put("map", Map.of("a", List.of(1, 2, 3), "b", List.of(2, 4, 5), "c", List.of(3, 7, 8))); + + Map input = new HashMap<>(); + input.put("k1", "${recordIds[${index}]}"); + input.put("k2", "${map.${mapValue}[${index}]}"); + input.put("k3", "${map.b[${map.${mapValue}[${index}]}]}"); + + Object jsonObj = objectMapper.readValue(objectMapper.writeValueAsString(map), Object.class); + + Map replaced = parametersUtils.replace(input, jsonObj); + assertNotNull(replaced); + + assertEquals(2, replaced.get("k1")); + assertEquals(2, replaced.get("k2")); + assertEquals(5, replaced.get("k3")); + } + @Test public void testReplaceWithEscapedTags() throws Exception { Map map = new HashMap<>(); 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 620bb4e302..0e0278a1bd 100644 --- a/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java @@ -14,7 +14,7 @@ import java.util.Set; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; import org.junit.runner.RunWith; 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 8ea351ac78..94b68da7a1 100644 --- a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; import org.junit.runner.RunWith; 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 2c54d3a31a..329b403f2e 100644 --- a/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; import org.junit.runner.RunWith; 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 20dcbfd4f6..742a086378 100644 --- a/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; import org.junit.runner.RunWith; 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 dd61089835..a2f6e56df1 100644 --- a/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; import org.junit.runner.RunWith; 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 6e6f5d3b28..34a57f3ce5 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java @@ -18,10 +18,10 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.apache.bval.jsr.ApacheValidationProvider; import org.junit.AfterClass; 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 a1105ed72b..30182e2fa7 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,12 @@ 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 jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ExecutableValidator; -import org.apache.bval.jsr.ApacheValidationProvider; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -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 5f44fb740c..989477bbb4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,7 +15,7 @@ * Common place to define all the version dependencies */ ext { - revActivation = '2.0.0' + revActivation = '3.0.2' revAwaitility = '3.1.6' revAwsSdk = '1.11.86' revBval = '2.0.5' @@ -26,12 +26,12 @@ ext { revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '2.5.13' + revGroovy = '4.0.9' revGrpc = '1.+' revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' - revJAXB = '2.3.3' + revJAXB = '4.0.1' revJAXRS = '2.1.1' revJedis = '3.3.0' revJersey = '1.19.4' diff --git a/dependencies.lock b/dependencies.lock index b2d91aea12..752d96aac5 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/docker/README.md b/docker/README.md index 538ebae353..b45b2d9bc6 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1 +1,51 @@ -[Docker Instructions](/docs/docs/gettingstarted/docker.md) \ No newline at end of file + +# Conductor Docker Builds + +## Pre-built docker images + +Conductor server with support for the following backend: +1. Redis +2. Postgres +3. Mysql +4. Cassandra + +### Docker File for Server and UI + +[Docker Image Source for Server with UI](docker/server/DockerFile) + +### Configuration Guide for Conductor Server +Conductor uses a persistent store for managing state. +The choice of backend is quite flexible and can be configured at runtime using `conductor.db.type` property. + +Refer to the table below for various supported backend and required configurations to enable each of them. + +> [!IMPORTANT] +> +> See [config.properties](docker/server/config/config.properties) for the required properties for each of the backends. +> +> | Backend | Property | +> |------------|------------------------------------| +> | postgres | conductor.db.type=postgres | +> | redis | conductor.db.type=redis_standalone | +> | mysql | conductor.db.type=mysql | +> | cassandra | conductor.db.type=cassandra | +> + +Conductor using Elasticsearch for indexing the workflow data. +Currently, Elasticsearch 6 and 7 are supported. + +We welcome community contributions for other indexing backends. + +**Note:** Docker images use Elasticsearch 7. + +## Helm Charts +TODO: Link to the helm charts + +## Run Docker Compose Locally +### Use the docker-compose to bring up the local conductor server. + +| Docker Compose | Description | +|--------------------------------------------------------------|----------------------------| +| [docker-compose.yaml](docker-compose.yaml) | Redis + Elasticsearch 7 | +| [docker-compose-postgres.yaml](docker-compose-postgres.yaml) | Postgres + Elasticsearch 7 | +| [docker-compose-postgres.yaml](docker-compose-mysql.yaml) | Mysql + Elasticsearch 7 | diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 19a0287cf3..ff8a0b2762 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk +FROM openjdk:17-jdk WORKDIR /workspace/conductor COPY . /workspace/conductor diff --git a/docker/docker-compose-dynomite.yaml b/docker/docker-compose-dynomite.yaml deleted file mode 100644 index 99e15af930..0000000000 --- a/docker/docker-compose-dynomite.yaml +++ /dev/null @@ -1,31 +0,0 @@ -version: '2.3' - -services: - conductor-server: - environment: - - CONFIG_PROP=config.properties - links: - - dynomite:dyno1 - depends_on: - dynomite: - condition: service_healthy - - dynomite: - image: v1r3n/dynomite - networks: - - internal - ports: - - 8102:8102 - healthcheck: - test: timeout 5 bash -c 'cat < /dev/null > /dev/tcp/localhost/8102' - interval: 5s - timeout: 5s - retries: 12 - logging: - driver: "json-file" - options: - max-size: "1k" - max-file: "3" - -networks: - internal: diff --git a/docker/grpc/docker-compose.yaml b/docker/docker-compose-mysql.yaml similarity index 60% rename from docker/grpc/docker-compose.yaml rename to docker/docker-compose-mysql.yaml index 40a75625b7..5c587e3218 100644 --- a/docker/grpc/docker-compose.yaml +++ b/docker/docker-compose-mysql.yaml @@ -4,43 +4,41 @@ services: conductor-server: environment: - - CONFIG_PROP=config-mysql-grpc.properties + - CONFIG_PROP=config-mysql.properties image: conductor:server + container_name: conductor-server build: - context: ../../ + context: ../ dockerfile: docker/server/Dockerfile networks: - internal ports: - 8080:8080 - - 8090:8090 + - 5000:5000 + healthcheck: + test: [ "CMD", "curl","-I" ,"-XGET", "http://localhost:8080/health" ] + interval: 60s + timeout: 30s + retries: 12 links: - - elasticsearch:es - - redis:rs + - conductor-elasticsearch:es + - conductor-mysql:mysql + - conductor-redis:rs depends_on: - elasticsearch: + conductor-elasticsearch: condition: service_healthy - mysql: + conductor-mysql: condition: service_healthy - redis: + conductor-redis: condition: service_healthy + logging: + driver: "json-file" + options: + max-size: "1k" + max-file: "3" - conductor-ui: - environment: - - WF_SERVER=http://conductor-server:8080 - image: conductor:ui - build: - context: ../../ - dockerfile: docker/ui/Dockerfile - networks: - - internal - ports: - - 5000:5000 - depends_on: - - conductor-server - - mysql: - image: mysql:5.7 + conductor-mysql: + image: mysql:latest environment: MYSQL_ROOT_PASSWORD: 12345 MYSQL_DATABASE: conductor @@ -60,31 +58,31 @@ services: timeout: 5s retries: 12 - redis: + conductor-redis: image: redis:6.2.3-alpine volumes: - ./redis.conf:/usr/local/etc/redis/redis.conf networks: - internal ports: - - 6379:6379 + - 7379:6379 healthcheck: test: [ "CMD", "redis-cli","ping" ] - elasticsearch: - image: elasticsearch:6.8.15 + conductor-elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.11 environment: - "ES_JAVA_OPTS=-Xms512m -Xmx1024m" - - transport.host=0.0.0.0 - - discovery.type=single-node - xpack.security.enabled=false + - discovery.type=single-node + volumes: + - esdata-conductor:/usr/share/elasticsearch/data networks: - internal ports: - - 9200:9200 - - 9300:9300 + - 9201:9200 healthcheck: - test: timeout 5 bash -c 'cat < /dev/null > /dev/tcp/localhost/9300' + test: curl http://localhost:9200/_cluster/health -o /dev/null interval: 5s timeout: 5s retries: 12 @@ -96,6 +94,9 @@ services: volumes: conductor_mysql: + driver: local + esdata-conductor: + driver: local networks: internal: diff --git a/docker/docker-compose-postgres.yaml b/docker/docker-compose-postgres.yaml index 568eed95c7..12a6b70465 100644 --- a/docker/docker-compose-postgres.yaml +++ b/docker/docker-compose-postgres.yaml @@ -13,21 +13,19 @@ services: - internal ports: - 8080:8080 + - 5000:5000 healthcheck: test: [ "CMD", "curl","-I" ,"-XGET", "http://localhost:8080/health" ] interval: 60s timeout: 30s retries: 12 links: - - elasticsearch:es - - redis:rs - - postgres:postgresdb + - conductor-elasticsearch:es + - conductor-postgres:postgresdb depends_on: - elasticsearch: + conductor-elasticsearch: condition: service_healthy - redis: - condition: service_healthy - postgres: + conductor-postgres: condition: service_healthy logging: driver: "json-file" @@ -35,7 +33,7 @@ services: max-size: "1k" max-file: "3" - postgres: + conductor-postgres: image: postgres environment: - POSTGRES_USER=conductor @@ -45,7 +43,7 @@ services: networks: - internal ports: - - 5432:5432 + - 6432:5432 healthcheck: test: timeout 5 bash -c 'cat < /dev/null > /dev/tcp/localhost/5432' interval: 5s @@ -57,32 +55,20 @@ services: max-size: "1k" max-file: "3" - redis: - image: redis:6.2.3-alpine - volumes: - - ./redis.conf:/usr/local/etc/redis/redis.conf - networks: - - internal - ports: - - 6379:6379 - healthcheck: - test: [ "CMD", "redis-cli","ping" ] - - elasticsearch: - image: elasticsearch:6.8.15 - container_name: elasticsearch + conductor-elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.11 environment: - "ES_JAVA_OPTS=-Xms512m -Xmx1024m" - - transport.host=0.0.0.0 - - discovery.type=single-node - xpack.security.enabled=false + - discovery.type=single-node + volumes: + - esdata-conductor:/usr/share/elasticsearch/data networks: - internal ports: - - 9200:9200 - - 9300:9300 + - 9201:9200 healthcheck: - test: wget http://localhost:9200/ -O /dev/null + test: curl http://localhost:9200/_cluster/health -o /dev/null interval: 5s timeout: 5s retries: 12 @@ -95,6 +81,8 @@ services: volumes: pgdata-conductor: driver: local + esdata-conductor: + driver: local networks: internal: diff --git a/docker/docker-compose-prometheus.yaml b/docker/docker-compose-prometheus.yaml deleted file mode 100644 index 10f8d80e40..0000000000 --- a/docker/docker-compose-prometheus.yaml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3' - -services: - - prometheus: - image: prom/prometheus - volumes: - - ./prometheus/:/etc/prometheus/ - command: - - '--config.file=/etc/prometheus/prometheus.yml' - ports: - - 9090:9090 - external_links: - - conductor-server:conductor-server - networks: - - internal - restart: always - -networks: - internal: \ No newline at end of file diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 91cb3d4610..7c32c1437c 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -3,7 +3,7 @@ version: '2.3' services: conductor-server: environment: - - CONFIG_PROP=config-local.properties + - CONFIG_PROP=config-redis.properties image: conductor:server container_name: conductor-server build: @@ -13,18 +13,19 @@ services: - internal ports: - 8080:8080 + - 5000:5000 healthcheck: test: ["CMD", "curl","-I" ,"-XGET", "http://localhost:8080/health"] interval: 60s timeout: 30s retries: 12 links: - - elasticsearch:es - - redis:rs + - conductor-elasticsearch:es + - conductor-redis:rs depends_on: - elasticsearch: + conductor-elasticsearch: condition: service_healthy - redis: + conductor-redis: condition: service_healthy logging: driver: "json-file" @@ -32,50 +33,31 @@ services: max-size: "1k" max-file: "3" - conductor-ui: - environment: - - WF_SERVER=http://conductor-server:8080 - image: conductor:ui - container_name: conductor-ui - build: - context: ../ - dockerfile: docker/ui/Dockerfile - networks: - - internal - ports: - - 5000:5000 - links: - - conductor-server - stdin_open: true - - redis: + conductor-redis: image: redis:6.2.3-alpine volumes: - - ./redis.conf:/usr/local/etc/redis/redis.conf + - ../server/config/redis.conf:/usr/local/etc/redis/redis.conf networks: - internal ports: - - 6379:6379 + - 7379:6379 healthcheck: test: [ "CMD", "redis-cli","ping" ] - elasticsearch: - image: elasticsearch:6.8.15 - container_name: elasticsearch + conductor-elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.11 environment: - "ES_JAVA_OPTS=-Xms512m -Xmx1024m" - - transport.host=0.0.0.0 - - discovery.type=single-node - xpack.security.enabled=false + - discovery.type=single-node volumes: - esdata-conductor:/usr/share/elasticsearch/data networks: - internal ports: - - 9200:9200 - - 9300:9300 + - 9201:9200 healthcheck: - test: wget http://localhost:9200/ -O /dev/null + test: curl http://localhost:9200/_cluster/health -o /dev/null interval: 5s timeout: 5s retries: 12 diff --git a/docker/grpc/Makefile b/docker/grpc/Makefile deleted file mode 100644 index e111f0c63c..0000000000 --- a/docker/grpc/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - -clean-db: - docker volume rm grpc_conductor_mysql - -compose-build: - docker-compose build - -dependencies-up: - docker-compose up -d mysql elasticsearch - -dependencies-down: - docker-compose down - -stack-up: - docker-compose up - -stack-down: - docker-compose down diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 80017603ac..ab6b099b50 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,35 +1,71 @@ # -# conductor:server - Netflix conductor server +# conductor:server - Combined Netflix conductor server & UI # - # =========================================================================================================== # 0. Builder stage # =========================================================================================================== -FROM eclipse-temurin:11-jdk-jammy AS builder +FROM alpine:3.18 AS builder LABEL maintainer="Netflix OSS " -# Copy the project directly onto the image +# =========================================================================================================== +# 0. Build Conductor Server +# =========================================================================================================== + + +# Install dependencies +RUN apk add openjdk17 +RUN apk add git +RUN apk add --update nodejs npm yarn + COPY . /conductor -WORKDIR /conductor +WORKDIR /conductor/ui +RUN yarn install && yarn build +RUN ls -ltr +RUN echo "Done building UI" + +# Checkout the community project +WORKDIR / +RUN mkdir server-build +WORKDIR server-build +RUN ls -ltr + +RUN git clone https://github.com/Netflix/conductor-community.git + +# Copy the project directly onto the image +WORKDIR conductor-community +RUN ls -ltr # Build the server on run RUN ./gradlew build -x test --stacktrace +WORKDIR /server-build +RUN ls -ltr +RUN pwd + # =========================================================================================================== # 1. Bin stage # =========================================================================================================== -FROM eclipse-temurin:11-jre-jammy +FROM alpine:3.18 LABEL maintainer="Netflix OSS " +RUN apk add openjdk17 +RUN apk add nginx + # Make app folders RUN mkdir -p /app/config /app/logs /app/libs # Copy the compiled output to new image -COPY --from=builder /conductor/docker/server/bin /app -COPY --from=builder /conductor/docker/server/config /app/config -COPY --from=builder /conductor/server/build/libs/conductor-server-*-boot.jar /app/libs +COPY docker/server/bin /app +COPY docker/server/config /app/config +COPY --from=builder /server-build/conductor-community/community-server/build/libs/*boot*.jar /app/libs/conductor-server.jar + +# Copy compiled UI assets to nginx www directory +WORKDIR /usr/share/nginx/html +RUN rm -rf ./* +COPY --from=builder /conductor/ui/build . +COPY --from=builder /conductor/docker/server/nginx/nginx.conf /etc/nginx/http.d/default.conf # Copy the files for the server into the app folders RUN chmod +x /app/startup.sh diff --git a/docker/server/README.md b/docker/server/README.md deleted file mode 100644 index 8baafbfc05..0000000000 --- a/docker/server/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Docker -## Conductor server -This Dockerfile create the conductor:server image - -## Building the image - -Run the following commands from the project root. - -`docker build -f docker/server/Dockerfile -t conductor:server .` - -## Running the conductor server - - Standalone server (interal DB): `docker run -p 8080:8080 -d -t conductor:server` - - Server (external DB required): `docker run -p 8080:8080 -d -t -e "CONFIG_PROP=config.properties" conductor:server` diff --git a/docker/server/bin/startup.sh b/docker/server/bin/startup.sh index 9d1b98cba8..e5bd7f501d 100755 --- a/docker/server/bin/startup.sh +++ b/docker/server/bin/startup.sh @@ -16,6 +16,10 @@ echo "Starting Conductor server" +echo "Running Nginx in background" +# Start nginx as daemon +nginx + # Start the server cd /app/libs echo "Property file: $CONFIG_PROP" @@ -24,8 +28,8 @@ export config_file= if [ -z "$CONFIG_PROP" ]; then - echo "Using an in-memory instance of conductor"; - export config_file=/app/config/config-local.properties + echo "Using default configuration file"; + export config_file=/app/config/config.properties else echo "Using '$CONFIG_PROP'"; export config_file=/app/config/$CONFIG_PROP @@ -33,4 +37,4 @@ fi echo "Using java options config: $JAVA_OPTS" -java ${JAVA_OPTS} -jar -DCONDUCTOR_CONFIG_FILE=$config_file conductor-server-*-boot.jar 2>&1 | tee -a /app/logs/server.log +java ${JAVA_OPTS} -jar -DCONDUCTOR_CONFIG_FILE=$config_file conductor-server.jar 2>&1 | tee -a /app/logs/server.log diff --git a/docker/server/config/config-local.properties b/docker/server/config/config-local.properties deleted file mode 100755 index fa2cd25957..0000000000 --- a/docker/server/config/config-local.properties +++ /dev/null @@ -1,36 +0,0 @@ -# Servers. -conductor.grpc-server.enabled=false - -# Database persistence model. -conductor.db.type=redis_standalone -conductor.queue.type=redis_standalone -# Dynomite Cluster details. -# format is host:port:rack separated by semicolon -conductor.redis.hosts=rs:6379:us-east-1c - -# Namespace for the keys stored in Dynomite/Redis -conductor.redis.workflowNamespacePrefix=conductor - -# Namespace prefix for the dyno queues -conductor.redis.queueNamespacePrefix=conductor_queues - -# No. of threads allocated to dyno-queues (optional) -queues.dynomite.threads=10 - -# By default with dynomite, we want the repairservice enabled -conductor.app.workflowRepairServiceEnabled=true - -# Non-quorum port used to connect to local redis. Used by dyno-queues. -# When using redis directly, set this to the same port as redis server -# For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite. -conductor.redis.queuesNonQuorumPort=22122 - -# Elastic search instance indexing is disabled. -conductor.indexing.enabled=true -conductor.elasticsearch.url=http://es:9200 -conductor.elasticsearch.indexReplicasCount=0 - -# Load sample kitchen sink workflow -loadSample=true - -conductor.elasticsearch.clusterHealthColor=yellow diff --git a/docker/server/config/config-mysql-grpc.properties b/docker/server/config/config-mysql-grpc.properties deleted file mode 100755 index 6ed6563dc3..0000000000 --- a/docker/server/config/config-mysql-grpc.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2021 Netflix, Inc. -#

-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -#

-# http://www.apache.org/licenses/LICENSE-2.0 -#

-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -# - -# Servers. -conductor.grpc-server.enabled=true - -# Database persistence model. -conductor.db.type=mysql -conductor.queue.type=redis_standalone -conductor.redis.hosts=rs:6379:us-east-1c -spring.datasource.url=jdbc:mysql://mysql:3306/conductor -spring.datasource.username=conductor -spring.datasource.password=conductor - -# Hikari pool sizes are -1 by default and prevent startup -spring.datasource.hikari.maximum-pool-size=10 -spring.datasource.hikari.minimum-idle=2 - -# Elastic search instance indexing is enabled. -conductor.indexing.enabled=true - -# Transport address to elasticsearch -conductor.elasticsearch.url=http://es:9200 - -# Name of the elasticsearch cluster -conductor.elasticsearch.indexName=conductor - -# Load sample kitchen sink workflow -loadSample=true diff --git a/docker/server/config/config-mysql.properties b/docker/server/config/config-mysql.properties index d5effd8d6d..6b618dc2eb 100755 --- a/docker/server/config/config-mysql.properties +++ b/docker/server/config/config-mysql.properties @@ -1,27 +1,24 @@ -# Servers. -conductor.grpc-server.enabled=false - # Database persistence type. conductor.db.type=mysql -conductor.queue.type=redis_standalone -conductor.redis.hosts=rs:6379:us-east-1c +# mysql spring.datasource.url=jdbc:mysql://mysql:3306/conductor spring.datasource.username=conductor spring.datasource.password=conductor -# Hikari pool sizes are -1 by default and prevent startup -spring.datasource.hikari.maximum-pool-size=10 -spring.datasource.hikari.minimum-idle=2 +# Use redis queues +conductor.queue.type=redis_standalone # Elastic search instance indexing is enabled. conductor.indexing.enabled=true - -# Transport address to elasticsearch conductor.elasticsearch.url=http://es:9200 - -# Name of the elasticsearch cluster conductor.elasticsearch.indexName=conductor +conductor.elasticsearch.version=7 +conductor.elasticsearch.clusterHealthColor=yellow + +# Additional modules for metrics collection exposed to Prometheus (optional) +conductor.metrics-prometheus.enabled=true +management.endpoints.web.exposure.include=prometheus -# Load sample kitchen sink workflow +# Load sample kitchen-sink workflow loadSample=true diff --git a/docker/server/config/config-postgres.properties b/docker/server/config/config-postgres.properties index e1b3cc8fde..43aa64a0fb 100755 --- a/docker/server/config/config-postgres.properties +++ b/docker/server/config/config-postgres.properties @@ -1,27 +1,21 @@ -# Servers. -conductor.grpc-server.enabled=false - # Database persistence type. conductor.db.type=postgres -conductor.queue.type=redis_standalone -conductor.redis.hosts=rs:6379:us-east-1c -spring.datasource.url=jdbc:postgresql://postgres:5432/conductor +# postgres +spring.datasource.url=jdbc:postgresql://postgresdb:5432/postgres spring.datasource.username=conductor spring.datasource.password=conductor -# Hikari pool sizes are -1 by default and prevent startup -spring.datasource.hikari.maximum-pool-size=10 -spring.datasource.hikari.minimum-idle=2 - # Elastic search instance indexing is enabled. conductor.indexing.enabled=true - -# Transport address to elasticsearch conductor.elasticsearch.url=http://es:9200 - -# Name of the elasticsearch cluster conductor.elasticsearch.indexName=conductor +conductor.elasticsearch.version=7 +conductor.elasticsearch.clusterHealthColor=yellow + +# Additional modules for metrics collection exposed to Prometheus (optional) +conductor.metrics-prometheus.enabled=true +management.endpoints.web.exposure.include=prometheus -# Load sample kitchen sink workflow +# Load sample kitchen-sink workflow loadSample=true diff --git a/docker/server/config/config-redis.properties b/docker/server/config/config-redis.properties new file mode 100755 index 0000000000..5afd337974 --- /dev/null +++ b/docker/server/config/config-redis.properties @@ -0,0 +1,25 @@ +# Database persistence type. +# Below are the properties for redis +conductor.db.type=redis_standalone +conductor.redis.hosts=rs:6379:us-east-1c +conductor.redis-lock.serverAddress=redis://rs:6379 +conductor.redis.taskDefCacheRefreshInterval=1 +conductor.redis.workflowNamespacePrefix=conductor +conductor.redis.queueNamespacePrefix=conductor_queues + +#Use redis queues +conductor.queue.type=redis_standalone + +# Elastic search instance indexing is enabled. +conductor.indexing.enabled=true +conductor.elasticsearch.url=http://es:9200 +conductor.elasticsearch.indexName=conductor +conductor.elasticsearch.version=7 +conductor.elasticsearch.clusterHealthColor=yellow + +# Additional modules for metrics collection exposed to Prometheus (optional) +conductor.metrics-prometheus.enabled=true +management.endpoints.web.exposure.include=prometheus + +# Load sample kitchen sink workflow +loadSample=true diff --git a/docker/server/config/config.properties b/docker/server/config/config.properties index 55124c78c0..74d414520f 100755 --- a/docker/server/config/config.properties +++ b/docker/server/config/config.properties @@ -1,54 +1,42 @@ -# Servers. -conductor.grpc-server.enabled=false +# See README in the docker for configuration guide -# Database persistence type. -conductor.db.type=dynomite +# db.type determines the type of database used +# See various configurations below for the values +conductor.db.type=SET_THIS -# Dynomite Cluster details. -# format is host:port:rack separated by semicolon -conductor.redis.hosts=dyno1:8102:us-east-1c +# =====================================================# +# Redis Configuration Properties +# =====================================================# +#conductor.db.type=redis_standalone -# Dynomite cluster name -conductor.redis.clusterName=dyno1 +# The last part MUST be us-east-1c, it is not used and is kept for backwards compatibility +# conductor.redis.hosts=rs:6379:us-east-1c +# -# Namespace for the keys stored in Dynomite/Redis -conductor.redis.workflowNamespacePrefix=conductor +# conductor.redis-lock.serverAddress=redis://rs:6379 +# conductor.redis.taskDefCacheRefreshInterval=1 +# conductor.redis.workflowNamespacePrefix=conductor +# conductor.redis.queueNamespacePrefix=conductor_queues -# Namespace prefix for the dyno queues -conductor.redis.queueNamespacePrefix=conductor_queues -# No. of threads allocated to dyno-queues (optional) -queues.dynomite.threads=10 +# =====================================================# +# Postgres Configuration Properties +# =====================================================# -# By default with dynomite, we want the repairservice enabled -conductor.app.workflowRepairServiceEnabled=true +# conductor.db.type=postgres +# spring.datasource.url=jdbc:postgresql://localhost:5432/postgres +# spring.datasource.username=postgres +# spring.datasource.password=postgres +# Additionally you can use set the spring.datasource.XXX properties for connection pool size etc. -# Non-quorum port used to connect to local redis. Used by dyno-queues. -# When using redis directly, set this to the same port as redis server -# For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite. -conductor.redis.queuesNonQuorumPort=22122 +# If you want to use Postgres as indexing store set the following +# conductor.indexing.enabled=true +# conductor.indexing.type=postgres -# Elastic search instance indexing is enabled. -conductor.indexing.enabled=true +# When using Elasticsearch 7 for indexing, set the following -# Transport address to elasticsearch -conductor.elasticsearch.url=http://es:9200 +# conductor.indexing.enabled=true +# conductor.elasticsearch.url=http://es:9200 +# conductor.elasticsearch.version=7 +# conductor.elasticsearch.indexName=conductor -# Name of the elasticsearch cluster -conductor.elasticsearch.indexName=conductor -#conductor.event-queues.amqp.queueType=classic -#conductor.event-queues.amqp.sequentialMsgProcessing=true - -# Additional modules for metrics collection exposed via logger (optional) -# conductor.metrics-logger.enabled=true -# conductor.metrics-logger.reportPeriodSeconds=15 - -# Additional modules for metrics collection exposed to Prometheus (optional) -# conductor.metrics-prometheus.enabled=true -# management.endpoints.web.exposure.include=prometheus - -# To enable Workflow/Task Summary Input/Output JSON Serialization, use the following: -# conductor.app.summary-input-output-json-serialization.enabled=true - -# Load sample kitchen sink workflow -loadSample=true diff --git a/docker/server/config/log4j.properties b/docker/server/config/log4j.properties index bb249b00d0..900fbc3224 100644 --- a/docker/server/config/log4j.properties +++ b/docker/server/config/log4j.properties @@ -23,3 +23,4 @@ log4j.appender.A1=org.apache.log4j.ConsoleAppender # A1 uses PatternLayout. log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n +logging.logger.com.netflix.dyno.queues.redis.RedisDynoQueue=ERROR \ No newline at end of file diff --git a/docker/server/config/redis.conf b/docker/server/config/redis.conf new file mode 100644 index 0000000000..f43add6148 --- /dev/null +++ b/docker/server/config/redis.conf @@ -0,0 +1 @@ +appendonly yes \ No newline at end of file diff --git a/docker/server/nginx/nginx.conf b/docker/server/nginx/nginx.conf new file mode 100644 index 0000000000..fa8f0871d0 --- /dev/null +++ b/docker/server/nginx/nginx.conf @@ -0,0 +1,50 @@ +server { + listen 5000; + server_name conductor; + server_tokens off; + + location / { + add_header Referrer-Policy "strict-origin"; + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-Content-Type-Options "nosniff"; + add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' assets.orkes.io *.googletagmanager.com *.pendo.io https://cdn.jsdelivr.net; worker-src 'self' 'unsafe-inline' 'unsafe-eval' data: blob:;"; + add_header Permissions-Policy "accelerometer=(), autoplay=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), keyboard-map=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), xr-spatial-tracking=(), clipboard-read=(self), clipboard-write=(self), gamepad=(), hid=(), idle-detection=(), serial=(), window-placement=(self)"; + + # This would be the directory where your React app's static files are stored at + root /usr/share/nginx/html; + try_files $uri /index.html; + } + + location /api { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://localhost:8080/api; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_cache_bypass $http_upgrade; + proxy_redirect off; + } + + location /actuator { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://localhost:8080/actuator; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_cache_bypass $http_upgrade; + proxy_redirect off; + } + + location /swagger-ui { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://localhost:8080/swagger-ui; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_cache_bypass $http_upgrade; + proxy_redirect off; + } +} \ No newline at end of file diff --git a/docker/serverAndUI/Dockerfile b/docker/serverAndUI/Dockerfile deleted file mode 100644 index 1722e07269..0000000000 --- a/docker/serverAndUI/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -# -# conductor:serverAndUI - Combined Netflix conductor server & UI -# -# =========================================================================================================== -# 0. Builder stage -# =========================================================================================================== -FROM openjdk:11-jdk AS builder -LABEL maintainer="Netflix OSS " - -# Install Node -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \ - && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && apt-get update -qq \ - && apt-get install -qq --no-install-recommends \ - build-essential \ - nodejs \ - yarn \ - && apt-get upgrade -qq \ - && rm -rf /var/lib/apt/lists/* - -# Copy the project onto the builder image -COPY . /conductor - -# Build the server -WORKDIR /conductor -RUN ./gradlew build -x test - -# Build the client -WORKDIR /conductor/ui -RUN yarn install && yarn build - -# =========================================================================================================== -# 1. Bin stage -# =========================================================================================================== - -FROM nginx:alpine -RUN apk add openjdk11-jre - -LABEL maintainer="Netflix OSS " - -# Make app folders -RUN mkdir -p /app/config /app/logs /app/libs - -# Copy the compiled output to new image -COPY --from=builder /conductor/docker/serverAndUI/bin /app -COPY --from=builder /conductor/docker/serverAndUI/config /app/config -COPY --from=builder /conductor/server/build/libs/conductor-server-*-boot.jar /app/libs - -# Copy compiled UI assets to nginx www directory -WORKDIR /usr/share/nginx/html -RUN rm -rf ./* -COPY --from=builder /conductor/ui/build . -COPY --from=builder /conductor/docker/serverAndUI/nginx/nginx.conf /etc/nginx/conf.d/default.conf - -# Copy the files for the server into the app folders -RUN chmod +x /app/startup.sh - -HEALTHCHECK --interval=60s --timeout=30s --retries=10 CMD curl -I -XGET http://localhost:8080/health || exit 1 - -CMD [ "/app/startup.sh" ] -ENTRYPOINT [ "/bin/sh"] diff --git a/docker/serverAndUI/README.md b/docker/serverAndUI/README.md deleted file mode 100644 index 275d74add6..0000000000 --- a/docker/serverAndUI/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Docker -## Conductor server and UI -This Dockerfile create the conductor:serverAndUI image - -## Building the image -`docker build -t conductor:serverAndUI .` - -## Running the conductor server - - Standalone server (interal DB): `docker run -p 8080:8080 -p 80:5000 -d -t conductor:serverAndUI` - - Server (external DB required): `docker run -p 8080:8080 -p 80:5000 -d -t -e "CONFIG_PROP=config.properties" conductor:serverAndUI` diff --git a/docker/serverAndUI/bin/startup.sh b/docker/serverAndUI/bin/startup.sh deleted file mode 100755 index 0070cd0b9d..0000000000 --- a/docker/serverAndUI/bin/startup.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# -# Copyright 2021 Netflix, Inc. -#

-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -#

-# http://www.apache.org/licenses/LICENSE-2.0 -#

-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -# - -echo "Starting Conductor Server and UI" -echo "Running Nginx in background" -# Start nginx as daemon -nginx - -# Start the server -cd /app/libs -echo "Property file: $CONFIG_PROP" -echo $CONFIG_PROP -export config_file= - -if [ -z "$CONFIG_PROP" ]; - then - echo "Using an in-memory instance of conductor"; - export config_file=/app/config/config-local.properties - else - echo "Using '$CONFIG_PROP'"; - export config_file=/app/config/$CONFIG_PROP -fi - -nohup java -jar -DCONDUCTOR_CONFIG_FILE=$config_file conductor-server-*-boot.jar 1>&2 > /app/logs/server.log diff --git a/docker/serverAndUI/config/config-local.properties b/docker/serverAndUI/config/config-local.properties deleted file mode 100755 index d725130e89..0000000000 --- a/docker/serverAndUI/config/config-local.properties +++ /dev/null @@ -1,33 +0,0 @@ -# Database persistence type. -conductor.db.type=memory - -# Dynomite Cluster details. -# format is host:port:rack separated by semicolon -conductor.redis.hosts=dyno1:8102:us-east-1c - -# Namespace for the keys stored in Dynomite/Redis -conductor.redis.workflowNamespacePrefix=conductor - -# Namespace prefix for the dyno queues -conductor.redis.queueNamespacePrefix=conductor_queues - -# No. of threads allocated to dyno-queues (optional) -queues.dynomite.threads=10 - -# By default with dynomite, we want the repairservice enabled -conductor.app.workflowRepairServiceEnabled=true - - -# Non-quorum port used to connect to local redis. Used by dyno-queues. -# When using redis directly, set this to the same port as redis server -# For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite. -conductor.redis.queuesNonQuorumPort=22122 - -# Transport address to elasticsearch -conductor.elasticsearch.url=localhost:9300 - -# Name of the elasticsearch cluster -conductor.elasticsearch.indexName=conductor - -# Load sample kitchen sink workflow -loadSample=true diff --git a/docker/serverAndUI/config/config.properties b/docker/serverAndUI/config/config.properties deleted file mode 100755 index c596c6f10f..0000000000 --- a/docker/serverAndUI/config/config.properties +++ /dev/null @@ -1,35 +0,0 @@ -# Database persistence model. -conductor.db.type=dynomite - -# Dynomite Cluster details. -# format is host:port:rack separated by semicolon -conductor.redis.hosts=dyno1:8102:us-east-1c - -# Dynomite cluster name -conductor.redis.clusterName=dyno1 - -# Namespace for the keys stored in Dynomite/Redis -conductor.redis.workflowNamespacePrefix=conductor - -# Namespace prefix for the dyno queues -conductor.redis.queueNamespacePrefix=conductor_queues - -# No. of threads allocated to dyno-queues (optional) -queues.dynomite.threads=10 - -# By default with dynomite, we want the repairservice enabled -conductor.app.workflowRepairServiceEnabled=true - -# Non-quorum port used to connect to local redis. Used by dyno-queues. -# When using redis directly, set this to the same port as redis server -# For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite. -conductor.redis.queuesNonQuorumPort=22122 - -# Transport address to elasticsearch -conductor.elasticsearch.url=es:9300 - -# Name of the elasticsearch cluster -conductor.elasticsearch.indexName=conductor - -# Load sample kitchen sink workflow -loadSample=true diff --git a/docker/serverAndUI/nginx/nginx.conf b/docker/serverAndUI/nginx/nginx.conf deleted file mode 100644 index 74e0ec2e61..0000000000 --- a/docker/serverAndUI/nginx/nginx.conf +++ /dev/null @@ -1,20 +0,0 @@ -server { - listen 5000; - server_name conductor; - location / { - # This would be the directory where your React app's static files are stored at - root /usr/share/nginx/html; - try_files $uri /index.html; - } - - location /api { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-NginX-Proxy true; - proxy_pass http://localhost:8080/api; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_cache_bypass $http_upgrade; - proxy_redirect off; - } -} \ No newline at end of file diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index a79aef3b0b..b7967b9a00 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -1,25 +1,25 @@ # # conductor:ui - Netflix Conductor UI # -FROM node:16-alpine +FROM node:20-alpine LABEL maintainer="Netflix OSS " # Install the required packages for the node build # to run on alpine RUN apk update && apk add --no-cache python3 py3-pip make g++ - + # A directory within the virtualized Docker environment # Becomes more relevant when using Docker Compose later WORKDIR /usr/src/app - + # Copies package.json to Docker environment in a separate layer as a performance optimization COPY ./ui/package.json ./ - + # Installs all node packages. Cached unless package.json changes RUN yarn install - + # Copies everything else over to Docker environment -# node_modules excluded in .dockerignore. +# node_modules excluded in .dockerignore. COPY ./ui . - + CMD [ "yarn", "start" ] diff --git a/docs/docs/gettingstarted/source.md b/docs/docs/gettingstarted/source.md index 3a9eb5d449..f3a4786566 100644 --- a/docs/docs/gettingstarted/source.md +++ b/docs/docs/gettingstarted/source.md @@ -5,7 +5,7 @@ In this article we will explore how you can set up Netflix Conductor on your loc features. ### Prerequisites -1. JDK 11 or greater +1. JDK 17 or greater 2. (Optional) Docker if you want to run tests. You can install docker from [here](https://www.docker.com/get-started/). 3. Node for building and running UI. Instructions at [https://nodejs.org](https://nodejs.org). 4. Yarn for building and running UI. Instructions at [https://classic.yarnpkg.com/en/docs/install](https://classic.yarnpkg.com/en/docs/install). diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle index 2bf0d49c89..d033895bbe 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 f5bd8cea5d..37a8002a0d 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" @@ -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" @@ -213,6 +213,12 @@ }, "org.elasticsearch.client:transport": { "locked": "6.8.12" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -235,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" @@ -265,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" @@ -400,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": [ @@ -408,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": [ @@ -416,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": [ @@ -424,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": [ @@ -432,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" @@ -449,11 +455,17 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "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 0a8c86f353..1cd0535dde 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,8 +21,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.ResourceAlreadyExistsException; 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 9792d52225..ad62517c03 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,8 +22,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b916c04dbb..42ee1f5292 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 12c2d80a97..ded151a55a 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": { @@ -18,31 +18,31 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "org.apache.commons:commons-lang3": { "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.slf4j:slf4j-api": { "locked": "1.7.36" @@ -93,19 +93,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -131,7 +131,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -139,7 +139,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -147,7 +147,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -155,7 +155,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -163,7 +163,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.slf4j:slf4j-api": { "locked": "1.7.36" @@ -183,13 +183,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "junit:junit": { "locked": "4.13.2" @@ -198,19 +198,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.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -219,10 +219,10 @@ "locked": "1.7.36" }, "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": { @@ -270,19 +270,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -311,7 +311,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -319,7 +319,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -327,7 +327,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -335,7 +335,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -343,7 +343,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -352,10 +352,10 @@ "locked": "1.7.36" }, "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-server/dependencies.lock b/grpc-server/dependencies.lock index 2d6461195d..39dd4092e3 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.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-services": { - "locked": "1.56.1" + "locked": "1.57.1" }, "org.apache.commons:commons-lang3": { "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": { @@ -127,22 +127,22 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-services": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -189,7 +189,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.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.21.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.21.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.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -225,7 +225,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -239,13 +245,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-services": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-testing": { - "locked": "1.56.1" + "locked": "1.57.1" }, "junit:junit": { "locked": "4.13.2" @@ -254,28 +260,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.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" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" @@ -366,25 +372,25 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-services": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-testing": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -434,7 +440,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -443,7 +449,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -452,7 +458,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -461,7 +467,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -470,16 +476,22 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "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 7d10ac59f8..c49a6f9dc9 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,8 +15,8 @@ import java.io.IOException; import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index a3677ba437..7e8c281c52 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { @@ -12,28 +12,28 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.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" } }, "compileProtoPath": { @@ -71,10 +71,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -96,40 +96,40 @@ "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" } }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.56.1" + "locked": "1.57.1" } }, "protobufToolsLocator_protoc": { @@ -172,10 +172,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -197,35 +197,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" } }, "testCompileClasspath": { @@ -236,10 +236,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -248,28 +248,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" } }, "testCompileProtoPath": { @@ -307,10 +307,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -335,44 +335,44 @@ "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.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": { @@ -410,10 +410,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.57.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -438,44 +438,44 @@ "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.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/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java index fb9e4d63ca..c9cd06e381 100644 --- a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java +++ b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java @@ -747,45 +747,45 @@ public TaskDef fromProto(TaskDefPb.TaskDef from) { return to; } - public TaskDefPb.TaskDef.RetryLogic toProto(TaskDef.RetryLogic from) { - TaskDefPb.TaskDef.RetryLogic to; + public TaskDefPb.TaskDef.TimeoutPolicy toProto(TaskDef.TimeoutPolicy from) { + TaskDefPb.TaskDef.TimeoutPolicy to; switch (from) { - case FIXED: to = TaskDefPb.TaskDef.RetryLogic.FIXED; break; - case EXPONENTIAL_BACKOFF: to = TaskDefPb.TaskDef.RetryLogic.EXPONENTIAL_BACKOFF; break; - case LINEAR_BACKOFF: to = TaskDefPb.TaskDef.RetryLogic.LINEAR_BACKOFF; break; + case RETRY: to = TaskDefPb.TaskDef.TimeoutPolicy.RETRY; break; + case TIME_OUT_WF: to = TaskDefPb.TaskDef.TimeoutPolicy.TIME_OUT_WF; break; + case ALERT_ONLY: to = TaskDefPb.TaskDef.TimeoutPolicy.ALERT_ONLY; break; default: throw new IllegalArgumentException("Unexpected enum constant: " + from); } return to; } - public TaskDef.RetryLogic fromProto(TaskDefPb.TaskDef.RetryLogic from) { - TaskDef.RetryLogic to; + public TaskDef.TimeoutPolicy fromProto(TaskDefPb.TaskDef.TimeoutPolicy from) { + TaskDef.TimeoutPolicy to; switch (from) { - case FIXED: to = TaskDef.RetryLogic.FIXED; break; - case EXPONENTIAL_BACKOFF: to = TaskDef.RetryLogic.EXPONENTIAL_BACKOFF; break; - case LINEAR_BACKOFF: to = TaskDef.RetryLogic.LINEAR_BACKOFF; break; + case RETRY: to = TaskDef.TimeoutPolicy.RETRY; break; + case TIME_OUT_WF: to = TaskDef.TimeoutPolicy.TIME_OUT_WF; break; + case ALERT_ONLY: to = TaskDef.TimeoutPolicy.ALERT_ONLY; break; default: throw new IllegalArgumentException("Unexpected enum constant: " + from); } return to; } - public TaskDefPb.TaskDef.TimeoutPolicy toProto(TaskDef.TimeoutPolicy from) { - TaskDefPb.TaskDef.TimeoutPolicy to; + public TaskDefPb.TaskDef.RetryLogic toProto(TaskDef.RetryLogic from) { + TaskDefPb.TaskDef.RetryLogic to; switch (from) { - case RETRY: to = TaskDefPb.TaskDef.TimeoutPolicy.RETRY; break; - case TIME_OUT_WF: to = TaskDefPb.TaskDef.TimeoutPolicy.TIME_OUT_WF; break; - case ALERT_ONLY: to = TaskDefPb.TaskDef.TimeoutPolicy.ALERT_ONLY; break; + case FIXED: to = TaskDefPb.TaskDef.RetryLogic.FIXED; break; + case EXPONENTIAL_BACKOFF: to = TaskDefPb.TaskDef.RetryLogic.EXPONENTIAL_BACKOFF; break; + case LINEAR_BACKOFF: to = TaskDefPb.TaskDef.RetryLogic.LINEAR_BACKOFF; break; default: throw new IllegalArgumentException("Unexpected enum constant: " + from); } return to; } - public TaskDef.TimeoutPolicy fromProto(TaskDefPb.TaskDef.TimeoutPolicy from) { - TaskDef.TimeoutPolicy to; + public TaskDef.RetryLogic fromProto(TaskDefPb.TaskDef.RetryLogic from) { + TaskDef.RetryLogic to; switch (from) { - case RETRY: to = TaskDef.TimeoutPolicy.RETRY; break; - case TIME_OUT_WF: to = TaskDef.TimeoutPolicy.TIME_OUT_WF; break; - case ALERT_ONLY: to = TaskDef.TimeoutPolicy.ALERT_ONLY; break; + case FIXED: to = TaskDef.RetryLogic.FIXED; break; + case EXPONENTIAL_BACKOFF: to = TaskDef.RetryLogic.EXPONENTIAL_BACKOFF; break; + case LINEAR_BACKOFF: to = TaskDef.RetryLogic.LINEAR_BACKOFF; break; default: throw new IllegalArgumentException("Unexpected enum constant: " + from); } return to; diff --git a/grpc/src/main/proto/model/taskdef.proto b/grpc/src/main/proto/model/taskdef.proto index dd15508d6c..43c086c9ee 100644 --- a/grpc/src/main/proto/model/taskdef.proto +++ b/grpc/src/main/proto/model/taskdef.proto @@ -8,16 +8,16 @@ option java_outer_classname = "TaskDefPb"; option go_package = "github.com/netflix/conductor/client/gogrpc/conductor/model"; message TaskDef { - enum RetryLogic { - FIXED = 0; - EXPONENTIAL_BACKOFF = 1; - LINEAR_BACKOFF = 2; - } enum TimeoutPolicy { RETRY = 0; TIME_OUT_WF = 1; ALERT_ONLY = 2; } + enum RetryLogic { + FIXED = 0; + EXPONENTIAL_BACKOFF = 1; + LINEAR_BACKOFF = 2; + } string name = 1; string description = 2; int32 retry_count = 3; diff --git a/http-task/build.gradle b/http-task/build.gradle index c525897a7b..a9f76899e7 100644 --- a/http-task/build.gradle +++ b/http-task/build.gradle @@ -21,4 +21,6 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-web' testImplementation "org.testcontainers:mockserver:${revTestContainer}" testImplementation "org.mock-server:mockserver-client-java:${revMockServerClient}" + testImplementation "org.bouncycastle:bcprov-jdk15on:1.70" + testImplementation "org.bouncycastle:bcpkix-jdk15on:1.70" } \ No newline at end of file diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index 81c8fb8c40..828e8d3923 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": { @@ -15,25 +15,25 @@ "locked": "1.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.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": { @@ -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,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -205,19 +211,25 @@ "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.bouncycastle:bcpkix-jdk15on": { + "locked": "1.70" + }, + "org.bouncycastle:bcprov-jdk15on": { + "locked": "1.70" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -226,13 +238,13 @@ "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" @@ -361,7 +373,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": [ @@ -369,7 +381,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": [ @@ -377,7 +389,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": [ @@ -385,7 +397,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": [ @@ -393,7 +405,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.bouncycastle:bcpkix-jdk15on": { + "locked": "1.70" + }, + "org.bouncycastle:bcprov-jdk15on": { + "locked": "1.70" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -401,14 +419,20 @@ "org.mock-server:mockserver-client-java": { "locked": "5.12.0" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "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 3b3a0c14f4..b11a97648d 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 @@ -173,7 +173,7 @@ protected HttpResponse httpCall(Input input) throws Exception { } 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) { diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 5e1d986b35..6572905d2e 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -11,6 +11,7 @@ dependencies { implementation "com.sun.jersey:jersey-client:${revJersey}" implementation "javax.ws.rs:javax.ws.rs-api:${revJAXRS}" implementation "org.glassfish.jersey.core:jersey-common:${revJerseyCommon}" + implementation "org.openjdk.nashorn:nashorn-core:15.4" testImplementation "org.springframework:spring-web" testImplementation "org.spockframework:spock-core:${revSpock}" diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 94d5523161..db75fe6ee9 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": { @@ -27,22 +27,25 @@ "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" + }, + "org.openjdk.nashorn:nashorn-core": { + "locked": "15.4" } }, "runtimeClasspath": { @@ -158,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": [ @@ -166,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": [ @@ -174,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": [ @@ -182,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": [ @@ -190,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": [ @@ -198,6 +201,9 @@ ], "locked": "2.22.2" }, + "org.openjdk.nashorn:nashorn-core": { + "locked": "15.4" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" @@ -237,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.13" + "locked": "2.5.22" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -260,6 +266,9 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "locked": "15.4" + }, "org.spockframework:spock-core": { "locked": "1.3-groovy-2.5" }, @@ -267,10 +276,10 @@ "locked": "1.3-groovy-2.5" }, "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" @@ -392,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": [ @@ -400,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": [ @@ -408,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": [ @@ -416,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": [ @@ -424,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.13" + "locked": "2.5.22" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -438,6 +447,9 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "locked": "15.4" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" @@ -451,10 +463,10 @@ "locked": "1.3-groovy-2.5" }, "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" diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Javascript.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Javascript.java index 6468faa8a9..cca0246f70 100644 --- a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Javascript.java +++ b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/def/tasks/Javascript.java @@ -100,7 +100,7 @@ public String getExpression() { * @return */ public Javascript validate() { - ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName(ENGINE); + ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName("Nashorn"); if (scriptEngine == null) { LOGGER.error("missing " + ENGINE + " engine. Ensure you are running supported JVM"); return this; @@ -128,7 +128,7 @@ public Javascript validate() { */ public Object test(Map input) { - ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName(ENGINE); + ScriptEngine scriptEngine = new ScriptEngineManager().getEngineByName("Nashorn"); if (scriptEngine == null) { LOGGER.error("missing " + ENGINE + " engine. Ensure you are running supported JVM"); return this; diff --git a/java-sdk/src/test/java/com/netflix/conductor/sdk/workflow/def/WorkflowCreationTests.java b/java-sdk/src/test/java/com/netflix/conductor/sdk/workflow/def/WorkflowCreationTests.java index dd3dcac448..52ccde54e5 100644 --- a/java-sdk/src/test/java/com/netflix/conductor/sdk/workflow/def/WorkflowCreationTests.java +++ b/java-sdk/src/test/java/com/netflix/conductor/sdk/workflow/def/WorkflowCreationTests.java @@ -24,7 +24,10 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; @@ -39,8 +42,11 @@ import static org.junit.jupiter.api.Assertions.*; +@Disabled public class WorkflowCreationTests { + private static final Logger LOGGER = LoggerFactory.getLogger(WorkflowCreationTests.class); + private static WorkflowExecutor executor; private static WorkflowTestRunner runner; diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index c56ba7e148..a413c462e5 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "compileClasspath": { @@ -18,22 +18,22 @@ "locked": "0.0.13" }, "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": { @@ -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,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" } }, "testCompileClasspath": { @@ -208,28 +214,28 @@ "locked": "0.0.13" }, "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": { @@ -355,7 +361,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": [ @@ -363,7 +369,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": [ @@ -371,7 +377,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": [ @@ -379,7 +385,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": [ @@ -387,16 +393,22 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "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/dependencies.lock b/redis-concurrency-limit/dependencies.lock index fd32c1a202..1c9aec1ff4 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,22 +15,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" }, "org.springframework.data:spring-data-redis": { "locked": "2.7.2" @@ -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,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -211,22 +217,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.13" + "locked": "2.5.22" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -238,10 +244,10 @@ "locked": "1.3-groovy-2.5" }, "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" @@ -376,7 +382,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": [ @@ -384,7 +390,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": [ @@ -392,7 +398,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": [ @@ -400,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-web": { "firstLevelTransitive": [ @@ -408,14 +414,20 @@ "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.13" + "locked": "2.5.22" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" + }, "org.spockframework:spock-core": { "locked": "1.3-groovy-2.5" }, @@ -423,10 +435,10 @@ "locked": "1.3-groovy-2.5" }, "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 f560bc2a37..06d78b0242 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.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.redisson:redisson": { "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -150,7 +150,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": [ @@ -158,7 +158,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": [ @@ -166,7 +166,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": [ @@ -174,7 +174,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": [ @@ -182,7 +182,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.redisson:redisson": { "locked": "3.13.3" @@ -202,19 +208,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.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -223,10 +229,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" } }, "testRuntimeClasspath": { @@ -352,7 +358,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": [ @@ -360,7 +366,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": [ @@ -368,7 +374,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": [ @@ -376,7 +382,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": [ @@ -384,19 +390,25 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" + }, "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" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 99abce8a9a..91dc3e073e 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.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.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" @@ -165,7 +165,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": [ @@ -173,7 +173,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": [ @@ -181,7 +181,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": [ @@ -189,7 +189,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": [ @@ -197,7 +197,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" @@ -223,19 +229,19 @@ "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" @@ -244,10 +250,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" @@ -379,7 +385,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 +393,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 +401,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 +409,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,19 +417,25 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" + }, "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" diff --git a/rest/dependencies.lock b/rest/dependencies.lock index b522aab64c..4e16d5516d 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.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.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -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,13 +188,19 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "3.1.4" } }, "testCompileClasspath": { @@ -211,19 +217,19 @@ "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" @@ -232,13 +238,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" } }, "testRuntimeClasspath": { @@ -364,7 +370,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": [ @@ -372,7 +378,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": [ @@ -380,7 +386,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": [ @@ -388,7 +394,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": [ @@ -396,22 +402,28 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.21.0" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" + }, "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" } } } \ 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 ab5c47eee9..f6ae959b71 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,7 +15,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 704f72e055..897d2a80cf 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,10 +16,10 @@ 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 jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/dependencies.lock b/server/dependencies.lock index 57e924ad03..5dbae2fe01 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,40 @@ "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" } }, "productionRuntimeClasspath": { @@ -104,41 +104,41 @@ "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": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "31.1-jre" + "locked": "32.0.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -146,13 +146,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 +273,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -301,19 +301,19 @@ "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": { "firstLevelTransitive": [ @@ -372,7 +372,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 +392,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 +412,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 +432,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 +452,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 +473,13 @@ "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -494,32 +500,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": "4.3.2" } }, "runtimeClasspath": { @@ -545,41 +551,41 @@ "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": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "31.1-jre" + "locked": "32.0.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -587,13 +593,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": [ @@ -714,25 +720,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -742,19 +748,19 @@ "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": { "firstLevelTransitive": [ @@ -813,7 +819,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": [ @@ -833,7 +839,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": [ @@ -853,7 +859,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": [ @@ -873,7 +879,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": [ @@ -893,13 +899,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": [ @@ -914,7 +920,13 @@ "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -935,32 +947,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": "4.3.2" } }, "testCompileClasspath": { @@ -1007,13 +1019,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-testing": { - "locked": "1.56.1" + "locked": "1.59.0" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1022,46 +1034,46 @@ "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" } }, "testRuntimeClasspath": { @@ -1087,41 +1099,41 @@ "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": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "31.1-jre" + "locked": "32.0.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -1135,7 +1147,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -1256,28 +1268,28 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.56.1" + "locked": "1.59.0" }, "io.grpc:grpc-testing": { - "locked": "1.56.1" + "locked": "1.59.0" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1287,19 +1299,19 @@ "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": { "firstLevelTransitive": [ @@ -1361,7 +1373,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": [ @@ -1381,7 +1393,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": [ @@ -1401,7 +1413,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": [ @@ -1421,7 +1433,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": [ @@ -1441,13 +1453,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": [ @@ -1462,10 +1474,16 @@ "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": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -1486,35 +1504,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": "4.3.2" } } } \ No newline at end of file diff --git a/springboot-bom-overrides.gradle b/springboot-bom-overrides.gradle index dc9f79b603..328a12a2a0 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/dependencies.lock b/test-harness/dependencies.lock index f08ccf99f5..896c3a70ea 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/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": { @@ -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.13" + "locked": "2.5.22" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -136,10 +136,10 @@ "locked": "1.3-groovy-2.5" }, "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" @@ -427,27 +427,27 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.56.1" + "locked": "1.57.1" }, "io.orkes.queues:orkes-conductor-queues": { "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.13" + "locked": "2.5.22" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ @@ -675,6 +675,12 @@ "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" + }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" @@ -711,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": [ diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy index 593ae6866e..0fbf0ec0b3 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy @@ -730,7 +730,7 @@ class WorkflowAndTaskConfigurationSpec extends AbstractSpecification { tasks[0].taskType == 'WAIT' tasks[0].status == Task.Status.TIMED_OUT tasks[1].taskType == 'WAIT' - tasks[1].status == Task.Status.IN_PROGRESS + tasks[1].status == Task.Status.SCHEDULED } when: "The wait task is completed" 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 8a70dabf0d..91fc03f3c8 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,7 +12,7 @@ */ package com.netflix.conductor.test.util -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct import org.apache.commons.lang3.StringUtils import org.springframework.beans.factory.annotation.Autowired diff --git a/ui/src/pages/definition/SaveTaskDialog.jsx b/ui/src/pages/definition/SaveTaskDialog.jsx index 7d6808ef94..7b1bc0ce65 100644 --- a/ui/src/pages/definition/SaveTaskDialog.jsx +++ b/ui/src/pages/definition/SaveTaskDialog.jsx @@ -49,11 +49,12 @@ export default function SaveTaskDialog({ onSuccess, onCancel, document }) { }, onError: (err) => { console.log("onerror", err); - let errStr = _.isString(err.body) - ? err.body - : JSON.stringify(err.body, null, 2); + const errObj = JSON.parse(err); + let errStr = errObj.validationErrors && errObj.validationErrors.length > 0 + ? `${errObj.validationErrors[0].message}: ${errObj.validationErrors[0].path}` + : errObj.message; setErrorMsg({ - message: `${TASK_SAVE_FAILED}: ${errStr}`, + message: `${TASK_SAVE_FAILED} ${errStr}`, dismissible: true, }); }, diff --git a/ui/src/pages/definition/SaveWorkflowDialog.jsx b/ui/src/pages/definition/SaveWorkflowDialog.jsx index 53a1cd1d6a..1d2a4d5069 100644 --- a/ui/src/pages/definition/SaveWorkflowDialog.jsx +++ b/ui/src/pages/definition/SaveWorkflowDialog.jsx @@ -81,10 +81,11 @@ export default function SaveWorkflowDialog({ onSuccess, onCancel, document }) { }, onError: (err) => { console.log("onerror", err); - let errStr = _.isString(err.body) - ? err.body - : JSON.stringify(err.body, null, 2); - setErrorMsg(`${WORKFLOW_SAVE_FAILED}: ${errStr}`); + const errObj = JSON.parse(err); + let errStr = errObj.validationErrors && errObj.validationErrors.length > 0 + ? `${errObj.validationErrors[0].message}: ${errObj.validationErrors[0].path}` + : errObj.message; + setErrorMsg(`${WORKFLOW_SAVE_FAILED} ${errStr}`); }, }); diff --git a/ui/yarn.lock b/ui/yarn.lock index 6d4df6a9f2..3a86234bfe 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -5035,9 +5035,9 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.3: - version "2.7.3" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" +eslint-module-utils@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-3.1.4.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" @@ -5068,7 +5068,7 @@ eslint-plugin-import@^2.25.3: debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" + eslint-module-utils "^3.1.4" has "^1.0.3" is-core-module "^2.8.1" is-glob "^4.0.3" From c5faad13725034776c4bfd4b5c6d415f3dac6be1 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 08:02:50 +1100 Subject: [PATCH 02/30] Upgrade Srping 3 --- build.gradle | 15 --------------- ui/yarn.lock | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index d4a4c68fd5..34041e57e3 100644 --- a/build.gradle +++ b/build.gradle @@ -175,19 +175,4 @@ configure(allprojects - project(':conductor-grpc')) { } } } -} - -tasks.register('resolveAndLockAll') { - notCompatibleWithConfigurationCache("Filters configurations at execution time") - - doLast { - configurations.findAll { - // Add any custom filtering on the configurations to be resolved - it.canBeResolved - }.each { it.resolve() } - } -} - -dependencyLocking { - lockAllConfigurations() } \ No newline at end of file diff --git a/ui/yarn.lock b/ui/yarn.lock index 3a86234bfe..6d4df6a9f2 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -5035,9 +5035,9 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-3.1.4.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" +eslint-module-utils@^2.7.3: + version "2.7.3" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" @@ -5068,7 +5068,7 @@ eslint-plugin-import@^2.25.3: debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^3.1.4" + eslint-module-utils "^2.7.3" has "^1.0.3" is-core-module "^2.8.1" is-glob "^4.0.3" From 1321711f82120b56b0fcce15c2f5e330287ac3b4 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 08:50:46 +1100 Subject: [PATCH 03/30] Update dependencies --- core/dependencies.lock | 3 --- .../validations/WorkflowDefConstraintTest.java | 4 +--- dependencies.gradle | 2 +- http-task/dependencies.lock | 18 ------------------ redis-concurrency-limit/dependencies.lock | 12 ------------ redis-lock/dependencies.lock | 6 ------ redis-persistence/dependencies.lock | 6 ------ rest/dependencies.lock | 6 ------ server/dependencies.lock | 18 ------------------ 9 files changed, 2 insertions(+), 73 deletions(-) diff --git a/core/dependencies.lock b/core/dependencies.lock index 1946e7b7b9..9fd620f904 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -68,9 +68,6 @@ "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "locked": "15.4" - }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" }, 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 34a57f3ce5..be6927f718 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java @@ -50,9 +50,7 @@ public class WorkflowDefConstraintTest { @BeforeClass public static void init() { validatorFactory = - Validation.byProvider(ApacheValidationProvider.class) - .configure() - .buildValidatorFactory(); + Validation.buildDefaultValidatorFactory(); validator = validatorFactory.getValidator(); } diff --git a/dependencies.gradle b/dependencies.gradle index 989477bbb4..1ac6f148aa 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -26,7 +26,7 @@ ext { revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '4.0.9' + revGroovy = '4.0.15' revGrpc = '1.+' revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index 53dacba268..37576c7a0d 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -228,15 +228,6 @@ "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" }, - "org.bouncycastle:bcprov-jdk15on": { - "locked": "1.70" - }, - "org.bouncycastle:bcpkix-jdk15on": { - "locked": "1.70" - }, - "org.bouncycastle:bcprov-jdk15on": { - "locked": "1.70" - }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, @@ -416,15 +407,6 @@ "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" }, - "org.bouncycastle:bcprov-jdk15on": { - "locked": "1.70" - }, - "org.bouncycastle:bcpkix-jdk15on": { - "locked": "1.70" - }, - "org.bouncycastle:bcprov-jdk15on": { - "locked": "1.70" - }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 1a58f5e099..5db49ab3b0 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -190,18 +190,6 @@ ], "locked": "2.21.0" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "redis.clients:jedis": { "locked": "3.6.0" } diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index 61258bfdba..06d78b0242 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -190,12 +190,6 @@ ], "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "org.redisson:redisson": { "locked": "3.13.3" } diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 64e0865add..91dc3e073e 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -205,12 +205,6 @@ ], "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" }, diff --git a/rest/dependencies.lock b/rest/dependencies.lock index 9ef306029a..4e16d5516d 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -196,12 +196,6 @@ ], "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, diff --git a/server/dependencies.lock b/server/dependencies.lock index bb705929ae..5dbae2fe01 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -481,12 +481,6 @@ ], "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" @@ -934,12 +928,6 @@ ], "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" @@ -1497,12 +1485,6 @@ ], "locked": "15.4" }, - "org.openjdk.nashorn:nashorn-core": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" - ], - "locked": "15.4" - }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" From 287e6446aa7137f5db5cff37a074f930d008291c Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 08:52:36 +1100 Subject: [PATCH 04/30] Delete wrong dependency --- .../test/integration/http/AbstractHttpEndToEndTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 09f7b25b32..7651c8fcfe 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; @@ -59,7 +59,8 @@ @TestPropertySource(locations = "classpath:application-integrationtest.properties") public abstract class AbstractHttpEndToEndTest extends AbstractEndToEndTest { - @LocalServerPort protected int port; + @LocalServerPort + protected int port; protected static String apiRoot; From da96dc285efead1e9f86ef0a7275a648812e50fa Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 08:54:32 +1100 Subject: [PATCH 05/30] Spotless --- .../config/cache/CacheableEventHandlerDAO.java | 4 ++-- .../config/cache/CacheableMetadataDAO.java | 4 ++-- .../common/config/ObjectMapperConfiguration.java | 3 +-- .../common/constraints/NoSemiColonConstraint.java | 4 ++-- .../constraints/OwnerEmailMandatoryConstraint.java | 4 ++-- .../TaskReferenceNameUniqueConstraint.java | 10 +++++----- .../common/constraints/TaskTimeoutConstraint.java | 4 ++-- .../common/metadata/events/EventHandler.java | 7 +++---- .../conductor/common/metadata/tasks/TaskDef.java | 12 ++++++------ .../common/metadata/tasks/TaskResult.java | 3 +-- .../metadata/workflow/StartWorkflowRequest.java | 6 +++--- .../metadata/workflow/SubWorkflowParams.java | 5 ++--- .../common/metadata/workflow/WorkflowDef.java | 14 +++++++------- .../metadata/workflow/WorkflowDefSummary.java | 4 ++-- .../common/metadata/workflow/WorkflowTask.java | 7 +++---- .../com/netflix/conductor/common/run/Workflow.java | 6 +++--- .../conductor/common/utils/SummaryUtil.java | 3 +-- .../conductor/common/events/EventHandlerTest.java | 8 ++++---- .../conductor/common/tasks/TaskDefTest.java | 10 +++++----- .../common/workflow/SubWorkflowParamsTest.java | 9 ++++----- .../common/workflow/WorkflowDefValidatorTest.java | 10 +++++----- .../common/workflow/WorkflowTaskTest.java | 10 +++++----- .../conductor/core/dal/ExecutionDAOFacade.java | 3 +-- .../core/execution/tasks/StartWorkflow.java | 3 +-- .../netflix/conductor/service/AdminService.java | 4 ++-- .../netflix/conductor/service/EventService.java | 8 ++++---- .../netflix/conductor/service/MetadataService.java | 10 +++++----- .../com/netflix/conductor/service/TaskService.java | 8 ++++---- .../conductor/service/WorkflowBulkService.java | 6 +++--- .../netflix/conductor/service/WorkflowService.java | 12 ++++++------ .../validations/WorkflowTaskTypeConstraint.java | 10 +++++----- .../core/execution/tasks/StartWorkflowSpec.groovy | 5 ++--- .../core/metadata/MetadataMapperServiceTest.java | 4 ++-- .../conductor/service/EventServiceTest.java | 4 ++-- .../conductor/service/MetadataServiceTest.java | 4 ++-- .../netflix/conductor/service/TaskServiceTest.java | 4 ++-- .../conductor/service/WorkflowBulkServiceTest.java | 4 ++-- .../conductor/service/WorkflowServiceTest.java | 4 ++-- .../validations/WorkflowDefConstraintTest.java | 14 ++++++-------- .../WorkflowTaskTypeConstraintTest.java | 12 ++++++------ .../es6/dao/index/ElasticSearchDAOV6.java | 5 ++--- .../es6/dao/index/ElasticSearchRestDAOV6.java | 5 ++--- .../netflix/conductor/grpc/server/GRPCServer.java | 5 ++--- .../com/netflix/conductor/tasks/http/HttpTask.java | 3 ++- .../controllers/ApplicationExceptionMapper.java | 3 +-- .../controllers/ValidationExceptionMapper.java | 10 +++++----- .../conductor/test/util/WorkflowTestUtil.groovy | 3 +-- .../integration/http/AbstractHttpEndToEndTest.java | 3 +-- 48 files changed, 143 insertions(+), 160 deletions(-) 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 764623a03c..fabfd3c555 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 jakarta.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 b81614fff1..2facedbd0c 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 jakarta.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/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java b/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java index d83eeb3e29..fefce75baa 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 jakarta.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 fd10fc8f9a..6f3015e6ad 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 org.apache.commons.lang3.StringUtils; + import jakarta.validation.Constraint; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.Payload; -import org.apache.commons.lang3.StringUtils; - 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 878e279869..b010b4bb32 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 org.apache.commons.lang3.StringUtils; + import jakarta.validation.Constraint; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.Payload; -import org.apache.commons.lang3.StringUtils; - 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 1780fad5ac..f9dbc4c79b 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 jakarta.validation.Constraint; -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; -import jakarta.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 25204db09f..a498dca65b 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 com.netflix.conductor.common.metadata.tasks.TaskDef; + import jakarta.validation.Constraint; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.Payload; -import com.netflix.conductor.common.metadata.tasks.TaskDef; - 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 898b34d6e9..24084f2de4 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 jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.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 6cde91ae7e..658079e0a9 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 jakarta.validation.Valid; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotEmpty; -import jakarta.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 bafaa894de..f31b6481bd 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 jakarta.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 343ca088d5..e44edca629 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 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; -import com.netflix.conductor.annotations.protogen.ProtoField; -import com.netflix.conductor.annotations.protogen.ProtoMessage; - @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 1c666000fd..9cb934b641 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 jakarta.validation.constraints.NotEmpty; -import jakarta.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 6ad8503b8e..6d06760263 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 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; - 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 f0799ec38f..bf22c0265b 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 jakarta.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 e6e4c2d27a..6395596f80 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 jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.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 5a5b104377..b84c99775b 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 jakarta.validation.constraints.Max; -import jakarta.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 fb20cdda7b..60502402f5 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 jakarta.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 2ab51088c6..36cf22c50b 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 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 org.junit.Test; - -import com.netflix.conductor.common.metadata.events.EventHandler; - 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 08529b190b..7e5108b05b 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 jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.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 0f337f91f6..bda8e0ddb9 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 jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.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 c5988b3bdd..2ed5454184 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 jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.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 581c205793..0d9ea921e4 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 jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.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/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java index 5084f07b7c..92255bc4d4 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 jakarta.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 e26486edaf..1096fdf50e 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 jakarta.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 10b5219381..474743db4c 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 jakarta.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 e445f64053..397503cf4f 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 jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.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 e81e789f38..babd46627b 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 jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.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 26470f8884..d897726597 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 jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.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 86cea6c57a..e54c94f601 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 jakarta.validation.constraints.NotEmpty; -import jakarta.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 3d1378b06a..6ba2d7e643 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 jakarta.validation.Valid; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotEmpty; -import jakarta.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 c720d0af5d..3a6400f6b0 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 jakarta.validation.Constraint; -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; -import jakarta.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/StartWorkflowSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy index 7e856b1719..9c6af719df 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 jakarta.validation.ConstraintViolation -import jakarta.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/core/metadata/MetadataMapperServiceTest.java b/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java index 3940e63d4e..e431a16e69 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 jakarta.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 0e0278a1bd..86a61e6ad4 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 jakarta.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 94b68da7a1..1c629c4ec8 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 jakarta.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 329b403f2e..240b99e8c5 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 jakarta.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 742a086378..1936401f11 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 jakarta.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 a2f6e56df1..772f2f2e9c 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 jakarta.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 be6927f718..c66ed56df2 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 jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.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,8 +48,7 @@ public class WorkflowDefConstraintTest { @BeforeClass public static void init() { - validatorFactory = - Validation.buildDefaultValidatorFactory(); + 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 30182e2fa7..520dd6b171 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java @@ -20,12 +20,6 @@ import java.util.Map; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; -import jakarta.validation.executable.ExecutableValidator; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -40,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; 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 1cd0535dde..bbf05423e7 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 jakarta.annotation.PostConstruct; -import jakarta.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 ad62517c03..e51d133411 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 jakarta.annotation.PostConstruct; -import jakarta.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-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 c49a6f9dc9..4f62be3d8e 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 jakarta.annotation.PostConstruct; -import jakarta.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/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 b11a97648d..ed8abd2adb 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 @@ -173,7 +173,8 @@ protected HttpResponse httpCall(Input input) throws Exception { } response.statusCode = responseEntity.getStatusCodeValue(); - response.reasonPhrase = HttpStatus.valueOf(responseEntity.getStatusCode().value()).getReasonPhrase(); + response.reasonPhrase = + HttpStatus.valueOf(responseEntity.getStatusCode().value()).getReasonPhrase(); response.headers = responseEntity.getHeaders(); return response; } catch (RestClientException ex) { 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 f6ae959b71..f61b8e95dd 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 jakarta.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 897d2a80cf..928e7419fa 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 jakarta.servlet.http.HttpServletRequest; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import jakarta.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/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 91fc03f3c8..4f13a99df1 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 jakarta.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 7651c8fcfe..e04a2a9912 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 @@ -59,8 +59,7 @@ @TestPropertySource(locations = "classpath:application-integrationtest.properties") public abstract class AbstractHttpEndToEndTest extends AbstractEndToEndTest { - @LocalServerPort - protected int port; + @LocalServerPort protected int port; protected static String apiRoot; From 05358bdbe6e384f4e85d544d6e38e12433ce92ec Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 13:25:44 +1100 Subject: [PATCH 06/30] Change redis deps --- dependencies.gradle | 4 ++-- redis-concurrency-limit/build.gradle | 2 +- redis-persistence/dependencies.lock | 6 +++--- test-harness/dependencies.lock | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1ac6f148aa..fab1ca7641 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -26,14 +26,14 @@ ext { revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '4.0.15' + revGroovy = '4.0.9' revGrpc = '1.+' revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' revJAXB = '4.0.1' revJAXRS = '2.1.1' - revJedis = '3.3.0' + revJedis = '3.6.0' revJersey = '1.19.4' revJerseyCommon = '2.22.2' revJsonPath = '2.4.0' diff --git a/redis-concurrency-limit/build.gradle b/redis-concurrency-limit/build.gradle index 9c826ea612..7c0e56bf73 100644 --- a/redis-concurrency-limit/build.gradle +++ b/redis-concurrency-limit/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation project(':conductor-common') implementation project(':conductor-core') - implementation "redis.clients:jedis:3.6.0" // Jedis version "revJedis=3.3.0" does not play well with Spring Data Redis + implementation "redis.clients:jedis:${revJedis}" implementation "org.apache.commons:commons-lang3" testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 91dc3e073e..5105eeccfd 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -209,7 +209,7 @@ "locked": "0.0.17" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } }, "testCompileClasspath": { @@ -256,7 +256,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } }, "testRuntimeClasspath": { @@ -438,7 +438,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } } } \ No newline at end of file diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 896c3a70ea..a88afd582c 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -151,7 +151,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } }, "testRuntimeClasspath": { @@ -764,7 +764,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "3.6.0" } } } \ No newline at end of file From c05bb2bd43da02fadb15e4b1ac7452e19055c8c1 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 14:29:03 +1100 Subject: [PATCH 07/30] Chenge dependencies to 3.30 --- dependencies.gradle | 2 +- redis-concurrency-limit/dependencies.lock | 8 ++++---- redis-persistence/dependencies.lock | 6 +++--- server/dependencies.lock | 6 +++--- test-harness/dependencies.lock | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index fab1ca7641..989477bbb4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -33,7 +33,7 @@ ext { revHealth = '1.1.+' revJAXB = '4.0.1' revJAXRS = '2.1.1' - revJedis = '3.6.0' + revJedis = '3.3.0' revJersey = '1.19.4' revJerseyCommon = '2.22.2' revJsonPath = '2.4.0' diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 5db49ab3b0..42b16fff0e 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -36,7 +36,7 @@ "locked": "2.7.2" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "runtimeClasspath": { @@ -191,7 +191,7 @@ "locked": "2.21.0" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testCompileClasspath": { @@ -253,7 +253,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -444,7 +444,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 5105eeccfd..91dc3e073e 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -209,7 +209,7 @@ "locked": "0.0.17" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testCompileClasspath": { @@ -256,7 +256,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -438,7 +438,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } } } \ No newline at end of file diff --git a/server/dependencies.lock b/server/dependencies.lock index 5dbae2fe01..c6e1e1f1a5 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -525,7 +525,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "4.3.2" + "locked": "3.3.0" } }, "runtimeClasspath": { @@ -972,7 +972,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "4.3.2" + "locked": "3.3.0" } }, "testCompileClasspath": { @@ -1532,7 +1532,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "4.3.2" + "locked": "3.3.0" } } } \ No newline at end of file diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index a88afd582c..896c3a70ea 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -151,7 +151,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.6.0" + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -764,7 +764,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.6.0" + "locked": "3.3.0" } } } \ No newline at end of file From 7eea16d4bbc399c46840b87f91ae813299556444 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 14:33:27 +1100 Subject: [PATCH 08/30] Dependency locks --- annotations-processor/dependencies.lock | 54 +++++------ awss3-storage/dependencies.lock | 80 ++++++++-------- awssqs-event-queue/dependencies.lock | 76 ++++++++-------- client-spring/dependencies.lock | 72 +++++++-------- common/dependencies.lock | 78 ++++++++-------- grpc-client/dependencies.lock | 88 +++++++++--------- grpc-server/dependencies.lock | 112 +++++++++++------------ grpc/dependencies.lock | 116 ++++++++++++------------ http-task/dependencies.lock | 86 ++++++++++-------- json-jq-task/dependencies.lock | 84 ++++++++--------- redis-lock/dependencies.lock | 80 ++++++++-------- redis-persistence/dependencies.lock | 80 ++++++++-------- rest/dependencies.lock | 80 ++++++++-------- server/dependencies.lock | 6 +- 14 files changed, 549 insertions(+), 543 deletions(-) diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 86919f9a80..7c1fa68a84 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -24,19 +24,19 @@ "locked": "1.3.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" } }, "exampleCompileClasspath": { @@ -52,31 +52,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" } }, "runtimeClasspath": { @@ -102,31 +102,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" } }, "testCompileClasspath": { @@ -152,22 +152,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" @@ -202,34 +202,34 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "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/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index 1cea207215..8a2164ca42 100644 --- a/awss3-storage/dependencies.lock +++ b/awss3-storage/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.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": [ @@ -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": [ @@ -214,22 +214,22 @@ "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.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -246,33 +246,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": [ @@ -285,7 +285,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index bb3abfa93d..86ce71a3e3 100644 --- a/awssqs-event-queue/dependencies.lock +++ b/awssqs-event-queue/dependencies.lock @@ -24,19 +24,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" @@ -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" @@ -92,7 +92,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -229,22 +229,22 @@ "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.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" @@ -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" @@ -306,7 +306,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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-spring/dependencies.lock b/client-spring/dependencies.lock index 80b674bceb..2fed583976 100644 --- a/client-spring/dependencies.lock +++ b/client-spring/dependencies.lock @@ -18,19 +18,19 @@ "locked": "1.10.10" }, "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" @@ -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": [ @@ -166,7 +166,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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,7 +221,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" @@ -244,22 +244,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": { "locked": "3.1.4" @@ -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": [ @@ -404,7 +404,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.21.0" + "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.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-java-sdk" ], - "locked": "2.21.0" + "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.21.0" + "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.21.0" + "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,7 +462,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter": { "locked": "3.1.4" diff --git a/common/dependencies.lock b/common/dependencies.lock index 14d22c236a..e7e3de140c 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -49,46 +49,46 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "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-annotations-processor" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.21.0" + "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" @@ -103,19 +103,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.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" @@ -129,13 +129,13 @@ }, "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" @@ -153,42 +153,42 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "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" @@ -206,22 +206,22 @@ "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.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -235,13 +235,13 @@ }, "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" @@ -262,34 +262,34 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "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/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index ded151a55a..93559f2e66 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -18,34 +18,34 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "org.apache.commons:commons-lang3": { "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.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" @@ -93,19 +93,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -131,7 +131,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -139,7 +139,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -147,7 +147,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -155,7 +155,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -163,10 +163,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" } }, "testCompileClasspath": { @@ -183,13 +183,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "junit:junit": { "locked": "4.13.2" @@ -198,25 +198,25 @@ "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.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": "3.1.4" @@ -230,19 +230,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" @@ -270,19 +270,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -311,7 +311,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -319,7 +319,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -327,7 +327,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -335,7 +335,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -343,13 +343,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "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": "3.1.4" diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 39dd4092e3..510df3a46b 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -15,28 +15,28 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.0" }, "org.apache.commons:commons-lang3": { "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" @@ -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,40 +127,40 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "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": { "firstLevelTransitive": [ @@ -189,7 +189,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.59.0" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.59.0" }, "junit:junit": { "locked": "4.13.2" @@ -260,22 +260,22 @@ "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.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -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,43 +372,43 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.59.0" }, "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": { "firstLevelTransitive": [ @@ -440,7 +440,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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/grpc/dependencies.lock b/grpc/dependencies.lock index 7e8c281c52..0f0aa20574 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -12,28 +12,28 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.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" } }, "compileProtoPath": { @@ -41,19 +41,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.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -71,10 +71,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -96,40 +96,40 @@ "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" } }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.57.1" + "locked": "1.59.0" } }, "protobufToolsLocator_protoc": { @@ -142,19 +142,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.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -172,10 +172,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -197,35 +197,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" } }, "testCompileClasspath": { @@ -236,10 +236,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -248,22 +248,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" @@ -277,19 +277,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.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -307,10 +307,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -335,38 +335,38 @@ "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.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -380,19 +380,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.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -410,10 +410,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.0" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -438,38 +438,38 @@ "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.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/http-task/dependencies.lock b/http-task/dependencies.lock index 37576c7a0d..ffe79457b2 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -15,19 +15,19 @@ "locked": "1.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.springframework.boot:spring-boot-starter": { "locked": "3.1.4" @@ -41,33 +41,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": [ @@ -80,7 +80,7 @@ "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" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1" @@ -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": [ @@ -211,25 +211,28 @@ "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.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" }, + "org.bouncycastle:bcprov-jdk15on": { + "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" @@ -252,33 +255,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": [ @@ -291,7 +294,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -330,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" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1" @@ -370,7 +373,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": [ @@ -378,7 +381,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": [ @@ -386,7 +389,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": [ @@ -394,7 +397,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": [ @@ -402,13 +405,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.21.0" + "locked": "2.20.0" }, "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" }, + "org.bouncycastle:bcprov-jdk15on": { + "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" diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index a413c462e5..2f14684b9e 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.netflix.conductor:conductor-common": { "project": true @@ -18,19 +18,19 @@ "locked": "0.0.13" }, "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" @@ -41,33 +41,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": [ @@ -80,7 +80,7 @@ "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.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": [ @@ -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,22 +214,22 @@ "locked": "0.0.13" }, "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" @@ -243,33 +243,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": [ @@ -282,7 +282,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index 06d78b0242..2844982121 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -12,19 +12,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.redisson:redisson": { "locked": "3.13.3" @@ -38,33 +38,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": [ @@ -77,7 +77,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -208,22 +208,22 @@ "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.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.redisson:redisson": { "locked": "3.13.3" @@ -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" @@ -282,7 +282,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 91dc3e073e..2ad228f7d4 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -18,19 +18,19 @@ "locked": "1.4.20" }, "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.rarefiedredis.redis:redis-java": { "locked": "0.0.17" @@ -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": [ @@ -86,7 +86,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -229,22 +229,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.rarefiedredis.redis:redis-java": { "locked": "0.0.17" @@ -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.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": [ @@ -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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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/rest/dependencies.lock b/rest/dependencies.lock index 4e16d5516d..ef9d922b85 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -15,19 +15,19 @@ "locked": "1.1.4" }, "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.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" @@ -41,33 +41,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": [ @@ -80,7 +80,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": [ @@ -217,22 +217,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.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" @@ -252,33 +252,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": [ @@ -291,7 +291,7 @@ "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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.21.0" + "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/server/dependencies.lock b/server/dependencies.lock index c6e1e1f1a5..5dbae2fe01 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -525,7 +525,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "4.3.2" } }, "runtimeClasspath": { @@ -972,7 +972,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "4.3.2" } }, "testCompileClasspath": { @@ -1532,7 +1532,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "4.3.2" } } } \ No newline at end of file From e0d8c8d52bf444248fbf2f838cccab349775217d Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Mon, 23 Oct 2023 16:26:45 +1100 Subject: [PATCH 09/30] Change dependencies for jedis --- server/build.gradle | 1 + server/dependencies.lock | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index 1bee569167..c103fd3a38 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 5dbae2fe01..af9eb5869a 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -79,6 +79,9 @@ }, "org.springframework.retry:spring-retry": { "locked": "2.0.3" + }, + "redis.clients:jedis": { + "locked": "3.3.0" } }, "productionRuntimeClasspath": { @@ -525,7 +528,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "4.3.2" + "locked": "3.3.0" } }, "runtimeClasspath": { @@ -972,7 +975,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "4.3.2" + "locked": "3.3.0" } }, "testCompileClasspath": { @@ -1074,6 +1077,9 @@ }, "org.springframework.retry:spring-retry": { "locked": "2.0.3" + }, + "redis.clients:jedis": { + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -1532,7 +1538,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "4.3.2" + "locked": "3.3.0" } } } \ No newline at end of file From ec0efe5d342decf9690cbeff3bd5d3e8c4a2798c Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Tue, 24 Oct 2023 08:29:59 +1100 Subject: [PATCH 10/30] Restore jedis dependencies --- redis-concurrency-limit/build.gradle | 2 +- redis-concurrency-limit/dependencies.lock | 2 +- redis-persistence/dependencies.lock | 6 +++--- .../redis/dynoqueue/ConfigurationHostSupplier.java | 3 +++ server/dependencies.lock | 10 +++++----- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/redis-concurrency-limit/build.gradle b/redis-concurrency-limit/build.gradle index 7c0e56bf73..9c826ea612 100644 --- a/redis-concurrency-limit/build.gradle +++ b/redis-concurrency-limit/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation project(':conductor-common') implementation project(':conductor-core') - implementation "redis.clients:jedis:${revJedis}" + 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}" diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 42b16fff0e..95349fca9c 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -444,7 +444,7 @@ "locked": "1.15.3" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.6.0" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 2ad228f7d4..239bfefa65 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -209,7 +209,7 @@ "locked": "0.0.17" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.8.0" } }, "testCompileClasspath": { @@ -256,7 +256,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.8.0" } }, "testRuntimeClasspath": { @@ -438,7 +438,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.8.0" } } } \ No newline at end of file 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 9e32a1d5f0..2ae22e7d0e 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/server/dependencies.lock b/server/dependencies.lock index af9eb5869a..6240ffc926 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -81,7 +81,7 @@ "locked": "2.0.3" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.8.0" } }, "productionRuntimeClasspath": { @@ -528,7 +528,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "3.8.0" } }, "runtimeClasspath": { @@ -975,7 +975,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "3.8.0" } }, "testCompileClasspath": { @@ -1079,7 +1079,7 @@ "locked": "2.0.3" }, "redis.clients:jedis": { - "locked": "3.3.0" + "locked": "3.8.0" } }, "testRuntimeClasspath": { @@ -1538,7 +1538,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.3.0" + "locked": "3.8.0" } } } \ No newline at end of file From 2934b72a4cf3e718badd87d9f18543c8d1a8734a Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Tue, 24 Oct 2023 08:56:12 +1100 Subject: [PATCH 11/30] Upgrade Spring 3 --- cassandra-persistence/build.gradle | 2 +- cassandra-persistence/dependencies.lock | 16 ++++++++-------- client/build.gradle | 2 +- client/dependencies.lock | 16 ++++++++-------- core/build.gradle | 2 +- core/dependencies.lock | 16 ++++++++-------- dependencies.gradle | 2 +- java-sdk/build.gradle | 2 +- java-sdk/dependencies.lock | 16 ++++++++-------- redis-concurrency-limit/build.gradle | 2 +- redis-concurrency-limit/dependencies.lock | 16 ++++++++-------- test-harness/build.gradle | 2 +- test-harness/dependencies.lock | 16 ++++++++-------- 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle index 6fee6f8ff0..1d6745c61c 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 605c15c451..f0097ab6c7 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -231,17 +231,17 @@ "org.apache.logging.log4j:log4j-web": { "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": "3.1.4" @@ -413,8 +413,8 @@ ], "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,10 +426,10 @@ "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": "3.1.4" diff --git a/client/build.gradle b/client/build.gradle index b16dd4e183..2ffd092eda 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 874894fd28..12b9fdcb0f 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -221,8 +221,8 @@ "org.apache.logging.log4j:log4j-web": { "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,10 +240,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.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" @@ -360,8 +360,8 @@ ], "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,10 +379,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.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" diff --git a/core/build.gradle b/core/build.gradle index 7a56014e88..82881e7a8c 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 9fd620f904..16f50d44c0 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -254,8 +254,8 @@ "org.apache.logging.log4j:log4j-web": { "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,10 +267,10 @@ "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": "3.1.4" @@ -361,8 +361,8 @@ ], "locked": "3.12.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" @@ -374,10 +374,10 @@ "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": "3.1.4" diff --git a/dependencies.gradle b/dependencies.gradle index 989477bbb4..8dd6cdc4a5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -50,7 +50,7 @@ ext { 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/java-sdk/build.gradle b/java-sdk/build.gradle index 6572905d2e..0f9a211f9a 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 db75fe6ee9..86dbc1d7c2 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -257,8 +257,8 @@ "org.apache.logging.log4j:log4j-web": { "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,10 +270,10 @@ "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": "3.1.4" @@ -435,8 +435,8 @@ ], "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,10 +457,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.springframework.boot:spring-boot-starter-log4j2": { "locked": "3.1.4" diff --git a/redis-concurrency-limit/build.gradle b/redis-concurrency-limit/build.gradle index 9c826ea612..b0061578d0 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 95349fca9c..7257234ea3 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -225,17 +225,17 @@ "org.apache.logging.log4j:log4j-web": { "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": "3.1.4" @@ -410,8 +410,8 @@ ], "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" @@ -423,10 +423,10 @@ "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": "3.1.4" diff --git a/test-harness/build.gradle b/test-harness/build.gradle index 7adc179e3c..8ef63eb8d4 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 896c3a70ea..d4ff0d9705 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -114,8 +114,8 @@ "org.apache.logging.log4j:log4j-web": { "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,10 +130,10 @@ "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": "3.1.4" @@ -639,8 +639,8 @@ ], "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": [ From 3f8b5a4a7ac8ae098f9e60642cfd3401d12983b8 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Tue, 24 Oct 2023 18:04:59 +1100 Subject: [PATCH 12/30] Delete test from test --- .../core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy index 3673c00911..f9270d336e 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy @@ -45,7 +45,6 @@ class IsolatedTaskQueueProducerSpec extends Specification { Duration.ofSeconds(10)) } - @Test def "addTaskQueuesAddsElementToQueue"() { given: TaskDef taskDef = new TaskDef(isolationGroupId: "isolated") From 35bfdb437009388e557ee49bf541e93266744afa Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Tue, 24 Oct 2023 18:11:28 +1100 Subject: [PATCH 13/30] Spotless --- .../execution/tasks/IsolatedTaskQueueProducerSpec.groovy | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 f9270d336e..a726cef111 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 @@ -12,16 +12,13 @@ */ 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 - import spock.lang.Specification import spock.lang.Subject +import java.time.Duration + class IsolatedTaskQueueProducerSpec extends Specification { SystemTaskWorker systemTaskWorker From d9abb58a4f5874e4d9584c6091fb9ab303b4ec9e Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Wed, 25 Oct 2023 07:19:32 +1100 Subject: [PATCH 14/30] Spotless --- .../execution/tasks/IsolatedTaskQueueProducerSpec.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 a726cef111..1dd2eeec12 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 @@ -12,13 +12,14 @@ */ package com.netflix.conductor.core.execution.tasks +import java.time.Duration + import com.netflix.conductor.common.metadata.tasks.TaskDef import com.netflix.conductor.service.MetadataService + import spock.lang.Specification import spock.lang.Subject -import java.time.Duration - class IsolatedTaskQueueProducerSpec extends Specification { SystemTaskWorker systemTaskWorker From ecc6168e2776101eed1f6684fc704996d65d8e03 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Wed, 25 Oct 2023 14:24:40 +1100 Subject: [PATCH 15/30] Change annotations to jakarta --- annotations-processor/build.gradle | 2 +- annotations-processor/dependencies.lock | 16 ++++++------- .../protogen/ProtoGen.java | 2 +- common/dependencies.lock | 4 ++-- grpc-client/dependencies.lock | 8 +++---- .../conductor/client/grpc/ClientBase.java | 2 +- .../conductor/client/grpc/MetadataClient.java | 2 +- .../conductor/client/grpc/TaskClient.java | 2 +- .../conductor/client/grpc/WorkflowClient.java | 2 +- grpc-server/dependencies.lock | 8 +++---- .../grpc/server/service/GRPCHelper.java | 2 +- grpc/build.gradle | 2 +- grpc/dependencies.lock | 24 +++++++++---------- .../conductor/grpc/AbstractProtoMapper.java | 2 +- server/dependencies.lock | 12 +++++----- test-harness/dependencies.lock | 4 ++-- 16 files changed, 47 insertions(+), 47 deletions(-) diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index 2bb9a52aa3..aa04aa7583 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -9,7 +9,7 @@ dependencies { 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 '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 7c1fa68a84..1eb879f687 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -20,8 +20,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" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.20.0" @@ -95,8 +95,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" }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ @@ -145,8 +145,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" @@ -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" 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 a2550d3699..a82d1af773 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,7 @@ import java.net.URLClassLoader; import java.util.*; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import javax.lang.model.element.Modifier; import com.netflix.conductor.annotations.protogen.ProtoMessage; diff --git a/common/dependencies.lock b/common/dependencies.lock index e7e3de140c..d0093024ee 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -38,11 +38,11 @@ ], "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": [ diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 93559f2e66..16f40f8087 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -107,11 +107,11 @@ ], "locked": "1.59.0" }, - "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": [ @@ -284,11 +284,11 @@ ], "locked": "1.59.0" }, - "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" 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 5b299a93b9..de89f562f5 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,7 +14,7 @@ import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 256f33b100..54fc530dd9 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,7 +14,7 @@ import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.StringUtils; 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 92403d8a42..3460f2d3aa 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,7 +16,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.StringUtils; 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 fd211f0af1..af9041626e 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,7 +16,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.StringUtils; diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 510df3a46b..f1573150ae 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -162,11 +162,11 @@ ], "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": [ @@ -410,11 +410,11 @@ ], "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" 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 0dd626fa62..da64399a0d 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,7 +14,7 @@ import java.util.Arrays; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; diff --git a/grpc/build.gradle b/grpc/build.gradle index 6286e2a0f6..889ef75c1f 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -33,7 +33,7 @@ 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:2.1.1" } def artifactName = 'com.google.protobuf:protoc:3.14.0:osx-x86_64' diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 0f0aa20574..3b4acd03f4 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -17,8 +17,8 @@ "io.grpc:grpc-stub": { "locked": "1.59.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.20.0" @@ -76,8 +76,8 @@ "io.grpc:grpc-stub": { "locked": "1.59.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -177,8 +177,8 @@ "io.grpc:grpc-stub": { "locked": "1.59.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ @@ -241,8 +241,8 @@ "io.grpc:grpc-stub": { "locked": "1.59.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" @@ -312,8 +312,8 @@ "io.grpc:grpc-stub": { "locked": "1.59.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" @@ -415,8 +415,8 @@ "io.grpc:grpc-stub": { "locked": "1.59.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" 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 c9cd06e381..d2c26b3b8f 100644 --- a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java +++ b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java @@ -49,7 +49,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Generated; +import jakarta.annotation.Generated; @Generated("com.netflix.conductor.annotationsprocessor.protogen") public abstract class AbstractProtoMapper { diff --git a/server/dependencies.lock b/server/dependencies.lock index 6240ffc926..32f5a5fe2e 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -318,11 +318,11 @@ ], "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": [ @@ -765,11 +765,11 @@ ], "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": [ @@ -1319,11 +1319,11 @@ ], "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": [ diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index d4ff0d9705..081ccce762 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -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": [ From a012329811e1f624e7da6f5a838d346402a853d0 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 08:31:39 +1100 Subject: [PATCH 16/30] Restore jackson version --- cassandra-persistence/dependencies.lock | 16 ++++++------- client/dependencies.lock | 28 +++++++++++------------ core/dependencies.lock | 28 +++++++++++------------ es6-persistence/dependencies.lock | 16 ++++++------- java-sdk/dependencies.lock | 26 ++++++++++----------- redis-concurrency-limit/dependencies.lock | 16 ++++++------- test-harness/dependencies.lock | 16 ++++++------- 7 files changed, 73 insertions(+), 73 deletions(-) diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index f0097ab6c7..e47c63706d 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -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": [ @@ -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": [ diff --git a/client/dependencies.lock b/client/dependencies.lock index 12b9fdcb0f..b0e0ed8369 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.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.netflix.conductor:conductor-common": { "project": true @@ -68,25 +68,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.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": [ @@ -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 @@ -260,25 +260,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.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": [ diff --git a/core/dependencies.lock b/core/dependencies.lock index 16f50d44c0..fb98c84332 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -6,13 +6,13 @@ }, "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" @@ -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" @@ -192,13 +192,13 @@ }, "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" @@ -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" diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 37a8002a0d..6322fb84c2 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -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": [ @@ -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": [ diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 86dbc1d7c2..698aaa070c 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.3" + "locked": "2.13.5" }, "com.google.guava:guava": { "locked": "30.0-jre" @@ -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" @@ -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" @@ -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" diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 7257234ea3..161114df4b 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -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": [ @@ -261,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": [ diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 081ccce762..11b03fd591 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -40,10 +40,10 @@ }, "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" @@ -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": [ From e04057fe819b6e1fa6d8cbcf283393142794e046 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 08:33:28 +1100 Subject: [PATCH 17/30] Restore jedis version --- redis-persistence/dependencies.lock | 6 +++--- server/dependencies.lock | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 239bfefa65..2ad228f7d4 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -209,7 +209,7 @@ "locked": "0.0.17" }, "redis.clients:jedis": { - "locked": "3.8.0" + "locked": "3.3.0" } }, "testCompileClasspath": { @@ -256,7 +256,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.8.0" + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -438,7 +438,7 @@ "locked": "3.1.4" }, "redis.clients:jedis": { - "locked": "3.8.0" + "locked": "3.3.0" } } } \ No newline at end of file diff --git a/server/dependencies.lock b/server/dependencies.lock index 32f5a5fe2e..0900f79f0b 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -81,7 +81,7 @@ "locked": "2.0.3" }, "redis.clients:jedis": { - "locked": "3.8.0" + "locked": "3.3.0" } }, "productionRuntimeClasspath": { @@ -528,7 +528,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } }, "runtimeClasspath": { @@ -975,7 +975,7 @@ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } }, "testCompileClasspath": { @@ -1079,7 +1079,7 @@ "locked": "2.0.3" }, "redis.clients:jedis": { - "locked": "3.8.0" + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -1538,7 +1538,7 @@ "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 From 40546724a5df32a734f449658869dba7e17e620e Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 08:55:03 +1100 Subject: [PATCH 18/30] Add workaround ffor javax annotations in generated grpc items --- grpc/build.gradle | 2 ++ grpc/dependencies.lock | 18 ++++++++++++++++++ .../conductor/grpc/AbstractProtoMapper.java | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/grpc/build.gradle b/grpc/build.gradle index 889ef75c1f..fcdd3008a6 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -34,6 +34,8 @@ dependencies { implementation "io.grpc:grpc-protobuf:${revGrpc}" implementation "io.grpc:grpc-stub:${revGrpc}" implementation "jakarta.annotation:jakarta.annotation-api:2.1.1" + 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' diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 3b4acd03f4..304929b3c8 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -20,6 +20,9 @@ "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.20.0" }, @@ -79,6 +82,9 @@ "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "locked": "1.3.2" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -180,6 +186,9 @@ "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "locked": "1.3.2" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -244,6 +253,9 @@ "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "locked": "1.3.2" + }, "junit:junit": { "locked": "4.13.2" }, @@ -315,6 +327,9 @@ "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "locked": "1.3.2" + }, "junit:junit": { "locked": "4.13.2" }, @@ -418,6 +433,9 @@ "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" }, + "javax.annotation:javax.annotation-api": { + "locked": "1.3.2" + }, "junit:junit": { "locked": "4.13.2" }, 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 d2c26b3b8f..8548d9120a 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 jakarta.annotation.Generated; @Generated("com.netflix.conductor.annotationsprocessor.protogen") public abstract class AbstractProtoMapper { From a5659f8d628f93d8621e8eb46e137c46a94950ec Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 09:08:22 +1100 Subject: [PATCH 19/30] Change shppe of HTTP Task --- .../java/com/netflix/conductor/tasks/http/HttpTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ed8abd2adb..917968349c 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,7 +167,7 @@ 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()); } @@ -254,7 +254,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<>(); @@ -268,7 +268,7 @@ public static class Input { /** * @return the method */ - public HttpMethod getMethod() { + public String getMethod() { return method; } @@ -276,7 +276,7 @@ public HttpMethod getMethod() { * @param method the method to set */ public void setMethod(String method) { - this.method = HttpMethod.valueOf(method); + this.method = method; } /** From bfd80dc4b3040a573d81fafae46f2d5f6c8bd4c3 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 09:38:49 +1100 Subject: [PATCH 20/30] HIX Fix task tests --- dependencies.gradle | 1 + http-task/build.gradle | 1 + http-task/dependencies.lock | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/dependencies.gradle b/dependencies.gradle index 8dd6cdc4a5..86660cca01 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -31,6 +31,7 @@ ext { revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' + revApacheHttpComponentsClient5 = '5.2.1' revJAXB = '4.0.1' revJAXRS = '2.1.1' revJedis = '3.3.0' diff --git a/http-task/build.gradle b/http-task/build.gradle index a9f76899e7..93bbe25993 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 ffe79457b2..61d1daff81 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -14,6 +14,9 @@ "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.20.0" }, @@ -136,6 +139,9 @@ "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", @@ -207,6 +213,9 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "junit:junit": { "locked": "4.13.2" }, @@ -350,6 +359,9 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "junit:junit": { "locked": "4.13.2" }, From b00fad642307a27e471447ddc0a6190cbbd45cd4 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 10:19:32 +1100 Subject: [PATCH 21/30] Add stuff --- dependencies.gradle | 4 +++- grpc-client/build.gradle | 1 + grpc-client/dependencies.lock | 6 ------ grpc/build.gradle | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 86660cca01..81f4eaec01 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,6 +16,7 @@ */ ext { revActivation = '3.0.2' + revApacheHttpComponentsClient5 = '5.2.1' revAwaitility = '3.1.6' revAwsSdk = '1.11.86' revBval = '2.0.5' @@ -31,7 +32,8 @@ ext { revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' - revApacheHttpComponentsClient5 = '5.2.1' + revProtoBuf = '3.21.7' + revJakartaAnnotation = '2.1.1' revJAXB = '4.0.1' revJAXRS = '2.1.1' revJedis = '3.3.0' diff --git a/grpc-client/build.gradle b/grpc-client/build.gradle index 4ddd6bc719..d7e6d72395 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 16f40f8087..ef9ae15e2d 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -108,9 +108,6 @@ "locked": "1.59.0" }, "jakarta.annotation:jakarta.annotation-api": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" - ], "locked": "2.1.1" }, "org.apache.bval:bval-jsr": { @@ -285,9 +282,6 @@ "locked": "1.59.0" }, "jakarta.annotation:jakarta.annotation-api": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" - ], "locked": "2.1.1" }, "junit:junit": { diff --git a/grpc/build.gradle b/grpc/build.gradle index fcdd3008a6..08daa198c3 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation "com.google.protobuf:protobuf-java:${revProtoBuf}" implementation "io.grpc:grpc-protobuf:${revGrpc}" implementation "io.grpc:grpc-stub:${revGrpc}" - implementation "jakarta.annotation:jakarta.annotation-api:2.1.1" + 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 } From d1041a196acccc0b0b15ea8dca94bd81bbed9c2b Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 10:30:05 +1100 Subject: [PATCH 22/30] Stopless --- .../conductor/annotationsprocessor/protogen/ProtoGen.java | 2 +- .../java/com/netflix/conductor/client/grpc/ClientBase.java | 3 +-- .../com/netflix/conductor/client/grpc/MetadataClient.java | 3 +-- .../java/com/netflix/conductor/client/grpc/TaskClient.java | 3 +-- .../com/netflix/conductor/client/grpc/WorkflowClient.java | 3 +-- .../netflix/conductor/grpc/server/service/GRPCHelper.java | 3 +-- .../java/com/netflix/conductor/tasks/http/HttpTask.java | 6 +++++- 7 files changed, 11 insertions(+), 12 deletions(-) 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 a82d1af773..e694918c38 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 jakarta.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/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 de89f562f5..0450547c53 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 jakarta.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 54fc530dd9..83e51cd647 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 jakarta.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 3460f2d3aa..0cbf37c997 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 jakarta.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 af9041626e..86c78e682b 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 jakarta.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/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 da64399a0d..4b0cae8bbc 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 jakarta.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/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 917968349c..d388b165e2 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,7 +167,11 @@ protected HttpResponse httpCall(Input input) throws Exception { HttpResponse response = new HttpResponse(); try { ResponseEntity responseEntity = - restTemplate.exchange(input.getUri(), HttpMethod.valueOf(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()); } From bdd5be113f4c57cafdd6b4ab56ae028668396736 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 11:01:10 +1100 Subject: [PATCH 23/30] Upgrade to Spring --- .../DefaultRestTemplateProvider.java | 18 +++++++++++++----- .../conductor/tasks/http/HttpTaskTest.java | 19 ++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) 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 d460e36f63..48378d0a98 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,25 @@ 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 f826625560..26e38a5cad 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 @@ -78,7 +78,8 @@ public static void init() throws Exception { map.put("SomeKey", null); JSON_RESPONSE = objectMapper.writeValueAsString(map); - final TypeReference> mapOfObj = new TypeReference<>() {}; + final TypeReference> mapOfObj = new TypeReference<>() { + }; MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort()); client.when(HttpRequest.request().withPath("/post").withMethod("POST")) @@ -315,7 +316,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 @@ -361,13 +362,13 @@ public void testOptional() { SystemTaskRegistry systemTaskRegistry = mock(SystemTaskRegistry.class); new DeciderService( - new IDGenerator(), - parametersUtils, - metadataDAO, - externalPayloadStorageUtils, - systemTaskRegistry, - Collections.emptyMap(), - Duration.ofMinutes(60)) + new IDGenerator(), + parametersUtils, + metadataDAO, + externalPayloadStorageUtils, + systemTaskRegistry, + Collections.emptyMap(), + Duration.ofMinutes(60)) .decide(workflow); } } From 34099926ec047daf35d152e5b8a657b69361a802 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 11:03:11 +1100 Subject: [PATCH 24/30] Spotless --- .../providers/DefaultRestTemplateProvider.java | 15 +++++++++------ .../conductor/tasks/http/HttpTaskTest.java | 17 ++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) 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 48378d0a98..0a1cfd2f71 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 @@ -51,16 +51,19 @@ public DefaultRestTemplateProvider( @Override public @NonNull RestTemplate getRestTemplate(@NonNull HttpTask.Input input) { - Duration timeout = Duration.ofMillis(Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout)); + Duration timeout = + Duration.ofMillis( + Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout)); threadLocalRestTemplateBuilder.get().setReadTimeout(timeout); - RestTemplate restTemplate = threadLocalRestTemplateBuilder.get().setReadTimeout(timeout).build(); + 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 - )); + builder.setSoTimeout( + Timeout.of( + Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout), + TimeUnit.MILLISECONDS)); requestFactory.setConnectTimeout( Optional.ofNullable(input.getConnectionTimeOut()).orElse(defaultConnectTimeout)); restTemplate.setRequestFactory(requestFactory); 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 26e38a5cad..2b2f6a6df4 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 @@ -78,8 +78,7 @@ public static void init() throws Exception { map.put("SomeKey", null); JSON_RESPONSE = objectMapper.writeValueAsString(map); - final TypeReference> mapOfObj = new TypeReference<>() { - }; + final TypeReference> mapOfObj = new TypeReference<>() {}; MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort()); client.when(HttpRequest.request().withPath("/post").withMethod("POST")) @@ -362,13 +361,13 @@ public void testOptional() { SystemTaskRegistry systemTaskRegistry = mock(SystemTaskRegistry.class); new DeciderService( - new IDGenerator(), - parametersUtils, - metadataDAO, - externalPayloadStorageUtils, - systemTaskRegistry, - Collections.emptyMap(), - Duration.ofMinutes(60)) + new IDGenerator(), + parametersUtils, + metadataDAO, + externalPayloadStorageUtils, + systemTaskRegistry, + Collections.emptyMap(), + Duration.ofMinutes(60)) .decide(workflow); } } From 22c0b172cec4f2ad7554004355c048ee4b6f77fe Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 11:15:21 +1100 Subject: [PATCH 25/30] Disable test --- .../test/java/com/netflix/conductor/grpc/TestProtoMapper.java | 2 +- .../tasks/http/providers/DefaultRestTemplateProviderTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 31286609a4..80d9f08e02 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/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 816f5d6f95..0f34433efe 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 @@ -15,6 +15,7 @@ import java.time.Duration; import org.junit.Test; +import org.junit.jupiter.api.Disabled; import org.springframework.web.client.RestTemplate; import com.netflix.conductor.tasks.http.HttpTask; @@ -45,6 +46,7 @@ public void differentObjectsForDifferentThreads() throws InterruptedException { assertEquals(result.toString(), "different"); } + @Disabled("We can no longer do this and have customizable timeouts per HttpTask.") @Test public void sameObjectForSameThread() { DefaultRestTemplateProvider defaultRestTemplateProvider = From 5306afb03cbf12abf432e69e6dc17de86a4b259b Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 11:16:58 +1100 Subject: [PATCH 26/30] Disable test --- .../tasks/http/providers/DefaultRestTemplateProviderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0f34433efe..3141e47e5d 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,8 +14,8 @@ import java.time.Duration; +import org.junit.Ignore; import org.junit.Test; -import org.junit.jupiter.api.Disabled; import org.springframework.web.client.RestTemplate; import com.netflix.conductor.tasks.http.HttpTask; @@ -46,8 +46,8 @@ public void differentObjectsForDifferentThreads() throws InterruptedException { assertEquals(result.toString(), "different"); } - @Disabled("We can no longer do this and have customizable timeouts per HttpTask.") @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)); From d89154a8b90c854cc5a57ab63e4d348530b54a33 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 11:38:49 +1100 Subject: [PATCH 27/30] Change protoc dependencies --- annotations-processor/build.gradle | 2 +- annotations-processor/dependencies.lock | 8 ++++---- awss3-storage/dependencies.lock | 4 ++-- awssqs-event-queue/dependencies.lock | 4 ++-- cassandra-persistence/dependencies.lock | 6 +++--- client-spring/dependencies.lock | 4 ++-- client/dependencies.lock | 4 ++-- common/dependencies.lock | 10 +++++----- core/dependencies.lock | 8 ++++---- dependencies.gradle | 4 ++-- es6-persistence/dependencies.lock | 4 ++-- grpc-client/dependencies.lock | 8 ++++---- grpc/build.gradle | 4 ++-- grpc/dependencies.lock | 12 ++++++------ http-task/dependencies.lock | 4 ++-- java-sdk/dependencies.lock | 4 ++-- json-jq-task/dependencies.lock | 4 ++-- redis-concurrency-limit/dependencies.lock | 6 +++--- redis-lock/dependencies.lock | 4 ++-- redis-persistence/dependencies.lock | 4 ++-- rest/dependencies.lock | 4 ++-- server/dependencies.lock | 4 ++-- test-harness/dependencies.lock | 4 ++-- 23 files changed, 60 insertions(+), 60 deletions(-) diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index aa04aa7583..5e0c28d3b7 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -8,7 +8,7 @@ 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 'com.google.protobuf:protobuf-java:3.21.12' api 'jakarta.annotation:jakarta.annotation-api:2.1.1' api gradleApi() diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 1eb879f687..f0c8b22ee1 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index 8a2164ca42..c8239eb172 100644 --- a/awss3-storage/dependencies.lock +++ b/awss3-storage/dependencies.lock @@ -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": [ @@ -279,7 +279,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index 86ce71a3e3..3bb1559cd1 100644 --- a/awssqs-event-queue/dependencies.lock +++ b/awssqs-event-queue/dependencies.lock @@ -86,7 +86,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": [ @@ -300,7 +300,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index e47c63706d..f7503712c2 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -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": [ @@ -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 @@ -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": [ diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock index 2fed583976..c9914c60a9 100644 --- a/client-spring/dependencies.lock +++ b/client-spring/dependencies.lock @@ -90,7 +90,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "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": [ diff --git a/client/dependencies.lock b/client/dependencies.lock index b0e0ed8369..103511e987 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -92,7 +92,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -284,7 +284,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ diff --git a/common/dependencies.lock b/common/dependencies.lock index d0093024ee..b8ea321120 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -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": [ @@ -91,7 +91,7 @@ "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -138,7 +138,7 @@ "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -191,7 +191,7 @@ "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -244,7 +244,7 @@ "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true diff --git a/core/dependencies.lock b/core/dependencies.lock index fb98c84332..cef256a971 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -18,7 +18,7 @@ "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" @@ -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" @@ -204,7 +204,7 @@ "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" @@ -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" diff --git a/dependencies.gradle b/dependencies.gradle index 81f4eaec01..f083bbcd19 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -32,7 +32,7 @@ ext { revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' - revProtoBuf = '3.21.7' + revProtoBuf = '3.21.12' revJakartaAnnotation = '2.1.1' revJAXB = '4.0.1' revJAXRS = '2.1.1' @@ -46,7 +46,7 @@ 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' diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 6322fb84c2..32aa282aa3 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -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": [ @@ -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": [ diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index ef9ae15e2d..58759f5deb 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -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 @@ -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": [ @@ -171,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 @@ -249,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": [ diff --git a/grpc/build.gradle b/grpc/build.gradle index 08daa198c3..c75b2f7e7f 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -41,13 +41,13 @@ dependencies { def artifactName = 'com.google.protobuf:protoc:3.14.0:osx-x86_64' switch (org.gradle.internal.os.OperatingSystem.current()) { case org.gradle.internal.os.OperatingSystem.LINUX: - artifactName = "com.google.protobuf:protoc:3.21.7" + artifactName = "com.google.protobuf:protoc:3.21.12" break; case org.gradle.internal.os.OperatingSystem.MAC_OS: artifactName = "com.google.protobuf:protoc:3.14.0:osx-x86_64" break; case org.gradle.internal.os.OperatingSystem.WINDOWS: - artifactName = "com.google.protobuf:protoc:3.21.7" + artifactName = "com.google.protobuf:protoc:3.21.12" break; } diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 304929b3c8..604165dddd 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -62,7 +62,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 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -239,7 +239,7 @@ }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -307,7 +307,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -413,7 +413,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index 61d1daff81..9004cb56db 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -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": [ @@ -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": [ diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 698aaa070c..5720f68a45 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -95,7 +95,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -332,7 +332,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index 2f14684b9e..010c2e4344 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -276,7 +276,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 161114df4b..936087215e 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -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": [ @@ -196,7 +196,7 @@ }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -294,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": [ diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index 2844982121..82ba265898 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -71,7 +71,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -276,7 +276,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 2ad228f7d4..4da148cadb 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -80,7 +80,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -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": [ diff --git a/rest/dependencies.lock b/rest/dependencies.lock index ef9d922b85..77e50509ff 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -285,7 +285,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/server/dependencies.lock b/server/dependencies.lock index 0900f79f0b..2891ffd93f 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -980,7 +980,7 @@ }, "testCompileClasspath": { "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-awss3-storage": { "project": true @@ -1147,7 +1147,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 11b03fd591..c0444dceda 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -49,7 +49,7 @@ "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 @@ -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": [ From a7e332a1b592d702a7ba946dc100ac9b62e3e86b Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 11:57:34 +1100 Subject: [PATCH 28/30] Dependencies --- dependencies.gradle | 2 +- grpc-client/dependencies.lock | 24 ++++++++++++------------ grpc-server/dependencies.lock | 28 ++++++++++++++-------------- grpc/dependencies.lock | 26 +++++++++++++------------- server/dependencies.lock | 32 ++++++++++++++++---------------- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f083bbcd19..2a9d9f64f7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -28,7 +28,7 @@ ext { revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' revGroovy = '4.0.9' - revGrpc = '1.+' + revGrpc = '1.57.2' revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 58759f5deb..9876ffb924 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -18,13 +18,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -93,19 +93,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" @@ -180,13 +180,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "junit:junit": { "locked": "4.13.2" @@ -267,19 +267,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index f1573150ae..144391fc1d 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -15,10 +15,10 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.0" + "locked": "1.57.2" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -127,22 +127,22 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -245,13 +245,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.0" + "locked": "1.57.2" }, "junit:junit": { "locked": "4.13.2" @@ -372,25 +372,25 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 604165dddd..c36eb50e68 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -12,10 +12,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" @@ -74,10 +74,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" @@ -135,7 +135,7 @@ }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.59.0" + "locked": "1.57.2" } }, "protobufToolsLocator_protoc": { @@ -178,10 +178,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" @@ -245,10 +245,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" @@ -319,10 +319,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" @@ -425,10 +425,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "jakarta.annotation:jakarta.annotation-api": { "locked": "2.1.1" diff --git a/server/dependencies.lock b/server/dependencies.lock index 2891ffd93f..cb77006eda 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -276,25 +276,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -723,25 +723,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1022,13 +1022,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1274,28 +1274,28 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.0" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.0" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" From 822e7317a364070dc538bbb4e94f8e9c8e29f23c Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Thu, 26 Oct 2023 12:45:15 +1100 Subject: [PATCH 29/30] Fix dependencies pointing to framework 5 --- java-sdk/dependencies.lock | 4 ++-- test-harness/dependencies.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 5720f68a45..273c00559e 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -282,7 +282,7 @@ "locked": "3.1.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "6.0.12" } }, "testRuntimeClasspath": { @@ -469,7 +469,7 @@ "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/test-harness/dependencies.lock b/test-harness/dependencies.lock index c0444dceda..95bb8411dc 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -145,7 +145,7 @@ "locked": "1.3.3" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "6.0.12" }, "org.testcontainers:elasticsearch": { "locked": "1.15.3" @@ -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" From 741fc7c9056277f3568732223851d3d80ce596a1 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Fri, 3 Nov 2023 15:48:20 +1100 Subject: [PATCH 30/30] Delete orkes queue dependency --- .../dynoqueue/ConfigurationHostSupplier.java | 3 --- server/build.gradle | 1 - server/dependencies.lock | 20 +++++-------------- test-harness/dependencies.lock | 6 ------ 4 files changed, 5 insertions(+), 25 deletions(-) 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 2ae22e7d0e..9e32a1d5f0 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,9 +40,6 @@ 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/server/build.gradle b/server/build.gradle index c103fd3a38..3e06fd4d63 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -40,7 +40,6 @@ dependencies { implementation "redis.clients:jedis:${revJedis}" implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation "io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}" implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}" diff --git a/server/dependencies.lock b/server/dependencies.lock index cb77006eda..091eb4d2ae 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -41,9 +41,7 @@ "com.netflix.conductor:conductor-rest": { "project": true }, - "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" - }, + "org.apache.logging.log4j:log4j-api": { "locked": "2.20.0" }, @@ -296,9 +294,7 @@ ], "locked": "1.57.2" }, - "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" - }, + "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", @@ -743,9 +739,7 @@ ], "locked": "1.57.2" }, - "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" - }, + "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", @@ -1030,9 +1024,7 @@ "io.grpc:grpc-testing": { "locked": "1.57.2" }, - "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" - }, + "junit:junit": { "locked": "4.13.2" }, @@ -1297,9 +1289,7 @@ "io.grpc:grpc-testing": { "locked": "1.57.2" }, - "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" - }, + "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 95bb8411dc..7b3f9f1632 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -449,12 +449,6 @@ ], "locked": "1.57.1" }, - "io.orkes.queues:orkes-conductor-queues": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-server" - ], - "locked": "1.0.3" - }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue",