diff --git a/.gitattributes b/.gitattributes index 6e4598114..d226ef697 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,10 @@ +gradlew eol=lf +*.gradle eol=lf +*.java eol=lf +*.groovy eol=lf +spring.factories eol=lf +*.sh eol=lf + docs/* linguist-documentation server/src/main/resources/swagger-ui/* linguist-vendored diff --git a/.gitignore b/.gitignore index 6bf71b0ef..95729213a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ buildscan.log # JS & UI Related node_modules /ui/build +/ui/public/monaco-editor # publishing secrets secrets/signing-key diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b9c30c329..425e79778 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1 +1 @@ -[Code of Conduct](docs/docs/resources/code-of-conduct.md) \ No newline at end of file +[Code of Conduct](https://orkes.io/orkes-conductor-community-code-of-conduct) \ No newline at end of file diff --git a/README.md b/README.md index 3a2c256e0..c9525ae62 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,83 @@ ![Conductor](docs/docs/img/logo.png) -# Conductor [![Github release](https://img.shields.io/github/v/release/Netflix/conductor.svg)](https://GitHub.com/Netflix/conductor/releases) -[![CI](https://github.com/Netflix/conductor/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Netflix/conductor/actions/workflows/ci.yml) [![License](https://img.shields.io/github/license/Netflix/conductor.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![NetflixOSS Lifecycle](https://img.shields.io/osslifecycle/Netflix/conductor.svg)]() -[![GitHub stars](https://img.shields.io/github/stars/Netflix/conductor.svg?style=social&label=Star&maxAge=2592000)](https://GitHub.com/Netflix/conductor/stargazers/) -[![GitHub forks](https://img.shields.io/github/forks/Netflix/conductor.svg?style=social&label=Fork&maxAge=2592000)](https://GitHub.com/Netflix/conductor/network/) +Conductor is a platform originally created at Netflix to orchestrate microservices and events. +Conductor OSS is maintained by the team of developers at [Orkes](https://orkes.io/) along with the members of the open source community. -Conductor is a platform created by Netflix to orchestrate workflows that span across microservices. -Conductor is maintained by Media Workflow Infrastructure team at Netflix. +## Conductor OSS +This is the new home for the Conductor open source going forward (previously hosted at Netflix/Conductor). +> [!IMPORTANT] +> Going forward, all the bug fixes, feature requests and security patches will be applied and released from this repository. -For more information, see [Main Documentation Site](https://conductor.netflix.com/) +The last published version of Netflix Condutor will be **3.15.0** which we will continue to support. + +If you would like to participate in the roadmap and development, [please reach out](https://forms.gle/P2i1xHrxPQLrjzTB7). + +## ⭐ This repository +Show support for the Conductor OSS. Please help spread the awareness by starring this repo. + +[![GitHub stars](https://img.shields.io/github/stars/conductor-oss/conductor.svg?style=social&label=Star&maxAge=)](https://GitHub.com/conductor-oss/conductor/) + +## Update your local forks/clones +Please update your forks to point to this repo. This will ensure your commits and PRs can be send against this repository +```shell +git remote set-url origin https://github.com/conductor-oss/conductor +``` +> [!IMPORTANT] +> **Follow the steps below if you have an active PR againt the Netflix/Conductor repository** +> 1. Fork **this** repository +> 2. Update your local repository to change the remote to this repository +> 3. Send a PR against the `main` branch ## Releases The latest version is [![Github release](https://img.shields.io/github/v/release/Netflix/conductor.svg)](https://GitHub.com/Netflix/conductor/releases) -[2.31.8](https://github.com/Netflix/conductor/releases/tag/v2.31.8) is the **final** release of `2.31` branch. As of Feb 2022, `1.x` & `2.x` versions are no longer supported. +The next scheduled release is in Dec 2023. ## Resources #### [Slack Community](https://join.slack.com/t/orkes-conductor/shared_invite/zt-xyxqyseb-YZ3hwwAgHJH97bsrYRnSZg) We have an active [community](https://join.slack.com/t/orkes-conductor/shared_invite/zt-xyxqyseb-YZ3hwwAgHJH97bsrYRnSZg) of Conductor users and contributors on the channel. -#### [Documentation Site](https://conductor.netflix.com/) -[Documentation](https://conductor.netflix.com/) and tutorial on how to use Conductor +#### [Documentation Site](https://orkes.io/content) +[Documentation](https://orkes.io/content) and tutorial on how to use Conductor + +[Discussion Forum](https://github.com/conductor-oss/conductor/discussions): Please use the forum for questions and discussing ideas and join the community. -## Workflow Creation in Code +### Conductor SDKs Conductor supports creating workflows using JSON and Code. SDK support for creating workflows using code is available in multiple languages and can be found at https://github.com/conductor-sdk -## Community Contributions -The modules contributed by the community are housed at [conductor-community](https://github.com/Netflix/conductor-community). Compatible versions of the community modules are released simultaneously with releases of the main modules. - -[Discussion Forum](https://github.com/Netflix/conductor/discussions): Please use the forum for questions and discussing ideas and join the community. - -[List of Conductor community projects](/docs/docs/resources/related.md): Backup tool, Cron like workflow starter, Docker containers and more. ## Getting Started - Building & Running Conductor -### Using Docker: -The easiest way to get started is with Docker containers. Please follow the instructions [here](https://conductor.netflix.com/gettingstarted/docker.html). ### From Source: -Conductor Server is a [Spring Boot](https://spring.io/projects/spring-boot) project and follows all applicable conventions. See instructions [here](http://conductor.netflix.com/gettingstarted/source.html). - -## Published Artifacts -Binaries are available from [Netflix OSS Maven](https://artifacts.netflix.net/netflixoss/com/netflix/conductor/) repository, or the [Maven Central Repository](https://search.maven.org/search?q=g:com.netflix.conductor). - -| Artifact | Description | -|---------------------------------|-------------------------------------------------------------------------------------------------| -| conductor-common | Common models used by various conductor modules | -| conductor-core | Core Conductor module | -| conductor-redis-persistence | Persistence and queue using Redis/Dynomite | -| conductor-cassandra-persistence | Persistence using Cassandra | -| conductor-es6-persistence | Indexing using Elasticsearch 6.X | -| conductor-rest | Spring MVC resources for the core services | -| conductor-ui | node.js based UI for Conductor | -| conductor-client | Java client for Conductor that includes helpers for running worker tasks | -| conductor-client-spring | Client starter kit for Spring | -| conductor-java-sdk | SDK for writing workflows in code | -| conductor-server | Spring Boot Web Application | -| conductor-redis-lock | Workflow execution lock implementation using Redis | -| conductor-awss3-storage | External payload storage implementation using AWS S3 | -| conductor-awssqs-event-queue | Event queue implementation using AWS SQS | -| conductor-http-task | Workflow system task implementation to send make requests | -| conductor-json-jq-task | Workflow system task implementation to evaluate JSON using [jq](https://stedolan.github.io/jq/) | -| conductor-grpc | Protobuf models used by the server and client | -| conductor-grpc-client | gRPC client to interact with the gRPC server | -| conductor-grpc-server | gRPC server Application | -| conductor-test-harness | Integration and regression tests | +If you wish to build your own distribution, you can run ```./gradlew build``` from this project that products the runtime artifacts. +The runnable server is in server/ module. + +### Using Docker (Recommended) +Follow the steps below to launch the docker container: + +```shell + +# Create volumes for persistent stores +# Used to create a persistent volume that will preserve the +docker volume create postgres +docker volume create redis + +docker run --init -p 8080:8080 -p 1234:5000 --mount source=redis,target=/redis \ +--mount source=postgres,target=/pgdata conductoross/conductor-standalone:3.15.0 +``` + +Navigate to http://localhost:1234 once the container starts to launch UI. + +## Docker Containers for production usage +```shell +docker pull conductoross/conductor:3.15.0 +``` + ## Database Requirements @@ -78,29 +86,8 @@ Binaries are available from [Netflix OSS Maven](https://artifacts.netflix.net/ne ## Other Requirements * JDK 17+ -* UI requires Node 14 to build. Earlier Node versions may work but is untested. +* UI requires Node 14 to build. Earlier Node versions may work but are untested. ## Get Support There are several ways to get in touch with us: * [Slack Community](https://join.slack.com/t/orkes-conductor/shared_invite/zt-xyxqyseb-YZ3hwwAgHJH97bsrYRnSZg) -* [GitHub Discussion Forum](https://github.com/Netflix/conductor/discussions) - -## Contributions -Whether it is a small documentation correction, bug fix or a new feature, contributions are highly appreciated. We just ask you to follow standard OSS guidelines. The [Discussion Forum](https://github.com/Netflix/conductor/discussions) is a good place to ask questions, discuss new features and explore ideas. Please check with us before spending too much time, only to find out later that someone else is already working on a similar feature. - -`main` branch is the current working branch. Please send your PR's to `main` branch, making sure that it builds on your local system successfully. Also, please make sure all the conflicts are resolved. - -## License -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. diff --git a/USERS.md b/USERS.md new file mode 100644 index 000000000..3fe8ab685 --- /dev/null +++ b/USERS.md @@ -0,0 +1,18 @@ + +## Who uses Conductor? + +We would like to keep track of whose using Conductor. Please send a pull request with your company name and Github handle. + +* [Netflix](https://www.netflix.com/) [[@aravindanr](https://github.com/aravindanr)] +* [Florida Blue](http://bcbsfl.com/) [[@rickfish](https://github.com/rickfish)] +* [UWM](https://www.uwm.com/) [[@zergrushjoe](https://github.com/ZergRushJoe)] +* [Deutsche Telekom Digital Labs](https://dtdl.in) [[@jas34](https://github.com/jas34)] [[@deoramanas](https://github.com/deoramanas)] +* [VMware](https://www.vmware.com/) [[@taojwmware](https://github.com/taojwmware)] [[@venkag](https://github.com/venkag)] +* [JP Morgan Chase](https://www.chase.com/) [[@maheshyaddanapudi](https://github.com/maheshyaddanapudi)] +* [Orkes](https://orkes.io/) [[@CherishSantoshi](https://github.com/CherishSantoshi)] +* [313X](https://313x.com.br) [[@dalmoveras](https://github.com/dalmoveras)] +* [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)] +* [Atlassian](https://www.atlassian.com/) [[@LuisLainez](https://github.com/LuisLainez)] [[@aradu](https://github.com/aradu-atlassian)] diff --git a/WHOSUSING.md b/WHOSUSING.md deleted file mode 100644 index 224d5f13f..000000000 --- a/WHOSUSING.md +++ /dev/null @@ -1,18 +0,0 @@ - -## Who uses Conductor? - -We would like to keep track of whose using Conductor. Please send a pull request with your company name and Github handle. - -* [Netflix](www.netflix.com) [[@aravindanr](https://github.com/aravindanr)] -* [Florida Blue](www.bcbsfl.com) [[@rickfish](https://github.com/rickfish)] -* [UWM](www.uwm.com)[[@zergrushjoe](https://github.com/ZergRushJoe)] -* [Deutsche Telekom Digital Labs](https://dtdl.in) [[@jas34](https://github.com/jas34)] [[@deoramanas](https://github.com/deoramanas)] -* [VMware](www.vmware.com) [[@taojwmware](https://github.com/taojwmware)] [[@venkag](https://github.com/venkag)] -* [JP Morgan Chase](www.chase.com) [[@maheshyaddanapudi](https://github.com/maheshyaddanapudi)] -* [Orkes ](www.orkes.io)[[@CherishSantoshi](https://github.com/CherishSantoshi)] -* [313X](https://313x.com.br)[[@dalmoveras](https://github.com/dalmoveras)] -* [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)] -* [Atlassian](https://www.atlassian.com/) [[@LuisLainez](https://github.com/LuisLainez)] [[@aradu](https://github.com/aradu-atlassian)] diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index 2bb9a52aa..008983429 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -5,10 +5,10 @@ sourceSets { dependencies { implementation project(':conductor-annotations') - api 'com.google.guava:guava:31.1-jre' + api 'com.google.guava:guava:32.1.2-jre' api 'com.squareup:javapoet:1.13.+' api 'com.github.jknack:handlebars:4.3.+' - api 'com.google.protobuf:protobuf-java:3.21.7' + api 'com.google.protobuf:protobuf-java:3.21.12' api 'javax.annotation:javax.annotation-api:1.3.2' api gradleApi() diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 481b791d0..5e33e8d46 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -1,18 +1,51 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.github.jknack:handlebars": { "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -37,6 +70,9 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "exampleCompileClasspath": { @@ -45,6 +81,72 @@ } }, "exampleRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.13.5" + }, "com.netflix.conductor:conductor-annotations": { "project": true }, @@ -77,17 +179,89 @@ "com.netflix.conductor:conductor-annotations" ], "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "1.30" } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, "com.github.jknack:handlebars": { "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -127,17 +301,56 @@ "com.netflix.conductor:conductor-annotations" ], "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.github.jknack:handlebars": { "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -151,6 +364,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -170,21 +386,90 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, "com.github.jknack:handlebars": { "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -198,6 +483,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" @@ -232,10 +520,16 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock index 7b2c9a2ac..3869be58c 100644 --- a/annotations/dependencies.lock +++ b/annotations/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -19,9 +52,45 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -36,12 +105,51 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -61,16 +169,55 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -90,10 +237,13 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } } } \ No newline at end of file diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index b3c1cb307..1d8630110 100644 --- a/awss3-storage/dependencies.lock +++ b/awss3-storage/dependencies.lock @@ -1,12 +1,45 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -33,38 +66,103 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "locked": "1.11.86" + "locked": "1.12.604" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -77,7 +175,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +239,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -195,11 +293,52 @@ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -210,6 +349,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -232,41 +374,106 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "locked": "1.11.86" + "locked": "1.12.604" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -279,7 +486,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -341,12 +548,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +615,18 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index 8e9e5e532..f93e7756f 100644 --- a/awssqs-event-queue/dependencies.lock +++ b/awssqs-event-queue/dependencies.lock @@ -1,15 +1,48 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -39,38 +72,103 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.86" + "locked": "1.12.604" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -79,14 +177,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -150,7 +248,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -204,14 +302,55 @@ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -225,6 +364,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -247,44 +389,109 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.86" + "locked": "1.12.604" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -293,14 +500,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -362,12 +569,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -426,13 +636,21 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6e6ea6f6e..12ceb391f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,18 +8,18 @@ buildscript { } } dependencies { - classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0' - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.3' + classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.18' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+' } } plugins { - id 'io.spring.dependency-management' version '1.0.13.RELEASE' + id 'io.spring.dependency-management' version '1.1.3' id 'java' id 'application' id 'jacoco' - id 'nebula.netflixoss' version '10.6.0' + id 'com.netflix.nebula.netflixoss' version '11.3.2' id 'org.sonarqube' version '3.4.0.2513' } @@ -47,13 +47,16 @@ apply from: "$rootDir/dependencies.gradle" apply from: "$rootDir/springboot-bom-overrides.gradle" allprojects { - apply plugin: 'nebula.netflixoss' + apply plugin: 'com.netflix.nebula.netflixoss' apply plugin: 'io.spring.dependency-management' apply plugin: 'java-library' apply plugin: 'project-report' - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } group = 'com.netflix.conductor' @@ -62,6 +65,10 @@ allprojects { exclude group: 'ch.qos.logback', module: 'logback-core' exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' exclude group: 'org.slf4j', module: 'slf4j-log4j12' + resolutionStrategy { + force 'org.codehaus.jettison:jettison:1.5.4' + force "org.apache.commons:commons-compress:${revCommonsCompress}" + } } repositories { @@ -96,6 +103,147 @@ allprojects { } 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.yaml:snakeyaml') { + version { + // this is the preferred version this library will use + prefer '2.0' + // the strict bounds, effectively allowing any 2.x version between 2.0 and 2.1 + strictly '[2.0,2.1)' + } + } + implementation('com.fasterxml.jackson.core:jackson-core') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.core:jackson-databind') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.dataformat:jackson-dataformat-yaml') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.core:jackson-annotations') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.dataformat:jackson-dataformat-smile') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.dataformat:jackson-dataformat-cbor') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.datatype:jackson-datatype-jdk8') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.datatype:jackson-datatype-joda') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } + implementation('com.fasterxml.jackson.module:jackson-module-afterburner') { + version { + // this is the preferred version this library will use + prefer '2.15.3' + // the strict bounds, effectively allowing any 2.15.3 or higher + strictly '[2.15.3,2.15.3+]' + } + } implementation('org.apache.logging.log4j:log4j-core') implementation('org.apache.logging.log4j:log4j-api') implementation('org.apache.logging.log4j:log4j-slf4j-impl') @@ -103,10 +251,15 @@ allprojects { implementation('org.apache.logging.log4j:log4j-web') annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - testImplementation('org.springframework.boot:spring-boot-starter-test') + testImplementation('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.yaml', module: 'snakeyaml' + } testImplementation('org.springframework.boot:spring-boot-starter-log4j2') testImplementation 'junit:junit' testImplementation "org.junit.vintage:junit-vintage-engine" + + // Needed for build to work on m1/m2 macs + testImplementation 'net.java.dev.jna:jna:5.13.0' } // processes additional configuration metadata json file as described here diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index 66f9c31d8..602532ed2 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -1,13 +1,46 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { "com.datastax.cassandra:cassandra-driver-core": { "locked": "3.10.2" }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -33,7 +66,10 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { @@ -42,29 +78,91 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -77,7 +175,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +239,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -195,14 +293,55 @@ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { "com.datastax.cassandra:cassandra-driver-core": { "locked": "3.10.2" }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -213,6 +352,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -232,28 +374,31 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.testcontainers:cassandra": { - "locked": "1.15.3" + "locked": "1.19.1" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { @@ -262,29 +407,91 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -297,7 +504,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -359,12 +566,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -414,7 +624,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -426,22 +636,30 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.testcontainers:cassandra": { - "locked": "1.15.3" + "locked": "1.19.1" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock index 4e7ca32b3..e6ab52ab9 100644 --- a/client-spring/dependencies.lock +++ b/client-spring/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-client": { "project": true }, @@ -33,7 +66,10 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { @@ -47,50 +83,118 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-java-sdk" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -150,7 +254,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -224,10 +328,52 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-client": { "project": true }, @@ -243,6 +389,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -262,13 +411,16 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { @@ -282,50 +434,118 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-java-sdk" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -384,11 +604,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -465,13 +688,22 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-java-sdk" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/client/dependencies.lock b/client/dependencies.lock index 6b0ee6cac..ae92bb8c3 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -1,18 +1,45 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -58,41 +85,97 @@ }, "org.slf4j:slf4j-api": { "locked": "1.7.36" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,7 +205,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -170,17 +253,51 @@ }, "org.slf4j:slf4j-api": { "locked": "1.7.36" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } }, "testCompileClasspath": { "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -203,6 +320,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -222,7 +342,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -240,51 +360,107 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -313,11 +489,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -361,7 +540,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -379,16 +558,23 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index c4478c0d7..5f20d89b8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -17,10 +17,10 @@ dependencies { implementation "com.google.protobuf:protobuf-java:${revProtoBuf}" - implementation "com.fasterxml.jackson.core:jackson-databind" - implementation "com.fasterxml.jackson.core:jackson-core" + implementation "com.fasterxml.jackson.core:jackson-databind:${revFasterXml}" + implementation "com.fasterxml.jackson.core:jackson-core:${revFasterXml}" // https://github.com/FasterXML/jackson-modules-base/tree/master/afterburner - implementation "com.fasterxml.jackson.module:jackson-module-afterburner" + implementation "com.fasterxml.jackson.module:jackson-module-afterburner:${revFasterXml}" testImplementation 'org.springframework.boot:spring-boot-starter-validation' } diff --git a/common/dependencies.lock b/common/dependencies.lock index 83f5cb299..3a2957989 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -1,10 +1,87 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "annotationsProcessorCodegen": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "2.13.5" + }, "com.github.jknack:handlebars": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" @@ -15,13 +92,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -78,26 +155,57 @@ "com.netflix.conductor:conductor-annotations-processor" ], "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-annotations-processor" + ], + "locked": "1.30" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -121,30 +229,90 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -178,20 +346,50 @@ "com.netflix.conductor:conductor-annotations" ], "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -199,8 +397,11 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -224,27 +425,87 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -252,8 +513,11 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -292,13 +556,19 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 7a56014e8..d1780f10e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -18,8 +18,8 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter-validation' compileOnly 'org.springframework.retry:spring-retry' - implementation "com.fasterxml.jackson.core:jackson-annotations" - implementation "com.fasterxml.jackson.core:jackson-databind" + implementation "com.fasterxml.jackson.core:jackson-annotations:${revFasterXml}" + implementation "com.fasterxml.jackson.core:jackson-databind:${revFasterXml}" implementation "commons-io:commons-io:${revCommonsIo}" @@ -27,7 +27,7 @@ dependencies { implementation "org.apache.commons:commons-lang3" - implementation "com.fasterxml.jackson.core:jackson-core" + implementation "com.fasterxml.jackson.core:jackson-core:${revFasterXml}" implementation "com.spotify:completable-futures:${revSpotifyCompletableFutures}" diff --git a/core/dependencies.lock b/core/dependencies.lock index 5699af6af..e0f506561 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -1,24 +1,48 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -45,7 +69,7 @@ "locked": "2.3.3" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -69,36 +93,95 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" @@ -107,7 +190,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -143,7 +226,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -188,23 +271,54 @@ }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -233,8 +347,11 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -255,7 +372,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -267,45 +384,104 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" @@ -314,7 +490,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -349,11 +525,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -397,7 +576,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -409,22 +588,29 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java index dd7975425..331a2b4ac 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/AsyncSystemTaskExecutor.java @@ -110,6 +110,7 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { } boolean hasTaskExecutionCompleted = false; + boolean shouldRemoveTaskFromQueue = false; String workflowId = task.getWorkflowInstanceId(); // if we are here the Task object is updated and needs to be persisted regardless of an // exception @@ -130,7 +131,7 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { String.format( "Workflow is in %s state", workflow.getStatus().toString())); } - queueDAO.remove(queueName, task.getTaskId()); + shouldRemoveTaskFromQueue = true; return; } @@ -156,13 +157,12 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { // Update message in Task queue based on Task status // Remove asyncComplete system tasks from the queue that are not in SCHEDULED state if (isTaskAsyncComplete && task.getStatus() != TaskModel.Status.SCHEDULED) { - queueDAO.remove(queueName, task.getTaskId()); + shouldRemoveTaskFromQueue = true; hasTaskExecutionCompleted = true; } else if (task.getStatus().isTerminal()) { task.setEndTime(System.currentTimeMillis()); - queueDAO.remove(queueName, task.getTaskId()); + shouldRemoveTaskFromQueue = true; hasTaskExecutionCompleted = true; - LOGGER.debug("{} removed from queue: {}", task, queueName); } else { task.setCallbackAfterSeconds(systemTaskCallbackTime); systemTask @@ -188,6 +188,10 @@ public void execute(WorkflowSystemTask systemTask, String taskId) { LOGGER.error("Error executing system task - {}, with id: {}", systemTask, taskId, e); } finally { executionDAOFacade.updateTask(task); + if (shouldRemoveTaskFromQueue) { + queueDAO.remove(queueName, task.getTaskId()); + LOGGER.debug("{} removed from queue: {}", task, queueName); + } // if the current task execution has completed, then the workflow needs to be evaluated if (hasTaskExecutionCompleted) { workflowExecutor.decide(workflowId); 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 e9c326410..6070741a2 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java @@ -1027,6 +1027,32 @@ public WorkflowModel decide(String workflowId) { } } + /** + * This method overloads the {@link #decide(String)}. It will acquire a lock and evaluate the + * state of the workflow. + * + * @param workflow the workflow to evaluate the state for + * @return the workflow + */ + public WorkflowModel decideWithLock(WorkflowModel workflow) { + if (workflow == null) { + return null; + } + StopWatch watch = new StopWatch(); + watch.start(); + if (!executionLockService.acquireLock(workflow.getWorkflowId())) { + return null; + } + try { + return decide(workflow); + + } finally { + executionLockService.releaseLock(workflow.getWorkflowId()); + watch.stop(); + Monitors.recordWorkflowDecisionTime(watch.getTime()); + } + } + /** * @param workflow the workflow to evaluate the state for * @return true if the workflow has completed (success or failed), false otherwise. Note: This diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/SetVariable.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/SetVariable.java index 8353e6a2e..2af835cdd 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/tasks/SetVariable.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/SetVariable.java @@ -66,7 +66,7 @@ private boolean validateVariablesSize( if (payloadSize > maxThreshold * 1024) { String errorMsg = String.format( - "The variables payload size: %d of workflow: %s is greater than the permissible limit: %d bytes", + "The variables payload size: %d of workflow: %s is greater than the permissible limit: %d kilobytes", payloadSize, workflowId, maxThreshold); LOGGER.error(errorMsg); task.setReasonForIncompletion(errorMsg); diff --git a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java index ad4759523..49ca8a632 100644 --- a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java +++ b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java @@ -109,6 +109,11 @@ public void verifyAndRepairWorkflowTasks(String workflowId) { () -> new NotFoundException( "Could not find workflow: " + workflowId)); + verifyAndRepairWorkflowTasks(workflow); + } + + /** Verify and repair tasks in a workflow. */ + public void verifyAndRepairWorkflowTasks(WorkflowModel workflow) { workflow.getTasks().forEach(this::verifyAndRepairTask); // repair the parent workflow if needed verifyAndRepairWorkflow(workflow.getParentWorkflowId()); diff --git a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java index 46e8ca6f5..cd4b46be7 100644 --- a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java +++ b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java @@ -28,6 +28,7 @@ import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.core.WorkflowContext; import com.netflix.conductor.core.config.ConductorProperties; +import com.netflix.conductor.core.dal.ExecutionDAOFacade; import com.netflix.conductor.core.exception.NotFoundException; import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.dao.QueueDAO; @@ -48,6 +49,7 @@ public class WorkflowSweeper { private final WorkflowExecutor workflowExecutor; private final WorkflowRepairService workflowRepairService; private final QueueDAO queueDAO; + private final ExecutionDAOFacade executionDAOFacade; private static final String CLASS_NAME = WorkflowSweeper.class.getSimpleName(); @@ -56,10 +58,12 @@ public WorkflowSweeper( WorkflowExecutor workflowExecutor, Optional<WorkflowRepairService> workflowRepairService, ConductorProperties properties, - QueueDAO queueDAO) { + QueueDAO queueDAO, + ExecutionDAOFacade executionDAOFacade) { this.properties = properties; this.queueDAO = queueDAO; this.workflowExecutor = workflowExecutor; + this.executionDAOFacade = executionDAOFacade; this.workflowRepairService = workflowRepairService.orElse(null); LOGGER.info("WorkflowSweeper initialized."); } @@ -77,12 +81,14 @@ public void sweep(String workflowId) { WorkflowContext.set(workflowContext); LOGGER.debug("Running sweeper for workflow {}", workflowId); + workflow = executionDAOFacade.getWorkflowModel(workflowId, true); + if (workflowRepairService != null) { // Verify and repair tasks in the workflow. - workflowRepairService.verifyAndRepairWorkflowTasks(workflowId); + workflowRepairService.verifyAndRepairWorkflowTasks(workflow); } - workflow = workflowExecutor.decide(workflowId); + workflow = workflowExecutor.decideWithLock(workflow); if (workflow != null && workflow.getStatus().isTerminal()) { queueDAO.remove(DECIDER_QUEUE, workflowId); return; diff --git a/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java b/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java index 1d8422bab..15f8363f6 100644 --- a/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java +++ b/core/src/main/java/com/netflix/conductor/core/utils/ParametersUtils.java @@ -48,7 +48,8 @@ public class ParametersUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ParametersUtils.class); private static final Pattern PATTERN = Pattern.compile( - "(?=(?<!\\$)\\$\\{)(?:(?=.*?\\{(?!.*?\\1)(.*\\}(?!.*\\2).*))(?=.*?\\}(?!.*?\\2)(.*)).)+?.*?(?=\\1)[^{]*(?=\\2$)"); + "(?=(?<!\\$)\\$\\{)(?:(?=.*?\\{(?!.*?\\1)(.*\\}(?!.*\\2).*))(?=.*?\\}(?!.*?\\2)(.*)).)+?.*?(?=\\1)[^{]*(?=\\2$)", + Pattern.DOTALL); private final ObjectMapper objectMapper; private final TypeReference<Map<String, Object>> map = new TypeReference<>() {}; diff --git a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java index 888dd7a49..493fd76b2 100644 --- a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java +++ b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java @@ -18,8 +18,10 @@ import java.lang.annotation.Target; import java.text.ParseException; import java.time.format.DateTimeParseException; +import java.util.Map; import java.util.Optional; +import javax.script.ScriptException; import javax.validation.Constraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -30,6 +32,7 @@ import com.netflix.conductor.common.metadata.tasks.TaskDef; import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import com.netflix.conductor.core.events.ScriptEvaluator; import com.netflix.conductor.core.utils.DateTimeUtils; import static com.netflix.conductor.core.execution.tasks.Terminate.getTerminationStatusParameter; @@ -166,9 +169,34 @@ private boolean isDecisionTaskValid( context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); valid = false; } + + if (workflowTask.getCaseExpression() != null) { + try { + validateScriptExpression( + workflowTask.getCaseExpression(), workflowTask.getInputParameters()); + } catch (Exception ee) { + String message = + String.format( + ee.getMessage() + ", taskType: DECISION taskName %s", + workflowTask.getName()); + context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); + valid = false; + } + } + return valid; } + private void validateScriptExpression( + String expression, Map<String, Object> inputParameters) { + try { + Object returnValue = ScriptEvaluator.eval(expression, inputParameters); + } catch (ScriptException e) { + throw new IllegalArgumentException( + String.format("Expression is not well formatted: %s", e.getMessage())); + } + } + private boolean isSwitchTaskValid( WorkflowTask workflowTask, ConstraintValidatorContext context) { boolean valid = true; @@ -209,6 +237,21 @@ private boolean isSwitchTaskValid( context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); valid = false; } + + if ("javascript".equals(workflowTask.getEvaluatorType()) + && workflowTask.getExpression() != null) { + try { + validateScriptExpression( + workflowTask.getExpression(), workflowTask.getInputParameters()); + } catch (Exception ee) { + String message = + String.format( + ee.getMessage() + ", taskType: SWITCH taskName %s", + workflowTask.getName()); + context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); + valid = false; + } + } return valid; } @@ -219,7 +262,7 @@ private boolean isDoWhileTaskValid( String message = String.format( PARAM_REQUIRED_STRING_FORMAT, - "loopExpression", + "loopCondition", TaskType.DO_WHILE, workflowTask.getName()); context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); @@ -229,7 +272,7 @@ private boolean isDoWhileTaskValid( String message = String.format( PARAM_REQUIRED_STRING_FORMAT, - "loopover", + "loopOver", TaskType.DO_WHILE, workflowTask.getName()); context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); diff --git a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy index 3673c0091..f9270d336 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy @@ -45,7 +45,6 @@ class IsolatedTaskQueueProducerSpec extends Specification { Duration.ofSeconds(10)) } - @Test def "addTaskQueuesAddsElementToQueue"() { given: TaskDef taskDef = new TaskDef(isolationGroupId: "isolated") diff --git a/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java b/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java index 1ed45dd7b..7951d5e92 100644 --- a/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java +++ b/core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowSweeper.java @@ -23,6 +23,7 @@ import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.core.config.ConductorProperties; +import com.netflix.conductor.core.dal.ExecutionDAOFacade; import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.dao.QueueDAO; import com.netflix.conductor.model.TaskModel; @@ -42,6 +43,7 @@ public class TestWorkflowSweeper { private WorkflowExecutor workflowExecutor; private WorkflowRepairService workflowRepairService; private QueueDAO queueDAO; + private ExecutionDAOFacade executionDAOFacade; private WorkflowSweeper workflowSweeper; private int defaultPostPoneOffSetSeconds = 1800; @@ -52,9 +54,14 @@ public void setUp() { workflowExecutor = mock(WorkflowExecutor.class); queueDAO = mock(QueueDAO.class); workflowRepairService = mock(WorkflowRepairService.class); + executionDAOFacade = mock(ExecutionDAOFacade.class); workflowSweeper = new WorkflowSweeper( - workflowExecutor, Optional.of(workflowRepairService), properties, queueDAO); + workflowExecutor, + Optional.of(workflowRepairService), + properties, + queueDAO, + executionDAOFacade); } @Test 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 eb2f23921..2f3c20751 100644 --- a/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java +++ b/core/src/test/java/com/netflix/conductor/core/utils/ParametersUtilsTest.java @@ -257,6 +257,30 @@ public void testNestedPathExpressions() throws Exception { assertEquals(5, replaced.get("k3")); } + @Test + public void testReplaceWithLineTerminators() throws Exception { + Map<String, Object> map = new HashMap<>(); + map.put("name", "conductor"); + map.put("version", 2); + + Map<String, Object> input = new HashMap<>(); + input.put("k1", "Name: ${name}; Version: ${version};"); + input.put("k2", "Name: ${name};\nVersion: ${version};"); + input.put("k3", "Name: ${name};\rVersion: ${version};"); + input.put("k4", "Name: ${name};\r\nVersion: ${version};"); + + Object jsonObj = objectMapper.readValue(objectMapper.writeValueAsString(map), Object.class); + + Map<String, Object> replaced = parametersUtils.replace(input, jsonObj); + + assertNotNull(replaced); + + assertEquals("Name: conductor; Version: 2;", replaced.get("k1")); + assertEquals("Name: conductor;\nVersion: 2;", replaced.get("k2")); + assertEquals("Name: conductor;\rVersion: 2;", replaced.get("k3")); + assertEquals("Name: conductor;\r\nVersion: 2;", replaced.get("k4")); + } + @Test public void testReplaceWithEscapedTags() throws Exception { Map<String, Object> map = new HashMap<>(); diff --git a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java index 8ea351ac7..87fd9054e 100644 --- a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java @@ -12,13 +12,7 @@ */ package com.netflix.conductor.service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import javax.validation.ConstraintViolationException; @@ -35,6 +29,7 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.common.metadata.workflow.WorkflowDefSummary; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import com.netflix.conductor.common.model.BulkResponse; import com.netflix.conductor.core.config.ConductorProperties; import com.netflix.conductor.core.exception.NotFoundException; import com.netflix.conductor.dao.EventHandlerDAO; @@ -282,6 +277,66 @@ public void testUpdateWorkflowDef() { verify(metadataDAO, times(1)).updateWorkflowDef(workflowDef); } + @Test(expected = ConstraintViolationException.class) + public void testUpdateWorkflowDefWithCaseExpression() { + WorkflowDef workflowDef = new WorkflowDef(); + workflowDef.setName("somename"); + workflowDef.setOwnerEmail("sample@test.com"); + List<WorkflowTask> tasks = new ArrayList<>(); + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setTaskReferenceName("hello"); + workflowTask.setName("hello"); + workflowTask.setType("DECISION"); + + WorkflowTask caseTask = new WorkflowTask(); + caseTask.setTaskReferenceName("casetrue"); + caseTask.setName("casetrue"); + + List<WorkflowTask> caseTaskList = new ArrayList<>(); + caseTaskList.add(caseTask); + + Map<String, List<WorkflowTask>> decisionCases = new HashMap(); + decisionCases.put("true", caseTaskList); + + workflowTask.setDecisionCases(decisionCases); + workflowTask.setCaseExpression("1 >0abcd"); + tasks.add(workflowTask); + workflowDef.setTasks(tasks); + when(metadataDAO.getTaskDef(any())).thenReturn(new TaskDef()); + BulkResponse bulkResponse = + metadataService.updateWorkflowDef(Collections.singletonList(workflowDef)); + } + + @Test(expected = ConstraintViolationException.class) + public void testUpdateWorkflowDefWithJavscriptEvaluator() { + WorkflowDef workflowDef = new WorkflowDef(); + workflowDef.setName("somename"); + workflowDef.setOwnerEmail("sample@test.com"); + List<WorkflowTask> tasks = new ArrayList<>(); + WorkflowTask workflowTask = new WorkflowTask(); + workflowTask.setTaskReferenceName("hello"); + workflowTask.setName("hello"); + workflowTask.setType("SWITCH"); + workflowTask.setEvaluatorType("javascript"); + workflowTask.setExpression("1>abcd"); + WorkflowTask caseTask = new WorkflowTask(); + caseTask.setTaskReferenceName("casetrue"); + caseTask.setName("casetrue"); + + List<WorkflowTask> caseTaskList = new ArrayList<>(); + caseTaskList.add(caseTask); + + Map<String, List<WorkflowTask>> decisionCases = new HashMap(); + decisionCases.put("true", caseTaskList); + + workflowTask.setDecisionCases(decisionCases); + tasks.add(workflowTask); + workflowDef.setTasks(tasks); + when(metadataDAO.getTaskDef(any())).thenReturn(new TaskDef()); + BulkResponse bulkResponse = + metadataService.updateWorkflowDef(Collections.singletonList(workflowDef)); + } + @Test(expected = ConstraintViolationException.class) public void testRegisterWorkflowDefNoName() { try { diff --git a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java index a1105ed72..a15393248 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java @@ -170,10 +170,10 @@ public void testWorkflowTaskTypeDoWhile() { assertTrue( validationErrors.contains( - "loopExpression field is required for taskType: DO_WHILE taskName: encode")); + "loopCondition field is required for taskType: DO_WHILE taskName: encode")); assertTrue( validationErrors.contains( - "loopover field is required for taskType: DO_WHILE taskName: encode")); + "loopOver field is required for taskType: DO_WHILE taskName: encode")); } @Test diff --git a/dependencies.gradle b/dependencies.gradle index 547b4f1ae..4864b8cdf 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -17,18 +17,20 @@ ext { revActivation = '2.0.0' revAwaitility = '3.1.6' - revAwsSdk = '1.11.86' - revBval = '2.0.5' + revAwsSdk = '1.12.604' + revBval = '2.0.6' revCassandra = '3.10.2' revCassandraUnit = '3.11.2.0' + revCommonsCompress = '1.24.0' revCommonsIo = '2.7' revDynoQueues = '2.0.20' - revElasticSearch6 = '6.8.12' + revElasticSearch6 = '6.8.17' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '2.5.22' - revGrpc = '1.+' - revGuava = '30.0-jre' + revFasterXml = '2.15.3' + revGroovy = '3.0.19' + revGrpc = '1.59.1' + revGuava = '32.1.2-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' revJAXB = '2.3.3' @@ -43,14 +45,14 @@ ext { revOpenapi = '1.6.+' revOrkesQueues = '1.0.3' revPowerMock = '2.0.9' - revProtoBuf = '3.21.7' + revProtoBuf = '3.24.3' revProtogenAnnotations = '1.0.0' revProtogenCodegen = '1.4.0' revRarefiedRedis = '0.0.17' revRedisson = '3.13.3' revRxJava = '1.2.2' revSpectator = '0.122.0' - revSpock = '1.3-groovy-2.5' + revSpock = '2.3-groovy-3.0' revSpotifyCompletableFutures = '0.3.3' - revTestContainer = '1.15.3' + revTestContainer = '1.19.1' } diff --git a/dependencies.lock b/dependencies.lock index b2d91aea1..574b845ec 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -19,6 +52,9 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "jacocoAgent": { @@ -32,6 +68,39 @@ } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -46,12 +115,51 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -71,16 +179,55 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -100,10 +247,13 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } } } \ No newline at end of file diff --git a/docker/README.md b/docker/README.md index b45b2d9bc..e19a916ee 100644 --- a/docker/README.md +++ b/docker/README.md @@ -11,7 +11,7 @@ Conductor server with support for the following backend: ### Docker File for Server and UI -[Docker Image Source for Server with UI](docker/server/DockerFile) +[Docker Image Source for Server with UI](server/Dockerfile) ### Configuration Guide for Conductor Server Conductor uses a persistent store for managing state. @@ -48,4 +48,4 @@ TODO: Link to the helm charts |--------------------------------------------------------------|----------------------------| | [docker-compose.yaml](docker-compose.yaml) | Redis + Elasticsearch 7 | | [docker-compose-postgres.yaml](docker-compose-postgres.yaml) | Postgres + Elasticsearch 7 | -| [docker-compose-postgres.yaml](docker-compose-mysql.yaml) | Mysql + Elasticsearch 7 | +| [docker-compose-mysql.yaml](docker-compose-mysql.yaml) | Mysql + Elasticsearch 7 | diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index ab6b099b5..9b44f47a9 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,12 +1,12 @@ # -# conductor:server - Combined Netflix conductor server & UI +# conductor:server - Combined conductor server & UI # # =========================================================================================================== # 0. Builder stage # =========================================================================================================== FROM alpine:3.18 AS builder -LABEL maintainer="Netflix OSS <conductor@netflix.com>" +LABEL maintainer="Orkes OSS <oss@orkes.io>" # =========================================================================================================== # 0. Build Conductor Server @@ -20,7 +20,9 @@ RUN apk add --update nodejs npm yarn COPY . /conductor WORKDIR /conductor/ui -RUN yarn install && yarn build +# Include monaco sources into bundle (instead of using CDN) +ENV REACT_APP_MONACO_EDITOR_USING_CDN=false +RUN yarn install && cp -r node_modules/monaco-editor public/ && yarn build RUN ls -ltr RUN echo "Done building UI" @@ -30,7 +32,7 @@ RUN mkdir server-build WORKDIR server-build RUN ls -ltr -RUN git clone https://github.com/Netflix/conductor-community.git +RUN git clone https://github.com/conductor-oss/conductor-community.git # Copy the project directly onto the image WORKDIR conductor-community @@ -48,7 +50,7 @@ RUN pwd # =========================================================================================================== FROM alpine:3.18 -LABEL maintainer="Netflix OSS <conductor@netflix.com>" +LABEL maintainer="Orkes OSS <oss@orkes.io>" RUN apk add openjdk17 RUN apk add nginx diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index b7967b9a0..5762f7d1f 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -16,10 +16,13 @@ WORKDIR /usr/src/app COPY ./ui/package.json ./ # Installs all node packages. Cached unless package.json changes -RUN yarn install +RUN yarn install && mkdir -p public && cp -r node_modules/monaco-editor public/ # Copies everything else over to Docker environment # node_modules excluded in .dockerignore. COPY ./ui . +# Include monaco sources into bundle (instead of using CDN) +ENV REACT_APP_MONACO_EDITOR_USING_CDN=false + CMD [ "yarn", "start" ] diff --git a/docs/docs/how-tos/Workers/build-a-golang-task-worker.md b/docs/docs/how-tos/Workers/build-a-golang-task-worker.md index 306ffc12b..5581508ba 100644 --- a/docs/docs/how-tos/Workers/build-a-golang-task-worker.md +++ b/docs/docs/how-tos/Workers/build-a-golang-task-worker.md @@ -11,7 +11,7 @@ go get github.com/netflix/conductor/client/go This will create a Go project under $GOPATH/src and download any dependencies. ## Implementing a Task a Worker -`task`package provies the types used to implement the worker. Here is a reference worker implementation: +`task`package provides the types used to implement the worker. Here is a reference worker implementation: ```go package task diff --git a/docs/docs/resources/code-of-conduct.md b/docs/docs/resources/code-of-conduct.md deleted file mode 100644 index f8076bc62..000000000 --- a/docs/docs/resources/code-of-conduct.md +++ /dev/null @@ -1,49 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at netflixoss@netflix.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 9fb73e7bc..e10fabafe 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -1,12 +1,45 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -36,47 +69,112 @@ "locked": "2.17.2" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -85,14 +183,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -156,7 +254,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -206,24 +304,65 @@ "locked": "2.17.2" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -237,6 +376,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -259,56 +401,121 @@ "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -317,14 +524,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -386,12 +593,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -444,13 +654,13 @@ "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -462,16 +672,24 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java b/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java index 5bb2fe78e..5045c351b 100644 --- a/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java +++ b/es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java @@ -12,6 +12,8 @@ */ package com.netflix.conductor.es6.dao.index; +import java.util.Map; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -47,8 +49,11 @@ public ElasticSearchProperties elasticSearchProperties() { protected static final ElasticsearchContainer container = new ElasticsearchContainer( - DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag("6.8.12")); // this should match the client version + DockerImageName.parse( + "docker.elastic.co/elasticsearch/elasticsearch-oss") + .withTag("6.8.17")) // this should match the client version + // Resolve issue with es container not starting on m1/m2 macs + .withEnv(Map.of("bootstrap.system_call_filter", "false")); @Autowired protected ObjectMapper objectMapper; diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 95623d88c..6a271634a 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -1,15 +1,48 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -18,13 +51,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -46,36 +79,109 @@ }, "org.slf4j:slf4j-api": { "locked": "1.7.36" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -93,19 +199,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -117,7 +223,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -167,14 +273,55 @@ }, "org.slf4j:slf4j-api": { "locked": "1.7.36" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -183,17 +330,20 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -219,40 +369,113 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -270,19 +493,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -293,11 +516,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -352,10 +578,18 @@ "locked": "1.7.36" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/grpc-server/build.gradle b/grpc-server/build.gradle index d17d784a4..eb80c22c6 100644 --- a/grpc-server/build.gradle +++ b/grpc-server/build.gradle @@ -7,8 +7,10 @@ dependencies { implementation "io.grpc:grpc-netty:${revGrpc}" implementation "io.grpc:grpc-services:${revGrpc}" + implementation "io.grpc:grpc-protobuf:${revGrpc}" implementation "org.apache.commons:commons-lang3" testImplementation "io.grpc:grpc-testing:${revGrpc}" + testImplementation "io.grpc:grpc-protobuf:${revGrpc}" testImplementation "org.testinfected.hamcrest-matchers:all-matchers:${revHamcrestAllMatchers}" } diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 6dcec7164..98ac4cad5 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -15,10 +48,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.59.1" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.1" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -39,35 +75,111 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -81,7 +193,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -127,22 +239,22 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -173,7 +285,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -232,9 +344,51 @@ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -245,17 +399,23 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.59.1" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.59.1" }, "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -278,41 +438,117 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -326,7 +562,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -372,25 +608,25 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-services": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -419,12 +655,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -488,13 +727,22 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.testinfected.hamcrest-matchers:all-matchers": { "locked": "1.8" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/grpc/build.gradle b/grpc/build.gradle index 6286e2a0f..fabaac0d4 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -39,13 +39,13 @@ dependencies { def artifactName = 'com.google.protobuf:protoc:3.14.0:osx-x86_64' switch (org.gradle.internal.os.OperatingSystem.current()) { case org.gradle.internal.os.OperatingSystem.LINUX: - artifactName = "com.google.protobuf:protoc:3.21.7" + artifactName = "com.google.protobuf:protoc:3.21.12" break; case org.gradle.internal.os.OperatingSystem.MAC_OS: artifactName = "com.google.protobuf:protoc:3.14.0:osx-x86_64" break; case org.gradle.internal.os.OperatingSystem.WINDOWS: - artifactName = "com.google.protobuf:protoc:3.21.7" + artifactName = "com.google.protobuf:protoc:3.21.12" break; } diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 82071c38c..cf7a62e28 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -1,21 +1,54 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-common": { "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -34,32 +67,94 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "compileProtoPath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -71,10 +166,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -83,7 +178,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -125,11 +220,18 @@ "com.netflix.conductor:conductor-common" ], "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.57.1" + "locked": "1.59.1" } }, "protobufToolsLocator_protoc": { @@ -138,29 +240,88 @@ } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -172,10 +333,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -184,7 +345,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -226,20 +387,60 @@ "com.netflix.conductor:conductor-common" ], "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-common": { "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -247,6 +448,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -266,36 +470,98 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testCompileProtoPath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -307,10 +573,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -318,11 +584,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -369,36 +638,102 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -410,10 +745,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -421,11 +756,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -472,10 +810,17 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index f6669d5c9..f2ded231e 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -30,38 +63,103 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +239,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -195,9 +293,50 @@ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -210,6 +349,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -238,44 +380,109 @@ "locked": "5.12.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.testcontainers:mockserver": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -288,7 +495,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -353,12 +560,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -426,16 +636,24 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.testcontainers:mockserver": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 6572905d2..0888468fa 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -5,7 +5,7 @@ dependencies { implementation project(':conductor-common') implementation project(':conductor-client') - implementation "com.fasterxml.jackson.core:jackson-databind" + implementation "com.fasterxml.jackson.core:jackson-databind:${revFasterXml}" implementation "com.google.guava:guava:${revGuava}" implementation "cglib:cglib:3.3.0" implementation "com.sun.jersey:jersey-client:${revJersey}" @@ -17,7 +17,7 @@ dependencies { testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" - testImplementation "com.fasterxml.jackson.core:jackson-core" + testImplementation "com.fasterxml.jackson.core:jackson-core:${revFasterXml}" testImplementation "org.apache.commons:commons-lang3" testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 17084fccf..7f9b9098b 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -1,18 +1,48 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { "cglib:cglib": { "locked": "3.3.0" }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-client": { "project": true @@ -46,6 +76,9 @@ }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { @@ -56,46 +89,104 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -146,7 +237,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -209,20 +300,55 @@ "com.netflix.conductor:conductor-client" ], "locked": "1.7.36" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } }, "testCompileClasspath": { "cglib:cglib": { "locked": "3.3.0" }, + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-client": { "project": true @@ -239,6 +365,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -258,7 +387,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -270,19 +399,22 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.31" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { @@ -293,46 +425,104 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.86" + "locked": "1.12.604" + }, + "com.fasterxml.jackson.core:jackson-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -382,11 +572,14 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -436,7 +629,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -457,19 +650,27 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.31" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java index c9c62dc70..ae75b6c83 100644 --- a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java +++ b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java @@ -237,4 +237,8 @@ public MetadataClient getMetadataClient() { public TaskClient getTaskClient() { return taskClient; } + + public WorkflowClient getWorkflowClient() { + return workflowClient; + } } 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 52ccde54e..194928a9a 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 @@ -97,7 +97,8 @@ public DynamicForkInput generateDynamicFork() { return forks; } - private ConductorWorkflow<TestWorkflowInput> registerTestWorkflow() { + private ConductorWorkflow<TestWorkflowInput> registerTestWorkflow() + throws InterruptedException { InputStream script = getClass().getResourceAsStream("/script.js"); SimpleTask getUserInfo = new SimpleTask("get_user_info", "get_user_info"); getUserInfo.input("name", ConductorWorkflow.input.get("name")); @@ -142,7 +143,7 @@ private ConductorWorkflow<TestWorkflowInput> registerTestWorkflow() { } @Test - public void verifyCreatedWorkflow() { + public void verifyCreatedWorkflow() throws Exception { ConductorWorkflow<TestWorkflowInput> conductorWorkflow = registerTestWorkflow(); WorkflowDef def = conductorWorkflow.toWorkflowDef(); assertNotNull(def); diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index 27e43fb55..6731c8cf1 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, @@ -33,35 +66,100 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +239,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -195,9 +293,50 @@ "com.netflix.conductor:conductor-core" ], "locked": "15.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, @@ -210,6 +349,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "net.thisptr:jackson-jq": { "locked": "0.0.13" }, @@ -232,38 +374,103 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -276,7 +483,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -338,6 +545,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "net.thisptr:jackson-jq": { "locked": "0.0.13" }, @@ -346,7 +556,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +615,18 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index b7a19c231..8c61b8f60 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -30,10 +63,13 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -42,29 +78,91 @@ "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -77,7 +175,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +239,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -196,13 +294,54 @@ ], "locked": "15.4" }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" + }, "redis.clients:jedis": { "locked": "3.6.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-common": { "project": true @@ -213,6 +352,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -232,31 +374,34 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "2.7.18" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.19.1" }, "org.testcontainers:testcontainers": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -265,29 +410,91 @@ "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -300,7 +507,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -362,12 +569,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -417,7 +627,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.junit.vintage:junit-vintage-engine": { "locked": "5.8.2" @@ -429,25 +639,33 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.2" + "locked": "2.7.18" }, "org.testcontainers:spock": { - "locked": "1.15.3" + "locked": "1.19.1" }, "org.testcontainers:testcontainers": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.6.0" diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index fe504d621..4c9d61e36 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-core": { "project": true }, @@ -30,35 +63,100 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -71,7 +169,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -135,7 +233,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -192,9 +290,50 @@ }, "org.redisson:redisson": { "locked": "3.13.3" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.github.kstyrc:embedded-redis": { "locked": "0.6" }, @@ -204,6 +343,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -229,38 +371,103 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -276,7 +483,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -338,12 +545,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +615,18 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index e5545e2aa..7e8f781d8 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -36,7 +69,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -45,29 +81,91 @@ "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -80,7 +178,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -150,7 +248,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -208,11 +306,52 @@ "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" + }, "redis.clients:jedis": { "locked": "3.3.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -228,6 +367,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -250,10 +392,13 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -262,29 +407,91 @@ "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -297,7 +504,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -365,12 +572,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -432,10 +642,18 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.3.0" diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisProperties.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisProperties.java index 2c0b3eadb..905fd65aa 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisProperties.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisProperties.java @@ -108,6 +108,10 @@ public RedisProperties(ConductorProperties conductorProperties) { private int numTestsPerEvictionRun = 3; + private int database = 0; + + private String username = null; + public int getNumTestsPerEvictionRun() { return numTestsPerEvictionRun; } @@ -283,4 +287,20 @@ public RetryPolicyFactory getConnectionRetryPolicy() { return () -> new RetryNTimes(maxRetryAttempts, false); } } + + public int getDatabase() { + return database; + } + + public void setDatabase(int database) { + this.database = database; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } } diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisSentinelConfiguration.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisSentinelConfiguration.java index 89fa5b8cc..aa35f5e67 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisSentinelConfiguration.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisSentinelConfiguration.java @@ -63,7 +63,7 @@ protected JedisCommands createJedisCommands( } // We use the password of the first sentinel host as password and sentinelPassword String password = getPassword(hostSupplier.getHosts()); - if (password != null) { + if (properties.getUsername() != null && password != null) { return new JedisSentinel( new JedisSentinelPool( properties.getClusterName(), @@ -71,8 +71,25 @@ protected JedisCommands createJedisCommands( genericObjectPoolConfig, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, + properties.getUsername(), password, - Protocol.DEFAULT_DATABASE, + properties.getDatabase(), + null, + Protocol.DEFAULT_TIMEOUT, + Protocol.DEFAULT_TIMEOUT, + properties.getUsername(), + password, + null)); + } else if (password != null) { + return new JedisSentinel( + new JedisSentinelPool( + properties.getClusterName(), + sentinels, + genericObjectPoolConfig, + Protocol.DEFAULT_TIMEOUT, + Protocol.DEFAULT_TIMEOUT, + password, + properties.getDatabase(), null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisStandaloneConfiguration.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisStandaloneConfiguration.java index 8882e5403..5d07cc34f 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisStandaloneConfiguration.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/config/RedisStandaloneConfiguration.java @@ -45,18 +45,29 @@ protected JedisCommands createJedisCommands( config.setMaxTotal(properties.getMaxConnectionsPerHost()); log.info("Starting conductor server using redis_standalone."); Host host = hostSupplier.getHosts().get(0); - return new JedisStandalone(getJedisPool(config, host)); + return new JedisStandalone(getJedisPool(config, host, properties)); } - private JedisPool getJedisPool(JedisPoolConfig config, Host host) { - if (host.getPassword() != null) { + private JedisPool getJedisPool(JedisPoolConfig config, Host host, RedisProperties properties) { + if (properties.getUsername() != null && host.getPassword() != null) { log.info("Connecting to Redis Standalone with AUTH"); return new JedisPool( config, host.getHostName(), host.getPort(), Protocol.DEFAULT_TIMEOUT, - host.getPassword()); + properties.getUsername(), + host.getPassword(), + properties.getDatabase()); + } else if (host.getPassword() != null) { + log.info("Connecting to Redis Standalone with AUTH"); + return new JedisPool( + config, + host.getHostName(), + host.getPort(), + Protocol.DEFAULT_TIMEOUT, + host.getPassword(), + properties.getDatabase()); } else { return new JedisPool(config, host.getHostName(), host.getPort()); } diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java index c3270706b..e0aa0bfd8 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java @@ -72,6 +72,9 @@ public void updateEventHandler(EventHandler eventHandler) { throw new NotFoundException( "EventHandler with name %s not found!", eventHandler.getName()); } + if (!existing.getEvent().equals(eventHandler.getEvent())) { + removeIndex(existing); + } index(eventHandler); jedisProxy.hset(nsKey(EVENT_HANDLERS), eventHandler.getName(), toJson(eventHandler)); recordRedisDaoRequests("updateEventHandler"); diff --git a/rest/dependencies.lock b/rest/dependencies.lock index a3cfdea4b..00169a86d 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -33,35 +66,100 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +239,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -200,10 +298,51 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-common": { "project": true }, @@ -216,6 +355,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -238,41 +380,106 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -285,7 +492,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -350,12 +557,15 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -417,13 +627,21 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-annotations", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.0" } } } \ No newline at end of file diff --git a/rest/src/main/java/com/netflix/conductor/rest/controllers/TaskResource.java b/rest/src/main/java/com/netflix/conductor/rest/controllers/TaskResource.java index 1b1fe6b7a..d9f818f44 100644 --- a/rest/src/main/java/com/netflix/conductor/rest/controllers/TaskResource.java +++ b/rest/src/main/java/com/netflix/conductor/rest/controllers/TaskResource.java @@ -184,7 +184,7 @@ public SearchResult<Task> searchV2( } @Operation(summary = "Get the external uri where the task payload is to be stored") - @GetMapping("/externalstoragelocation") + @GetMapping({"/externalstoragelocation", "external-storage-location"}) public ExternalStorageLocation getExternalStorageLocation( @RequestParam("path") String path, @RequestParam("operation") String operation, diff --git a/rest/src/main/java/com/netflix/conductor/rest/controllers/WorkflowResource.java b/rest/src/main/java/com/netflix/conductor/rest/controllers/WorkflowResource.java index 6652a1f57..263404b2d 100644 --- a/rest/src/main/java/com/netflix/conductor/rest/controllers/WorkflowResource.java +++ b/rest/src/main/java/com/netflix/conductor/rest/controllers/WorkflowResource.java @@ -270,7 +270,7 @@ public SearchResult<Workflow> searchWorkflowsByTasksV2( @Operation( summary = "Get the uri and path of the external storage where the workflow payload is to be stored") - @GetMapping("/externalstoragelocation") + @GetMapping({"/externalstoragelocation", "external-storage-location"}) public ExternalStorageLocation getExternalStorageLocation( @RequestParam("path") String path, @RequestParam("operation") String operation, diff --git a/server/build.gradle b/server/build.gradle index 1bee56916..7870d4df0 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -62,6 +62,10 @@ bootJar { classifier = 'boot' } +// https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#integrating-with-actuator.build-info +// This will configure a BuildInfo task named bootBuildInfo springBoot { buildInfo() } + +compileJava.dependsOn bootBuildInfo diff --git a/server/dependencies.lock b/server/dependencies.lock index c19744790..e8aa04b88 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.netflix.conductor:conductor-awss3-storage": { "project": true }, @@ -63,22 +96,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "productionRuntimeClasspath": { @@ -86,13 +122,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -102,29 +138,196 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -138,7 +341,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -146,7 +349,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -273,25 +476,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -458,29 +662,23 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" }, - "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" @@ -500,25 +698,42 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.0" }, "redis.clients:jedis": { "firstLevelTransitive": [ @@ -533,13 +748,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -549,29 +764,196 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, - "com.fasterxml.jackson.core:jackson-databind": { + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -585,7 +967,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -593,7 +975,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.22.3" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -720,25 +1102,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -905,29 +1288,23 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" }, - "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" @@ -947,25 +1324,42 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.0" }, "redis.clients:jedis": { "firstLevelTransitive": [ @@ -976,8 +1370,41 @@ } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-awss3-storage": { "project": true @@ -1019,13 +1446,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1033,6 +1460,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -1055,25 +1485,28 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testRuntimeClasspath": { @@ -1081,13 +1514,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -1097,29 +1530,196 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -1133,7 +1733,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -1141,7 +1741,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -1268,28 +1868,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.59.1" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1328,6 +1929,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "net.thisptr:jackson-jq": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-json-jq-task" @@ -1459,19 +2063,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -1479,12 +2083,6 @@ "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" @@ -1504,28 +2102,45 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest" + ], + "locked": "2.0" }, "redis.clients:jedis": { "firstLevelTransitive": [ diff --git a/test-harness/build.gradle b/test-harness/build.gradle index 7adc179e3..8947327e1 100644 --- a/test-harness/build.gradle +++ b/test-harness/build.gradle @@ -16,8 +16,8 @@ dependencies { testImplementation "org.springframework.retry:spring-retry" - testImplementation "com.fasterxml.jackson.core:jackson-databind" - testImplementation "com.fasterxml.jackson.core:jackson-core" + testImplementation "com.fasterxml.jackson.core:jackson-databind:${revFasterXml}" + testImplementation "com.fasterxml.jackson.core:jackson-core:${revFasterXml}" testImplementation "org.apache.commons:commons-lang3" diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 2dd48417d..0a6f5f251 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1,10 +1,43 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.18" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -19,9 +52,45 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" + }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.2" }, @@ -36,20 +105,50 @@ }, "org.apache.logging.log4j:log4j-web": { "locked": "2.17.2" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-annotations": { + "locked": "2.15.3" + }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { + "locked": "2.15.3" + }, + "com.fasterxml.jackson.module:jackson-module-afterburner": { + "locked": "2.15.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.24.3" }, "com.netflix.conductor:conductor-cassandra-persistence": { "project": true @@ -96,6 +195,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, @@ -115,13 +217,13 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.12" + "locked": "6.8.17" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -130,25 +232,28 @@ "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.31" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "locked": "2.0" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -159,19 +264,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.11.86" + "locked": "1.12.604" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -181,41 +286,229 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" ], - "locked": "2.13.3" + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-smile": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" + ], + "locked": "2.15.3" + }, + "com.fasterxml.jackson.datatype:jackson-datatype-joda": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" + ], + "locked": "2.15.3" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" ], - "locked": "2.13.3" + "locked": "2.15.3" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -230,7 +523,7 @@ "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -239,7 +532,7 @@ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "3.21.7" + "locked": "3.24.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -427,27 +720,28 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", - "com.netflix.conductor:conductor-grpc-client" + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.57.1" + "locked": "1.59.1" }, "io.orkes.queues:orkes-conductor-queues": { "firstLevelTransitive": [ @@ -495,6 +789,9 @@ "junit:junit": { "locked": "4.13.2" }, + "net.java.dev.jna:jna": { + "locked": "5.13.0" + }, "net.thisptr:jackson-jq": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-json-jq-task" @@ -640,31 +937,31 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.12" + "locked": "6.8.17" }, "org.glassfish.jaxb:jaxb-runtime": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.3.6" + "locked": "2.3.9" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -675,12 +972,6 @@ "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" @@ -701,10 +992,10 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springdoc:springdoc-openapi-ui": { "firstLevelTransitive": [ @@ -717,47 +1008,67 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-actuator": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-log4j2": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-validation": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.18" }, "org.springframework.retry:spring-retry": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.3.3" + "locked": "1.3.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.31" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.19.1" + }, + "org.yaml:snakeyaml": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-awss3-storage", + "com.netflix.conductor:conductor-awssqs-event-queue", + "com.netflix.conductor:conductor-cassandra-persistence", + "com.netflix.conductor:conductor-client", + "com.netflix.conductor:conductor-es6-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", + "com.netflix.conductor:conductor-http-task", + "com.netflix.conductor:conductor-json-jq-task", + "com.netflix.conductor:conductor-redis-concurrency-limit", + "com.netflix.conductor:conductor-redis-lock", + "com.netflix.conductor:conductor-redis-persistence", + "com.netflix.conductor:conductor-rest", + "com.netflix.conductor:conductor-server" + ], + "locked": "2.0" }, "redis.clients:jedis": { "firstLevelTransitive": [ diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SetVariableTaskSpec.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SetVariableTaskSpec.groovy index 5eace9207..714300f48 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SetVariableTaskSpec.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/integration/SetVariableTaskSpec.groovy @@ -62,7 +62,7 @@ class SetVariableTaskSpec extends AbstractSpecification { def EXTRA_HASHMAP_SIZE = 17 def expectedErrorMessage = String.format( - "The variables payload size: %d of workflow: %s is greater than the permissible limit: %d bytes", + "The variables payload size: %d of workflow: %s is greater than the permissible limit: %d kilobytes", EXTRA_HASHMAP_SIZE + maxThreshold * 1024 + 1, workflowInstanceId, maxThreshold) then: "verify that the task is completed and variables were set" diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java index 3feeafe25..150e59947 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java @@ -62,7 +62,7 @@ public abstract class AbstractEndToEndTest { private static final ElasticsearchContainer container = new ElasticsearchContainer( DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss") - .withTag("6.8.12")); // this should match the client version + .withTag("6.8.17")); // this should match the client version private static RestClient restClient; diff --git a/ui/README.md b/ui/README.md index ff253e6dd..2df3760f8 100644 --- a/ui/README.md +++ b/ui/README.md @@ -24,6 +24,14 @@ Your hosting environment should make the Conductor Server API available on the s See `docker/serverAndUI` for an `nginx` based example. +#### Different host path +The static UI would work when rendered from any host route. +The default is '/'. You can customize this by setting the 'homepage' field in package.json +Refer +- https://docs.npmjs.com/cli/v9/configuring-npm/package-json#homepage +- https://create-react-app.dev/docs/deployment/#building-for-relative-paths + + ### Customization Hooks For ease of maintenance, a number of touch points for customization have been removed to `/plugins`. diff --git a/ui/package.json b/ui/package.json index ac64a7d71..623a5c6dc 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,12 +1,12 @@ { "name": "client", - "version": "3.7.2", + "version": "3.8.0", "dependencies": { "@material-ui/core": "^4.12.3", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.60", "@material-ui/styles": "^4.11.4", - "@monaco-editor/react": "^4.3.1", + "@monaco-editor/react": "^4.4.0", "clsx": "^1.1.1", "cronstrue": "^1.72.0", "d3": "^6.2.0", @@ -18,6 +18,7 @@ "json-bigint-string": "^1.0.0", "lodash": "^4.17.20", "moment": "^2.29.2", + "monaco-editor": "^0.44.0", "node-forge": "^1.3.0", "parse-svg-path": "^0.1.2", "prop-types": "^15.7.2", diff --git a/ui/src/App.jsx b/ui/src/App.jsx index 512065581..64292db5a 100644 --- a/ui/src/App.jsx +++ b/ui/src/App.jsx @@ -2,6 +2,7 @@ import React from "react"; import { Route, Switch } from "react-router-dom"; import { makeStyles } from "@material-ui/styles"; +import { loader } from '@monaco-editor/react'; import { Button, AppBar, Toolbar } from "@material-ui/core"; import AppLogo from "./plugins/AppLogo"; import NavLink from "./components/NavLink"; @@ -132,3 +133,8 @@ export default function App() { </div> ); } + +if (process.env.REACT_APP_MONACO_EDITOR_USING_CDN === "false") { + // Change the source of the monaco files, see https://github.com/suren-atoyan/monaco-react/issues/168#issuecomment-762336713 + loader.config({ paths: { vs: '/monaco-editor/min/vs' } }); +} diff --git a/ui/src/components/NavLink.jsx b/ui/src/components/NavLink.jsx index ae47b24f4..3fd7b4623 100644 --- a/ui/src/components/NavLink.jsx +++ b/ui/src/components/NavLink.jsx @@ -4,12 +4,14 @@ import { Link } from "@material-ui/core"; import LaunchIcon from "@material-ui/icons/Launch"; import Url from "url-parse"; import { useEnv } from "../plugins/env"; +import { getBasename } from "../utils/helpers"; +import { cleanDuplicateSlash } from "../plugins/fetch"; // 1. Strip `navigate` from props to prevent error // 2. Preserve stack param export default React.forwardRef((props, ref) => { - const { navigate, path, newTab, ...rest } = props; + const { navigate, path, newTab, absolutePath = false, ...rest } = props; const { stack, defaultStack } = useEnv(); const url = new Url(path, {}, true); @@ -24,8 +26,9 @@ export default React.forwardRef((props, ref) => { </Link> ); } else { + const href = absolutePath ? url.toString() : cleanDuplicateSlash(getBasename() + url.toString()); return ( - <Link ref={ref} target="_blank" href={url.toString()}> + <Link ref={ref} target="_blank" href={href}> {rest.children} <LaunchIcon fontSize="small" style={{ verticalAlign: "middle" }} /> diff --git a/ui/src/index.js b/ui/src/index.js index 52201aeaa..eb1b10ecf 100644 --- a/ui/src/index.js +++ b/ui/src/index.js @@ -8,6 +8,7 @@ import { BrowserRouter } from "react-router-dom"; import CssBaseline from "@material-ui/core/CssBaseline"; import { QueryClient, QueryClientProvider } from "react-query"; import { ReactQueryDevtools } from "react-query/devtools"; +import { getBasename } from "./utils/helpers"; const queryClient = new QueryClient({ defaultOptions: { @@ -22,7 +23,7 @@ ReactDOM.render( //<React.StrictMode> <QueryClientProvider client={queryClient}> <ThemeProvider> - <BrowserRouter> + <BrowserRouter basename={getBasename()}> <CssBaseline /> <ReactQueryDevtools initialIsOpen={true} /> diff --git a/ui/src/pages/workbench/WorkbenchForm.jsx b/ui/src/pages/workbench/WorkbenchForm.jsx index 7a1627008..5b4789988 100644 --- a/ui/src/pages/workbench/WorkbenchForm.jsx +++ b/ui/src/pages/workbench/WorkbenchForm.jsx @@ -201,6 +201,7 @@ function WorkbenchForm(props) { <FormikJsonInput className={classes.field} + reinitialize height={200} label="Task to Domain (JSON)" name="taskToDomain" diff --git a/ui/src/plugins/AppLogo.jsx b/ui/src/plugins/AppLogo.jsx index 265054283..aa29ec996 100644 --- a/ui/src/plugins/AppLogo.jsx +++ b/ui/src/plugins/AppLogo.jsx @@ -1,5 +1,7 @@ import React from "react"; import { makeStyles } from "@material-ui/core/styles"; +import { getBasename } from "../utils/helpers"; +import { cleanDuplicateSlash } from "./fetch"; const useStyles = makeStyles((theme) => ({ logo: { @@ -11,5 +13,6 @@ const useStyles = makeStyles((theme) => ({ export default function AppLogo() { const classes = useStyles(); - return <img src="/logo.svg" alt="Conductor" className={classes.logo} />; + const logoPath = getBasename() + 'logo.svg'; + return <img src={cleanDuplicateSlash(logoPath)} alt="Conductor" className={classes.logo} />; } diff --git a/ui/src/plugins/fetch.js b/ui/src/plugins/fetch.js index bf4ba2fe8..4467339ce 100644 --- a/ui/src/plugins/fetch.js +++ b/ui/src/plugins/fetch.js @@ -1,3 +1,4 @@ +import { getBasename } from "../utils/helpers"; import { useEnv } from "./env"; export function useFetchContext() { @@ -15,8 +16,9 @@ export function fetchWithContext( ) { const newParams = { ...fetchParams }; - const newPath = `/api/${path}`; - const cleanPath = newPath.replace(/([^:]\/)\/+/g, "$1"); // Cleanup duplicated slashes + const basename = getBasename(); + const newPath = basename + `api/${path}`; + const cleanPath = cleanDuplicateSlash(newPath); // Cleanup duplicated slashes return fetch(cleanPath, newParams) .then((res) => Promise.all([res, res.text()])) @@ -38,3 +40,7 @@ export function fetchWithContext( } }); } + +export function cleanDuplicateSlash(path) { + return path.replace(/([^:]\/)\/+/g, "$1"); +} diff --git a/ui/src/utils/helpers.js b/ui/src/utils/helpers.js index a514ce606..11bf45e94 100644 --- a/ui/src/utils/helpers.js +++ b/ui/src/utils/helpers.js @@ -1,5 +1,6 @@ import { format, formatDuration, intervalToDuration } from "date-fns"; import _ from "lodash"; +import packageJson from '../../package.json'; export function timestampRenderer(date) { if (_.isNil(date)) return null; @@ -88,3 +89,11 @@ export function isEmptyIterable(iterable) { } return true; } + +export function getBasename() { + let basename = '/'; + try{ + basename = new URL(packageJson.homepage).pathname; + } catch(e) {} + return _.isEmpty(basename) ? '/' : basename; +} diff --git a/ui/yarn.lock b/ui/yarn.lock index 6d4df6a9f..43d8cb922 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1678,20 +1678,19 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@monaco-editor/loader@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.3.2.tgz#04effbb87052d19cd7d3c9d81c0635490f9bb6d8" - integrity sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g== +"@monaco-editor/loader@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.4.0.tgz#f08227057331ec890fa1e903912a5b711a2ad558" + integrity sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg== dependencies: state-local "^1.0.6" -"@monaco-editor/react@^4.3.1": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.5.tgz#beabe491efeb2457441a00d1c7651c653697f65b" - integrity sha512-IImtzU7sRc66OOaQVCG+5PFHkSWnnhrUWGBuH6zNmH2h0YgmAhcjHZQc/6MY9JWEbUtVF1WPBMJ9u1XuFbRrVA== +"@monaco-editor/react@^4.4.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.6.0.tgz#bcc68671e358a21c3814566b865a54b191e24119" + integrity sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw== dependencies: - "@monaco-editor/loader" "^1.3.2" - prop-types "^15.7.2" + "@monaco-editor/loader" "^1.4.0" "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -7966,6 +7965,11 @@ moment@^2.29.2: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +monaco-editor@^0.44.0: + version "0.44.0" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.44.0.tgz#3c0fe3655923bbf7dd647057302070b5095b6c59" + integrity sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"