diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9528884b4..a25c97dd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,12 +42,7 @@ jobs: if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' run: | echo "Running build for commit ${{ github.sha }}" - ./gradlew build snapshot --scan - env: - NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }} - NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }} - NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} - NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} + ./gradlew build - name: Publish Test Report uses: mikepenz/action-junit-report@v3 if: always() diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index 008983429..5e0c28d3b 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -5,11 +5,11 @@ sourceSets { dependencies { implementation project(':conductor-annotations') - api 'com.google.guava:guava:32.1.2-jre' + api 'com.google.guava:guava:31.1-jre' api 'com.squareup:javapoet:1.13.+' api 'com.github.jknack:handlebars:4.3.+' api 'com.google.protobuf:protobuf-java:3.21.12' - api 'javax.annotation:javax.annotation-api:1.3.2' + api 'jakarta.annotation:jakarta.annotation-api:2.1.1' api gradleApi() exampleImplementation sourceSets.main.output diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 5e33e8d46..f0c8b22ee 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -1,48 +1,15 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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": "32.1.2-jre" + "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -53,26 +20,23 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.0" } }, "exampleCompileClasspath": { @@ -81,72 +45,6 @@ } }, "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 }, @@ -154,111 +52,39 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations" - ], - "locked": "1.30" + "locked": "2.20.0" } }, "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": "32.1.2-jre" + "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -269,85 +95,46 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations" - ], - "locked": "2.0" + "locked": "2.20.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": "32.1.2-jre" + "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -358,115 +145,43 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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": "32.1.2-jre" + "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.12" @@ -477,59 +192,50 @@ "com.squareup:javapoet": { "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { - "locked": "1.3.2" + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations" - ], - "locked": "2.0" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java index a2550d369..e694918c3 100644 --- a/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java +++ b/annotations-processor/src/main/java/com/netflix/conductor/annotationsprocessor/protogen/ProtoGen.java @@ -20,7 +20,6 @@ import java.net.URLClassLoader; import java.util.*; -import javax.annotation.Generated; import javax.lang.model.element.Modifier; import com.netflix.conductor.annotations.protogen.ProtoMessage; @@ -35,6 +34,7 @@ import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; +import jakarta.annotation.Generated; public class ProtoGen { private static final String GENERATOR_NAME = diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock index 3869be58c..545a15902 100644 --- a/annotations/dependencies.lock +++ b/annotations/dependencies.lock @@ -1,249 +1,99 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/awss3-storage/dependencies.lock b/awss3-storage/dependencies.lock index 1d8630110..c8239eb17 100644 --- a/awss3-storage/dependencies.lock +++ b/awss3-storage/dependencies.lock @@ -1,45 +1,12 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "compileClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "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" + "locked": "1.11.86" }, "com.netflix.conductor:conductor-common": { "project": true @@ -51,137 +18,72 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "runtimeClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "locked": "1.12.604" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -220,26 +122,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -254,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -262,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -270,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -278,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -286,59 +188,18 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "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.amazonaws:aws-java-sdk-s3": { - "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" + "locked": "1.11.86" }, "com.netflix.conductor:conductor-common": { "project": true @@ -349,150 +210,82 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "testRuntimeClasspath": { "com.amazonaws:aws-java-sdk-s3": { - "locked": "1.12.604" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -531,32 +324,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -571,7 +361,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -579,7 +369,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -587,7 +377,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -595,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -603,10 +393,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -615,18 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/awssqs-event-queue/dependencies.lock b/awssqs-event-queue/dependencies.lock index f93e7756f..3bb1559cd 100644 --- a/awssqs-event-queue/dependencies.lock +++ b/awssqs-event-queue/dependencies.lock @@ -1,48 +1,15 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "compileClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "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" + "locked": "1.11.86" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -57,140 +24,75 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "runtimeClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.12.604" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -235,20 +137,20 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -263,7 +165,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -271,7 +173,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -279,7 +181,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -287,7 +189,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -295,62 +197,21 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "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.amazonaws:aws-java-sdk-sqs": { - "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" + "locked": "1.11.86" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -364,156 +225,88 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "testRuntimeClasspath": { "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.12.604" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -558,26 +351,23 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -592,7 +382,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -600,7 +390,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -608,7 +398,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -616,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -624,10 +414,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -636,21 +426,13 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 12ceb391f..34041e57e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,18 +8,18 @@ buildscript { } } dependencies { - classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0' - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.18' + classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.1.4' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+' } } plugins { - id 'io.spring.dependency-management' version '1.1.3' + id 'io.spring.dependency-management' version '1.0.13.RELEASE' id 'java' id 'application' id 'jacoco' - id 'com.netflix.nebula.netflixoss' version '11.3.2' + id 'nebula.netflixoss' version '10.6.0' id 'org.sonarqube' version '3.4.0.2513' } @@ -47,16 +47,13 @@ apply from: "$rootDir/dependencies.gradle" apply from: "$rootDir/springboot-bom-overrides.gradle" allprojects { - apply plugin: 'com.netflix.nebula.netflixoss' + apply plugin: 'nebula.netflixoss' apply plugin: 'io.spring.dependency-management' apply plugin: 'java-library' apply plugin: 'project-report' - java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } - } + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 group = 'com.netflix.conductor' @@ -65,10 +62,6 @@ 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 { @@ -97,153 +90,12 @@ allprojects { dependencyManagement { imports { - // dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/2.7.3/reference/htmlsingle/#appendix.dependency-versions + // dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/3.1.4/reference/htmlsingle/#appendix.dependency-versions mavenBom(SpringBootPlugin.BOM_COORDINATES) } } dependencies { - implementation('org.apache.logging.log4j:log4j-core') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-api') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-slf4j-impl') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-jul') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.apache.logging.log4j:log4j-web') { - version { - // this is the preferred version this library will use - prefer '2.17.2' - // the strict bounds, effectively allowing any 2.x version greater than 2.17.2 - // could also remove the upper bound entirely if we wanted too - strictly '[2.17.2,3.0)' - } - } - implementation('org.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') @@ -251,15 +103,10 @@ allprojects { implementation('org.apache.logging.log4j:log4j-web') annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - testImplementation('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.yaml', module: 'snakeyaml' - } + testImplementation('org.springframework.boot:spring-boot-starter-test') 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 @@ -328,4 +175,4 @@ configure(allprojects - project(':conductor-grpc')) { } } } -} +} \ No newline at end of file diff --git a/cassandra-persistence/build.gradle b/cassandra-persistence/build.gradle index 6fee6f8ff..1d6745c61 100644 --- a/cassandra-persistence/build.gradle +++ b/cassandra-persistence/build.gradle @@ -23,7 +23,7 @@ dependencies { testImplementation project(':conductor-core').sourceSets.test.output testImplementation project(':conductor-common').sourceSets.test.output - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" testImplementation "org.testcontainers:spock:${revTestContainer}" diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock index 602532ed2..152c73575 100644 --- a/cassandra-persistence/dependencies.lock +++ b/cassandra-persistence/dependencies.lock @@ -1,46 +1,13 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -51,25 +18,22 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -78,110 +42,48 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -220,26 +122,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -254,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -262,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -270,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -278,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -286,62 +188,21 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "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.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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -352,53 +213,47 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.testcontainers:cassandra": { - "locked": "1.19.1" + "locked": "1.15.3" }, "org.testcontainers:spock": { - "locked": "1.19.1" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "1.15.3" } }, "testRuntimeClasspath": { @@ -407,110 +262,48 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -549,32 +342,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -583,13 +373,16 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -597,7 +390,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -605,7 +398,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -613,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -621,13 +414,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -636,30 +426,22 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.testcontainers:cassandra": { - "locked": "1.19.1" + "locked": "1.15.3" }, "org.testcontainers:spock": { - "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" + "locked": "1.15.3" } } } \ No newline at end of file diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java index 6f4b8bee1..fabfd3c55 100644 --- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java +++ b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableEventHandlerDAO.java @@ -20,8 +20,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.Cache; @@ -36,6 +34,8 @@ import com.netflix.conductor.dao.EventHandlerDAO; import com.netflix.conductor.metrics.Monitors; +import jakarta.annotation.PostConstruct; + import static com.netflix.conductor.cassandra.config.cache.CachingConfig.EVENT_HANDLER_CACHE; @Trace diff --git a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java index 256512ea4..2facedbd0 100644 --- a/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java +++ b/cassandra-persistence/src/main/java/com/netflix/conductor/cassandra/config/cache/CacheableMetadataDAO.java @@ -20,8 +20,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.Cache; @@ -38,6 +36,8 @@ import com.netflix.conductor.dao.MetadataDAO; import com.netflix.conductor.metrics.Monitors; +import jakarta.annotation.PostConstruct; + import static com.netflix.conductor.cassandra.config.cache.CachingConfig.TASK_DEF_CACHE; @Trace diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock index e6ab52ab9..c9914c60a 100644 --- a/client-spring/dependencies.lock +++ b/client-spring/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -51,25 +18,22 @@ "locked": "1.10.10" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "runtimeClasspath": { @@ -83,118 +47,50 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-java-sdk" ], - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -254,7 +150,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -270,7 +166,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -279,7 +175,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -288,7 +184,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -297,7 +193,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -306,14 +202,14 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.35" + "locked": "3.1.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -325,55 +221,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter": { - "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" + "locked": "3.1.4" } }, "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 }, @@ -389,38 +243,32 @@ "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "testRuntimeClasspath": { @@ -434,118 +282,50 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-java-sdk" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-java-sdk" ], - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -604,14 +384,11 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -627,7 +404,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -636,7 +413,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -645,7 +422,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -654,7 +431,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -663,17 +440,17 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-java-sdk" ], - "locked": "2.35" + "locked": "3.1.3" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -685,25 +462,16 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle index b16dd4e18..2ffd092ed 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -40,7 +40,7 @@ dependencies { testImplementation "org.powermock:powermock-module-junit4:${revPowerMock}" testImplementation "org.powermock:powermock-api-mockito2:${revPowerMock}" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" } diff --git a/client/dependencies.lock b/client/dependencies.lock index ae92bb8c3..eca08ea7a 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -1,45 +1,18 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "compileClasspath": { "com.amazonaws:aws-java-sdk-core": { - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.15.3" - }, - "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.15.3" + "locked": "2.15.2" }, "com.netflix.conductor:conductor-common": { "project": true @@ -63,19 +36,19 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -84,98 +57,42 @@ "locked": "23.0.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.0.9" } }, "runtimeClasspath": { "com.amazonaws:aws-java-sdk-core": { - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -205,7 +122,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -218,86 +135,52 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "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" + "locked": "2.0.9" } }, "testCompileClasspath": { "com.amazonaws:aws-java-sdk-core": { - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.15.3" - }, - "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.15.3" + "locked": "2.15.2" }, "com.netflix.conductor:conductor-common": { "project": true @@ -320,35 +203,32 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.powermock:powermock-api-mockito2": { "locked": "2.0.9" @@ -357,110 +237,54 @@ "locked": "2.0.9" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "testRuntimeClasspath": { "com.amazonaws:aws-java-sdk-core": { - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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" + "locked": "2.15.2" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -489,14 +313,11 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -504,49 +325,49 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.powermock:powermock-api-mockito2": { "locked": "2.0.9" @@ -555,26 +376,19 @@ "locked": "2.0.9" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.0" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 5f20d89b8..ef64ff263 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -9,7 +9,7 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter' compileOnly 'org.springframework.boot:spring-boot-starter-validation' - compileOnly "org.springdoc:springdoc-openapi-ui:${revOpenapi}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}" implementation "org.apache.commons:commons-lang3" diff --git a/common/dependencies.lock b/common/dependencies.lock index 3a2957989..4dfa1dd58 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -1,87 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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" @@ -92,7 +15,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "32.1.2-jre" + "locked": "31.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -115,204 +38,113 @@ ], "locked": "1.13.0" }, - "javax.annotation:javax.annotation-api": { + "jakarta.annotation:jakarta.annotation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "1.3.2" + "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-annotations-processor" - ], - "locked": "1.30" + "locked": "2.20.0" } }, "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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -321,75 +153,45 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations" - ], - "locked": "2.0" + "locked": "2.20.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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -397,115 +199,52 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.bval:bval-jsr": { - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -513,11 +252,8 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.bval:bval-jsr": { - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -526,49 +262,43 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations" - ], - "locked": "2.0" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java b/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java index ffcb71945..fefce75ba 100644 --- a/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java +++ b/common/src/main/java/com/netflix/conductor/common/config/ObjectMapperConfiguration.java @@ -12,13 +12,12 @@ */ package com.netflix.conductor.common.config; -import javax.annotation.PostConstruct; - import org.springframework.context.annotation.Configuration; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.module.afterburner.AfterburnerModule; +import jakarta.annotation.PostConstruct; @Configuration public class ObjectMapperConfiguration { diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java index 3bd402013..6f3015e6a 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/NoSemiColonConstraint.java @@ -17,13 +17,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.StringUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java index 55347529d..b010b4bb3 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/OwnerEmailMandatoryConstraint.java @@ -17,13 +17,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.StringUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.TYPE; diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java index 24f0ff433..f9dbc4c79 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/TaskReferenceNameUniqueConstraint.java @@ -19,17 +19,17 @@ import java.util.HashMap; import java.util.List; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import org.apache.commons.lang3.mutable.MutableBoolean; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; import com.netflix.conductor.common.utils.ConstraintParamUtil; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.TYPE; /** diff --git a/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java b/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java index 56525c7b5..a498dca65 100644 --- a/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java +++ b/common/src/main/java/com/netflix/conductor/common/constraints/TaskTimeoutConstraint.java @@ -17,13 +17,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; - import com.netflix.conductor.common.metadata.tasks.TaskDef; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static java.lang.annotation.ElementType.TYPE; /** diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java index 77dda4c1e..24084f2de 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/events/EventHandler.java @@ -17,16 +17,15 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.google.protobuf.Any; import io.swagger.v3.oas.annotations.Hidden; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; /** Defines an event handler */ @ProtoMessage diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java index 59e119a0e..658079e0a 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskDef.java @@ -18,12 +18,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; @@ -31,6 +25,12 @@ import com.netflix.conductor.common.constraints.TaskTimeoutConstraint; import com.netflix.conductor.common.metadata.BaseDef; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @ProtoMessage @TaskTimeoutConstraint @Valid diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java index 8953d499b..f31b6481b 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java @@ -17,8 +17,6 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import javax.validation.constraints.NotEmpty; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.annotations.protogen.ProtoEnum; @@ -27,6 +25,7 @@ import com.google.protobuf.Any; import io.swagger.v3.oas.annotations.Hidden; +import jakarta.validation.constraints.NotEmpty; /** Result of the task execution. */ @ProtoMessage diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java index cc01bca1a..e44edca62 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java @@ -15,14 +15,14 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + @ProtoMessage public class StartWorkflowRequest { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java index 816981b86..9cb934b64 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java @@ -15,14 +15,13 @@ import java.util.Map; import java.util.Objects; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonSetter; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @ProtoMessage public class SubWorkflowParams { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java index 6ce981f90..6d0676026 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDef.java @@ -19,13 +19,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.Email; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.netflix.conductor.annotations.protogen.ProtoEnum; import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; @@ -35,6 +28,13 @@ import com.netflix.conductor.common.metadata.BaseDef; import com.netflix.conductor.common.metadata.tasks.TaskType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @ProtoMessage @TaskReferenceNameUniqueConstraint public class WorkflowDef extends BaseDef { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java index fc0eca86d..bf22c0265 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefSummary.java @@ -14,12 +14,12 @@ import java.util.Objects; -import javax.validation.constraints.NotEmpty; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.netflix.conductor.common.constraints.NoSemiColonConstraint; +import jakarta.validation.constraints.NotEmpty; + @ProtoMessage public class WorkflowDefSummary implements Comparable { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java index 492a61d33..6395596f8 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/WorkflowTask.java @@ -21,16 +21,15 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.PositiveOrZero; - import com.netflix.conductor.annotations.protogen.ProtoField; import com.netflix.conductor.annotations.protogen.ProtoMessage; import com.netflix.conductor.common.metadata.tasks.TaskDef; import com.netflix.conductor.common.metadata.tasks.TaskType; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.PositiveOrZero; /** * This is the task definition definied as part of the {@link WorkflowDef}. The tasks definied in diff --git a/common/src/main/java/com/netflix/conductor/common/run/Workflow.java b/common/src/main/java/com/netflix/conductor/common/run/Workflow.java index 6936f9535..b84c99775 100644 --- a/common/src/main/java/com/netflix/conductor/common/run/Workflow.java +++ b/common/src/main/java/com/netflix/conductor/common/run/Workflow.java @@ -15,9 +15,6 @@ import java.util.*; import java.util.stream.Collectors; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.annotations.protogen.ProtoEnum; @@ -27,6 +24,9 @@ import com.netflix.conductor.common.metadata.tasks.Task; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; + @ProtoMessage public class Workflow extends Auditable { diff --git a/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java b/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java index 76127124e..60502402f 100644 --- a/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java +++ b/common/src/main/java/com/netflix/conductor/common/utils/SummaryUtil.java @@ -14,8 +14,6 @@ import java.util.Map; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -25,6 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; @Component public class SummaryUtil { diff --git a/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java b/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java index a6a1f5cd1..36cf22c50 100644 --- a/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java +++ b/common/src/test/java/com/netflix/conductor/common/events/EventHandlerTest.java @@ -16,15 +16,15 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Test; import com.netflix.conductor.common.metadata.events.EventHandler; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java b/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java index 41f966779..7e5108b05 100644 --- a/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java +++ b/common/src/test/java/com/netflix/conductor/common/tasks/TaskDefTest.java @@ -16,16 +16,16 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Before; import org.junit.Test; import com.netflix.conductor.common.metadata.tasks.TaskDef; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java b/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java index 1859c4a0d..bda8e0ddb 100644 --- a/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java +++ b/common/src/test/java/com/netflix/conductor/common/workflow/SubWorkflowParamsTest.java @@ -18,11 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +32,10 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java index 16a08851e..2ed545418 100644 --- a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java +++ b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowDefValidatorTest.java @@ -18,11 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Before; import org.junit.Test; @@ -30,6 +25,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowDef; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java index 6d052e4d3..0d9ea921e 100644 --- a/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java +++ b/common/src/test/java/com/netflix/conductor/common/workflow/WorkflowTaskTest.java @@ -16,16 +16,16 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import org.junit.Test; import com.netflix.conductor.common.metadata.tasks.TaskType; import com.netflix.conductor.common.metadata.workflow.WorkflowTask; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/core/build.gradle b/core/build.gradle index d1780f10e..c45b3c1c8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -55,7 +55,7 @@ dependencies { testImplementation 'org.springframework.retry:spring-retry' testImplementation project(':conductor-common').sourceSets.test.output - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" testImplementation "org.junit.vintage:junit-vintage-engine" diff --git a/core/dependencies.lock b/core/dependencies.lock index e0f506561..b1a1eee7e 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "compileClasspath": { @@ -14,35 +14,11 @@ "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" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -63,134 +39,75 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.0.3" } }, "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.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.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -217,16 +134,16 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -239,45 +156,38 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.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": { @@ -290,35 +200,11 @@ "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" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -339,158 +225,96 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.bval:bval-jsr": { - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.0.3" } }, "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.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.15.3" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -517,22 +341,19 @@ "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { - "locked": "2.0.0" + "locked": "2.0.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -540,77 +361,70 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.0" + "locked": "2.0.3" } } } \ No newline at end of file diff --git a/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java index d88150005..92255bc4d 100644 --- a/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java +++ b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,6 +50,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PreDestroy; import static com.netflix.conductor.core.utils.Utils.DECIDER_QUEUE; diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java index 76edb8a68..1096fdf50 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/tasks/StartWorkflow.java @@ -15,8 +15,6 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.Validator; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +29,7 @@ import com.netflix.conductor.model.WorkflowModel; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Validator; import static com.netflix.conductor.common.metadata.tasks.TaskType.TASK_TYPE_START_WORKFLOW; import static com.netflix.conductor.model.TaskModel.Status.COMPLETED; diff --git a/core/src/main/java/com/netflix/conductor/service/AdminService.java b/core/src/main/java/com/netflix/conductor/service/AdminService.java index 84d68c279..474743db4 100644 --- a/core/src/main/java/com/netflix/conductor/service/AdminService.java +++ b/core/src/main/java/com/netflix/conductor/service/AdminService.java @@ -15,12 +15,12 @@ import java.util.List; import java.util.Map; -import javax.validation.constraints.NotEmpty; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.tasks.Task; +import jakarta.validation.constraints.NotEmpty; + @Validated public interface AdminService { diff --git a/core/src/main/java/com/netflix/conductor/service/EventService.java b/core/src/main/java/com/netflix/conductor/service/EventService.java index c2f29e734..397503cf4 100644 --- a/core/src/main/java/com/netflix/conductor/service/EventService.java +++ b/core/src/main/java/com/netflix/conductor/service/EventService.java @@ -14,14 +14,14 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.events.EventHandler; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @Validated public interface EventService { diff --git a/core/src/main/java/com/netflix/conductor/service/MetadataService.java b/core/src/main/java/com/netflix/conductor/service/MetadataService.java index 701055ef8..babd46627 100644 --- a/core/src/main/java/com/netflix/conductor/service/MetadataService.java +++ b/core/src/main/java/com/netflix/conductor/service/MetadataService.java @@ -16,11 +16,6 @@ import java.util.Map; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.events.EventHandler; @@ -29,6 +24,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowDefSummary; import com.netflix.conductor.common.model.BulkResponse; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + @Validated public interface MetadataService { diff --git a/core/src/main/java/com/netflix/conductor/service/TaskService.java b/core/src/main/java/com/netflix/conductor/service/TaskService.java index 7f4f3d0a6..d89772659 100644 --- a/core/src/main/java/com/netflix/conductor/service/TaskService.java +++ b/core/src/main/java/com/netflix/conductor/service/TaskService.java @@ -15,10 +15,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.tasks.PollData; @@ -29,6 +25,10 @@ import com.netflix.conductor.common.run.SearchResult; import com.netflix.conductor.common.run.TaskSummary; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @Validated public interface TaskService { diff --git a/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java b/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java index 2c1ef0f7f..e54c94f60 100644 --- a/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java +++ b/core/src/main/java/com/netflix/conductor/service/WorkflowBulkService.java @@ -14,13 +14,13 @@ import java.util.List; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.model.BulkResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + @Validated public interface WorkflowBulkService { diff --git a/core/src/main/java/com/netflix/conductor/service/WorkflowService.java b/core/src/main/java/com/netflix/conductor/service/WorkflowService.java index bb760ac68..6ba2d7e64 100644 --- a/core/src/main/java/com/netflix/conductor/service/WorkflowService.java +++ b/core/src/main/java/com/netflix/conductor/service/WorkflowService.java @@ -15,12 +15,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import org.springframework.validation.annotation.Validated; import com.netflix.conductor.common.metadata.workflow.RerunWorkflowRequest; @@ -32,6 +26,12 @@ import com.netflix.conductor.common.run.Workflow; import com.netflix.conductor.common.run.WorkflowSummary; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + @Validated public interface WorkflowService { diff --git a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java index 493fd76b2..2501849be 100644 --- a/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java +++ b/core/src/main/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraint.java @@ -22,10 +22,6 @@ import java.util.Optional; import javax.script.ScriptException; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; import org.apache.commons.lang3.StringUtils; @@ -35,6 +31,11 @@ import com.netflix.conductor.core.events.ScriptEvaluator; import com.netflix.conductor.core.utils.DateTimeUtils; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; + import static com.netflix.conductor.core.execution.tasks.Terminate.getTerminationStatusParameter; import static com.netflix.conductor.core.execution.tasks.Terminate.validateInputStatus; import static com.netflix.conductor.core.execution.tasks.Wait.DURATION_INPUT; diff --git a/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 f9270d336..1dd2eeec1 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy @@ -14,8 +14,6 @@ package com.netflix.conductor.core.execution.tasks import java.time.Duration -import org.junit.Test - import com.netflix.conductor.common.metadata.tasks.TaskDef import com.netflix.conductor.service.MetadataService diff --git a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy index 3e64d7f23..9c6af719d 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/StartWorkflowSpec.groovy @@ -12,9 +12,6 @@ */ package com.netflix.conductor.core.execution.tasks -import javax.validation.ConstraintViolation -import javax.validation.Validator - import com.netflix.conductor.common.config.ObjectMapperProvider import com.netflix.conductor.core.exception.NotFoundException import com.netflix.conductor.core.exception.TransientException @@ -23,6 +20,8 @@ import com.netflix.conductor.core.operation.StartWorkflowOperation import com.netflix.conductor.model.TaskModel import com.netflix.conductor.model.WorkflowModel +import jakarta.validation.ConstraintViolation +import jakarta.validation.Validator import spock.lang.Specification import spock.lang.Subject diff --git a/core/src/test/java/com/netflix/conductor/TestUtils.java b/core/src/test/java/com/netflix/conductor/TestUtils.java index 41f1377e4..08428322c 100644 --- a/core/src/test/java/com/netflix/conductor/TestUtils.java +++ b/core/src/test/java/com/netflix/conductor/TestUtils.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolation; public class TestUtils { diff --git a/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java b/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java index 55cd1c7d8..e431a16e6 100644 --- a/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/core/metadata/MetadataMapperServiceTest.java @@ -16,8 +16,6 @@ import java.util.Optional; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -37,6 +35,8 @@ import com.netflix.conductor.core.exception.TerminateWorkflowException; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java b/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java index 620bb4e30..86a61e6ad 100644 --- a/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/EventServiceTest.java @@ -14,8 +14,6 @@ import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import com.netflix.conductor.core.events.EventQueues; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java index 87fd9054e..eed4afb4d 100644 --- a/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/MetadataServiceTest.java @@ -14,8 +14,6 @@ import java.util.*; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +33,8 @@ import com.netflix.conductor.dao.EventHandlerDAO; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java b/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java index 2c54d3a31..240b99e8c 100644 --- a/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/TaskServiceTest.java @@ -15,8 +15,6 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +29,8 @@ import com.netflix.conductor.common.run.TaskSummary; import com.netflix.conductor.dao.QueueDAO; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.*; diff --git a/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java b/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java index 20dcbfd4f..1936401f1 100644 --- a/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/WorkflowBulkServiceTest.java @@ -17,8 +17,6 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import com.netflix.conductor.core.execution.WorkflowExecutor; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.assertEquals; diff --git a/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java b/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java index dd6108983..772f2f2e9 100644 --- a/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java +++ b/core/src/test/java/com/netflix/conductor/service/WorkflowServiceTest.java @@ -18,8 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolationException; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +36,8 @@ import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.core.operation.StartWorkflowOperation; +import jakarta.validation.ConstraintViolationException; + import static com.netflix.conductor.TestUtils.getConstraintViolationMessages; import static org.junit.Assert.*; diff --git a/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java b/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java index 6e6f5d3b2..c66ed56df 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowDefConstraintTest.java @@ -18,12 +18,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - -import org.apache.bval.jsr.ApacheValidationProvider; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -36,6 +30,11 @@ import com.netflix.conductor.common.metadata.workflow.WorkflowTask; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; @@ -49,10 +48,7 @@ public class WorkflowDefConstraintTest { @BeforeClass public static void init() { - validatorFactory = - Validation.byProvider(ApacheValidationProvider.class) - .configure() - .buildValidatorFactory(); + validatorFactory = Validation.buildDefaultValidatorFactory(); validator = validatorFactory.getValidator(); } diff --git a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java index a15393248..84d2bcd59 100644 --- a/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java +++ b/core/src/test/java/com/netflix/conductor/validations/WorkflowTaskTypeConstraintTest.java @@ -20,13 +20,6 @@ import java.util.Map; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.executable.ExecutableValidator; - -import org.apache.bval.jsr.ApacheValidationProvider; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; @@ -41,6 +34,12 @@ import com.netflix.conductor.core.execution.tasks.Terminate; import com.netflix.conductor.dao.MetadataDAO; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ExecutableValidator; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; @@ -54,10 +53,7 @@ public class WorkflowTaskTypeConstraintTest { @BeforeClass public static void init() { - validatorFactory = - Validation.byProvider(ApacheValidationProvider.class) - .configure() - .buildValidatorFactory(); + validatorFactory = Validation.buildDefaultValidatorFactory(); validator = validatorFactory.getValidator(); } diff --git a/dependencies.gradle b/dependencies.gradle index 4864b8cdf..41c0f0317 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,25 +15,26 @@ * Common place to define all the version dependencies */ ext { - revActivation = '2.0.0' + revActivation = '2.0.1' + revApacheHttpComponentsClient5 = '5.2.1' revAwaitility = '3.1.6' - revAwsSdk = '1.12.604' - revBval = '2.0.6' + revAwsSdk = '1.11.86' + revBval = '2.0.5' revCassandra = '3.10.2' revCassandraUnit = '3.11.2.0' - revCommonsCompress = '1.24.0' revCommonsIo = '2.7' revDynoQueues = '2.0.20' - revElasticSearch6 = '6.8.17' + revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revFasterXml = '2.15.3' - revGroovy = '3.0.19' - revGrpc = '1.59.1' - revGuava = '32.1.2-jre' + revGroovy = '4.0.9' + revGrpc = '1.57.2' + revGuava = '30.0-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' - revJAXB = '2.3.3' + revProtoBuf = '3.21.12' + revJakartaAnnotation = '2.1.1' + revJAXB = '4.0.1' revJAXRS = '2.1.1' revJedis = '3.3.0' revJersey = '1.19.4' @@ -42,17 +43,18 @@ ext { revJq = '0.0.13' revJsr311Api = '1.1.1' revMockServerClient = '5.12.0' - revOpenapi = '1.6.+' - revOrkesQueues = '1.0.3' + revSpringDoc = '2.1.0' + revOrkesQueues = '1.0.7' revPowerMock = '2.0.9' - revProtoBuf = '3.24.3' + revProtoBuf = '3.21.12' revProtogenAnnotations = '1.0.0' revProtogenCodegen = '1.4.0' revRarefiedRedis = '0.0.17' revRedisson = '3.13.3' revRxJava = '1.2.2' revSpectator = '0.122.0' - revSpock = '2.3-groovy-3.0' + revSpock = '2.4-M1-groovy-4.0' revSpotifyCompletableFutures = '0.3.3' - revTestContainer = '1.19.1' + revTestContainer = '1.15.3' + revFasterXml = '2.15.3' } diff --git a/dependencies.lock b/dependencies.lock index 574b845ec..fd0cb733b 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,60 +1,24 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.0" } }, "jacocoAgent": { @@ -68,192 +32,78 @@ } }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/es6-persistence/build.gradle b/es6-persistence/build.gradle index 2bf0d49c8..d033895bb 100644 --- a/es6-persistence/build.gradle +++ b/es6-persistence/build.gradle @@ -23,9 +23,9 @@ dependencies { // SBMTODO: remove guava dep implementation "com.google.guava:guava:${revGuava}" - implementation "org.elasticsearch.client:transport" - implementation "org.elasticsearch.client:elasticsearch-rest-client" - implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client" + implementation "org.elasticsearch.client:transport:${revElasticSearch6}" + implementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch6}" + implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch6}" testImplementation 'org.springframework.retry:spring-retry' testImplementation "org.awaitility:awaitility:${revAwaitility}" diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index e10fabafe..90c1e4bed 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -1,45 +1,12 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -54,149 +21,84 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.0.3" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -235,26 +137,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -269,7 +171,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -277,7 +179,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -285,7 +187,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -293,7 +195,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -301,68 +203,27 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.17" + "locked": "6.8.12" }, "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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -376,168 +237,100 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.awaitility:awaitility": { "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" + "locked": "2.0.3" }, "org.testcontainers:elasticsearch": { - "locked": "1.19.1" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "1.15.3" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -576,32 +369,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -616,7 +406,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -624,7 +414,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -632,7 +422,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -640,7 +430,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -648,22 +438,22 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.awaitility:awaitility": { "locked": "3.1.6" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { - "locked": "6.8.17" + "locked": "6.8.12" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -672,24 +462,16 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" + "locked": "2.0.3" }, "org.testcontainers:elasticsearch": { - "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" + "locked": "1.15.3" } } } \ No newline at end of file diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java index 0a8c86f35..bbf05423e 100644 --- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java +++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchDAOV6.java @@ -21,9 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.commons.lang3.StringUtils; import org.elasticsearch.ResourceAlreadyExistsException; import org.elasticsearch.action.DocWriteResponse; @@ -73,6 +70,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.MapType; import com.fasterxml.jackson.databind.type.TypeFactory; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; @Trace public class ElasticSearchDAOV6 extends ElasticSearchBaseDAO implements IndexDAO { diff --git a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java index 9792d5222..e51d13341 100644 --- a/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java +++ b/es6-persistence/src/main/java/com/netflix/conductor/es6/dao/index/ElasticSearchRestDAOV6.java @@ -22,9 +22,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; @@ -79,6 +76,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.type.MapType; import com.fasterxml.jackson.databind.type.TypeFactory; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; @Trace public class ElasticSearchRestDAOV6 extends ElasticSearchBaseDAO implements IndexDAO { diff --git a/grpc-client/build.gradle b/grpc-client/build.gradle index 4ddd6bc71..d7e6d7239 100644 --- a/grpc-client/build.gradle +++ b/grpc-client/build.gradle @@ -21,5 +21,6 @@ dependencies { implementation "com.google.protobuf:protobuf-java:${revProtoBuf}" implementation "org.slf4j:slf4j-api" implementation "org.apache.commons:commons-lang3" + implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}" implementation "com.google.guava:guava:${revGuava}" } diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 6a271634a..a0dd3f493 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -1,48 +1,15 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -51,137 +18,67 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.0.9" } }, "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-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "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-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.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" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -199,19 +96,25 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -223,7 +126,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -237,7 +140,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -245,7 +148,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -253,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -261,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -269,59 +172,18 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-grpc" - ], - "locked": "2.0" + "locked": "2.0.9" } }, "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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -330,152 +192,79 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.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" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-databind": { "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-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.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" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -493,19 +282,25 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -516,14 +311,11 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -537,7 +329,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -545,7 +337,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -553,7 +345,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -561,7 +353,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -569,27 +361,19 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.slf4j:slf4j-api": { - "locked": "1.7.36" + "locked": "2.0.9" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java index 5b299a93b..0450547c5 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/ClientBase.java @@ -14,8 +14,6 @@ import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +22,7 @@ import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; abstract class ClientBase { diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java index 256f33b10..83e51cd64 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/MetadataClient.java @@ -14,8 +14,6 @@ import java.util.List; -import javax.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.tasks.TaskDef; @@ -25,6 +23,7 @@ import com.google.common.base.Preconditions; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; public class MetadataClient extends ClientBase { diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java index 92403d8a4..0cbf37c99 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/TaskClient.java @@ -16,8 +16,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.tasks.Task; @@ -34,6 +32,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; public class TaskClient extends ClientBase { diff --git a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java index fd211f0af..86c78e682 100644 --- a/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java +++ b/grpc-client/src/main/java/com/netflix/conductor/client/grpc/WorkflowClient.java @@ -16,8 +16,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import com.netflix.conductor.common.metadata.workflow.RerunWorkflowRequest; @@ -32,6 +30,7 @@ import com.google.common.base.Preconditions; import io.grpc.ManagedChannelBuilder; +import jakarta.annotation.Nullable; public class WorkflowClient extends ClientBase { diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 98ac4cad5..ae4dd2f1c 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -48,144 +15,68 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.1" + "locked": "1.57.2" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-grpc" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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-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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -193,13 +84,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -239,40 +130,46 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -285,7 +182,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -301,7 +198,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -310,7 +207,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -319,7 +216,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -328,7 +225,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -337,58 +234,16 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "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", - "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 }, @@ -399,162 +254,83 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.1" + "locked": "1.57.2" }, "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "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-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-grpc" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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-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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -562,13 +338,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -608,43 +384,49 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -655,15 +437,12 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -679,7 +458,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -688,7 +467,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -697,7 +476,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -706,7 +485,7 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -715,10 +494,10 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -727,22 +506,13 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "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-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java index 7d10ac59f..4f62be3d8 100644 --- a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java +++ b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/GRPCServer.java @@ -15,15 +15,14 @@ import java.io.IOException; import java.util.List; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.grpc.BindableService; import io.grpc.Server; import io.grpc.ServerBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; public class GRPCServer { diff --git a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java index 0dd626fa6..4b0cae8bb 100644 --- a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java +++ b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/GRPCHelper.java @@ -14,8 +14,6 @@ import java.util.Arrays; -import javax.annotation.Nonnull; - import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; @@ -25,6 +23,7 @@ import io.grpc.StatusException; import io.grpc.protobuf.lite.ProtoLiteUtils; import io.grpc.stub.StreamObserver; +import jakarta.annotation.Nonnull; public class GRPCHelper { diff --git a/grpc/build.gradle b/grpc/build.gradle index fabaac0d4..c75b2f7e7 100644 --- a/grpc/build.gradle +++ b/grpc/build.gradle @@ -33,7 +33,9 @@ dependencies { implementation "com.google.protobuf:protobuf-java:${revProtoBuf}" implementation "io.grpc:grpc-protobuf:${revGrpc}" implementation "io.grpc:grpc-stub:${revGrpc}" - implementation "javax.annotation:javax.annotation-api:1.3.2" + implementation "jakarta.annotation:jakarta.annotation-api:${revJakartaAnnotation}" + implementation "javax.annotation:javax.annotation-api:1.3.2" //Needs to be added as a workaround for the generated tags + } def artifactName = 'com.google.protobuf:protoc:3.14.0:osx-x86_64' diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index cf7a62e28..c36eb50e6 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -1,160 +1,68 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.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.15.3" + "locked": "2.15.2" }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -166,10 +74,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -178,7 +89,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -191,47 +102,40 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.0" + "locked": "2.20.0" } }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.59.1" + "locked": "1.57.2" } }, "protobufToolsLocator_protoc": { @@ -240,88 +144,29 @@ } }, "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.15.3" + "locked": "2.15.2" }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -333,10 +178,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -345,7 +193,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -358,89 +206,52 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.0" + "locked": "2.20.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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -448,120 +259,55 @@ "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -573,10 +319,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -584,14 +333,11 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -604,136 +350,70 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -745,10 +425,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "locked": "2.1.1" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -756,14 +439,11 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -776,51 +456,44 @@ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common" - ], - "locked": "2.0" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java index c9cd06e38..8548d9120 100644 --- a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java +++ b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java @@ -40,6 +40,7 @@ import com.netflix.conductor.proto.WorkflowPb; import com.netflix.conductor.proto.WorkflowSummaryPb; import com.netflix.conductor.proto.WorkflowTaskPb; +import jakarta.annotation.Generated; import java.lang.IllegalArgumentException; import java.lang.Object; import java.lang.String; @@ -49,7 +50,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Generated; @Generated("com.netflix.conductor.annotationsprocessor.protogen") public abstract class AbstractProtoMapper { diff --git a/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java b/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java index 31286609a..80d9f08e0 100644 --- a/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java +++ b/grpc/src/test/java/com/netflix/conductor/grpc/TestProtoMapper.java @@ -39,7 +39,7 @@ public void workflowTaskFromProto() { final WorkflowTaskPb.WorkflowTask taskWithDefaultRetryCount = WorkflowTaskPb.WorkflowTask.newBuilder().build(); final WorkflowTaskPb.WorkflowTask taskWith1RetryCount = WorkflowTaskPb.WorkflowTask.newBuilder().setRetryCount(1).build(); final WorkflowTaskPb.WorkflowTask taskWithNoRetryCount = WorkflowTaskPb.WorkflowTask.newBuilder().setRetryCount(-1).build(); - assertEquals(new Integer(0), mapper.fromProto(taskWithDefaultRetryCount).getRetryCount()); + assertEquals(Integer.valueOf(0), mapper.fromProto(taskWithDefaultRetryCount).getRetryCount()); assertEquals(1, mapper.fromProto(taskWith1RetryCount).getRetryCount().intValue()); assertNull(mapper.fromProto(taskWithNoRetryCount).getRetryCount()); } diff --git a/http-task/build.gradle b/http-task/build.gradle index a9f76899e..93bbe2599 100644 --- a/http-task/build.gradle +++ b/http-task/build.gradle @@ -17,6 +17,7 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter-web' implementation "javax.ws.rs:jsr311-api:${revJsr311Api}" + implementation("org.apache.httpcomponents.client5:httpclient5:${revApacheHttpComponentsClient5}") testImplementation 'org.springframework.boot:spring-boot-starter-web' testImplementation "org.testcontainers:mockserver:${revTestContainer}" diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index f2ded231e..8fd71e7f0 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -47,138 +14,76 @@ "javax.ws.rs:jsr311-api": { "locked": "1.1.1" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -217,19 +122,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1" @@ -239,7 +144,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -248,13 +153,16 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -262,7 +170,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -270,7 +178,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -278,7 +186,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -286,57 +194,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "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.netflix.conductor:conductor-common": { "project": true }, @@ -349,23 +216,23 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" @@ -374,134 +241,69 @@ "locked": "1.70" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.mock-server:mockserver-client-java": { "locked": "5.12.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.testcontainers:mockserver": { - "locked": "1.19.1" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "1.15.3" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -540,19 +342,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1" @@ -560,15 +362,12 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -577,13 +376,16 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -591,7 +393,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -599,7 +401,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -607,7 +409,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -615,7 +417,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.bouncycastle:bcpkix-jdk15on": { "locked": "1.70" @@ -624,7 +426,7 @@ "locked": "1.70" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.mock-server:mockserver-client-java": { "locked": "5.12.0" @@ -636,24 +438,16 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.testcontainers:mockserver": { - "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" + "locked": "1.15.3" } } } \ No newline at end of file diff --git a/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java b/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java index 3b3a0c14f..d388b165e 100644 --- a/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java +++ b/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java @@ -167,13 +167,18 @@ protected HttpResponse httpCall(Input input) throws Exception { HttpResponse response = new HttpResponse(); try { ResponseEntity responseEntity = - restTemplate.exchange(input.getUri(), input.getMethod(), request, String.class); + restTemplate.exchange( + input.getUri(), + HttpMethod.valueOf(input.getMethod()), + request, + String.class); if (responseEntity.getStatusCode().is2xxSuccessful() && responseEntity.hasBody()) { response.body = extractBody(responseEntity.getBody()); } response.statusCode = responseEntity.getStatusCodeValue(); - response.reasonPhrase = responseEntity.getStatusCode().getReasonPhrase(); + response.reasonPhrase = + HttpStatus.valueOf(responseEntity.getStatusCode().value()).getReasonPhrase(); response.headers = responseEntity.getHeaders(); return response; } catch (RestClientException ex) { @@ -253,7 +258,7 @@ public Map asMap() { public static class Input { - private HttpMethod method; // PUT, POST, GET, DELETE, OPTIONS, HEAD + private String method; // PUT, POST, GET, DELETE, OPTIONS, HEAD private String vipAddress; private String appName; private Map headers = new HashMap<>(); @@ -267,7 +272,7 @@ public static class Input { /** * @return the method */ - public HttpMethod getMethod() { + public String getMethod() { return method; } @@ -275,7 +280,7 @@ public HttpMethod getMethod() { * @param method the method to set */ public void setMethod(String method) { - this.method = HttpMethod.valueOf(method); + this.method = method; } /** diff --git a/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java b/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java index d460e36f6..0a1cfd2f7 100644 --- a/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java +++ b/http-task/src/main/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProvider.java @@ -14,7 +14,10 @@ import java.time.Duration; import java.util.Optional; +import java.util.concurrent.TimeUnit; +import org.apache.hc.core5.http.io.SocketConfig; +import org.apache.hc.core5.util.Timeout; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.client.RestTemplateBuilder; @@ -32,7 +35,7 @@ @Component public class DefaultRestTemplateProvider implements RestTemplateProvider { - private final ThreadLocal threadLocalRestTemplate; + private final ThreadLocal threadLocalRestTemplateBuilder; private final int defaultReadTimeout; private final int defaultConnectTimeout; @@ -41,20 +44,28 @@ public class DefaultRestTemplateProvider implements RestTemplateProvider { public DefaultRestTemplateProvider( @Value("${conductor.tasks.http.readTimeout:150ms}") Duration readTimeout, @Value("${conductor.tasks.http.connectTimeout:100ms}") Duration connectTimeout) { - this.threadLocalRestTemplate = ThreadLocal.withInitial(RestTemplate::new); + this.threadLocalRestTemplateBuilder = ThreadLocal.withInitial(RestTemplateBuilder::new); this.defaultReadTimeout = (int) readTimeout.toMillis(); this.defaultConnectTimeout = (int) connectTimeout.toMillis(); } @Override public @NonNull RestTemplate getRestTemplate(@NonNull HttpTask.Input input) { - RestTemplate restTemplate = threadLocalRestTemplate.get(); + Duration timeout = + Duration.ofMillis( + Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout)); + threadLocalRestTemplateBuilder.get().setReadTimeout(timeout); + RestTemplate restTemplate = + threadLocalRestTemplateBuilder.get().setReadTimeout(timeout).build(); HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(); + SocketConfig.Builder builder = SocketConfig.custom(); + builder.setSoTimeout( + Timeout.of( + Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout), + TimeUnit.MILLISECONDS)); requestFactory.setConnectTimeout( Optional.ofNullable(input.getConnectionTimeOut()).orElse(defaultConnectTimeout)); - requestFactory.setReadTimeout( - Optional.ofNullable(input.getReadTimeOut()).orElse(defaultReadTimeout)); restTemplate.setRequestFactory(requestFactory); return restTemplate; } diff --git a/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java b/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java index f82662556..2b2f6a6df 100644 --- a/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java +++ b/http-task/src/test/java/com/netflix/conductor/tasks/http/HttpTaskTest.java @@ -315,7 +315,7 @@ public void testHTTPGETReadTimeOut() { task.setScheduledTime(0); httpTask.start(workflow, task, workflowExecutor); - assertEquals(task.getStatus(), TaskModel.Status.FAILED); + assertEquals(TaskModel.Status.FAILED, task.getStatus()); } @Test diff --git a/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java b/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java index 816f5d6f9..3141e47e5 100644 --- a/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java +++ b/http-task/src/test/java/com/netflix/conductor/tasks/http/providers/DefaultRestTemplateProviderTest.java @@ -14,6 +14,7 @@ import java.time.Duration; +import org.junit.Ignore; import org.junit.Test; import org.springframework.web.client.RestTemplate; @@ -46,6 +47,7 @@ public void differentObjectsForDifferentThreads() throws InterruptedException { } @Test + @Ignore("We can no longer do this and have customizable timeouts per HttpTask.") public void sameObjectForSameThread() { DefaultRestTemplateProvider defaultRestTemplateProvider = new DefaultRestTemplateProvider(Duration.ofMillis(150), Duration.ofMillis(100)); diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 0888468fa..91ce0f4cb 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -20,7 +20,7 @@ dependencies { testImplementation "com.fasterxml.jackson.core:jackson-core:${revFasterXml}" testImplementation "org.apache.commons:commons-lang3" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" } diff --git a/java-sdk/dependencies.lock b/java-sdk/dependencies.lock index 7f9b9098b..0d209a90f 100644 --- a/java-sdk/dependencies.lock +++ b/java-sdk/dependencies.lock @@ -1,48 +1,18 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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.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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { "project": true @@ -57,28 +27,25 @@ "locked": "2.1.1" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" } }, "runtimeClasspath": { @@ -89,104 +56,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.15.3" + "locked": "2.15.2" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -237,7 +146,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -252,7 +161,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -260,7 +169,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -268,7 +177,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -276,7 +185,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -284,7 +193,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -299,56 +208,21 @@ "firstLevelTransitive": [ "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" + "locked": "2.0.9" } }, "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.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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { "project": true @@ -365,56 +239,50 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework:spring-web": { - "locked": "5.3.31" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "6.0.12" } }, "testRuntimeClasspath": { @@ -425,104 +293,46 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "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" + "locked": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { "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-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.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-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-client", - "com.netflix.conductor:conductor-common" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.15.3" + "locked": "2.15.2" }, "com.google.guava:guava": { - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -572,14 +382,11 @@ "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -588,13 +395,16 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -602,7 +412,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -610,7 +420,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -618,7 +428,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -626,10 +436,7 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-common" ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -638,7 +445,7 @@ "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "locked": "15.4" @@ -647,30 +454,22 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework:spring-web": { - "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" + "locked": "6.0.12" } } } \ No newline at end of file diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index 6731c8cf1..010c2e434 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -1,45 +1,12 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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" + "locked": "3.1.8" }, "com.netflix.conductor:conductor-common": { "project": true @@ -51,134 +18,69 @@ "locked": "0.0.13" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -217,19 +119,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "net.thisptr:jackson-jq": { "locked": "0.0.13" @@ -239,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -254,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -262,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -270,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -278,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -286,59 +188,18 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "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.github.ben-manes.caffeine:caffeine": { - "locked": "2.9.3" + "locked": "3.1.8" }, "com.netflix.conductor:conductor-common": { "project": true @@ -349,147 +210,79 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "net.thisptr:jackson-jq": { "locked": "0.0.13" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -528,26 +321,23 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "net.thisptr:jackson-jq": { "locked": "0.0.13" }, @@ -556,7 +346,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -571,7 +361,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -579,7 +369,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -587,7 +377,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -595,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -603,10 +393,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -615,18 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/redis-concurrency-limit/build.gradle b/redis-concurrency-limit/build.gradle index 9c826ea61..20c508809 100644 --- a/redis-concurrency-limit/build.gradle +++ b/redis-concurrency-limit/build.gradle @@ -11,11 +11,11 @@ dependencies { implementation "redis.clients:jedis:3.6.0" // Jedis version "revJedis=3.3.0" does not play well with Spring Data Redis implementation "org.apache.commons:commons-lang3" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" testImplementation "org.testcontainers:spock:${revTestContainer}" testImplementation "org.testcontainers:testcontainers:${revTestContainer}" testImplementation "com.google.protobuf:protobuf-java:${revProtoBuf}" - testImplementation 'org.springframework.data:spring-data-redis' + testImplementation 'org.springframework.data:spring-data-redis:2.7.16' } diff --git a/redis-concurrency-limit/dependencies.lock b/redis-concurrency-limit/dependencies.lock index 8c61b8f60..3a3cb7f21 100644 --- a/redis-concurrency-limit/dependencies.lock +++ b/redis-concurrency-limit/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -48,28 +15,25 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -78,110 +42,48 @@ "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -220,26 +122,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -254,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -262,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -270,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -278,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -286,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -294,54 +196,19 @@ ], "locked": "15.4" }, - "org.yaml:snakeyaml": { + "org.springdoc:springdoc-openapi-starter-webmvc-ui": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.0" + "locked": "2.1.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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-common": { "project": true @@ -352,56 +219,50 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.18" + "locked": "2.7.16" }, "org.testcontainers:spock": { - "locked": "1.19.1" + "locked": "1.15.3" }, "org.testcontainers:testcontainers": { - "locked": "1.19.1" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "1.15.3" }, "redis.clients:jedis": { "locked": "3.6.0" @@ -410,110 +271,48 @@ "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -552,32 +351,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -586,13 +382,16 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -600,7 +399,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -608,7 +407,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -616,7 +415,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -624,13 +423,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -639,33 +435,31 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" + }, + "org.springdoc:springdoc-openapi-starter-webmvc-ui": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.1.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.data:spring-data-redis": { - "locked": "2.7.18" + "locked": "2.7.16" }, "org.testcontainers:spock": { - "locked": "1.19.1" + "locked": "1.15.3" }, "org.testcontainers:testcontainers": { - "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" + "locked": "1.15.3" }, "redis.clients:jedis": { "locked": "3.6.0" diff --git a/redis-lock/dependencies.lock b/redis-lock/dependencies.lock index 4c9d61e36..82ba26589 100644 --- a/redis-lock/dependencies.lock +++ b/redis-lock/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -45,137 +12,72 @@ "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.redisson:redisson": { "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -214,26 +116,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -248,7 +150,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -256,7 +158,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -264,7 +166,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -272,7 +174,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -280,7 +182,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -290,50 +192,9 @@ }, "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" }, @@ -343,137 +204,69 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.redisson:redisson": { "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.github.kstyrc:embedded-redis": { "locked": "0.6" @@ -483,13 +276,13 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -528,32 +321,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -568,7 +358,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -576,7 +366,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -584,7 +374,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -592,7 +382,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -600,10 +390,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -615,18 +405,10 @@ "locked": "3.13.3" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 7e8f781d8..4da148cad 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -51,28 +18,25 @@ "locked": "1.4.20" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -81,110 +45,48 @@ "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -229,26 +131,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -263,7 +165,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -271,7 +173,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -279,7 +181,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -287,7 +189,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -295,7 +197,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -306,52 +208,11 @@ "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 }, @@ -367,38 +228,32 @@ "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -407,110 +262,48 @@ "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -555,32 +348,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -595,7 +385,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -603,7 +393,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -611,7 +401,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -619,7 +409,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -627,10 +417,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -642,18 +432,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "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" + "locked": "3.1.4" }, "redis.clients:jedis": { "locked": "3.3.0" diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java index 9e32a1d5f..2ae22e7d0 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/redis/dynoqueue/ConfigurationHostSupplier.java @@ -40,6 +40,9 @@ public List getHosts() { } private List parseHostsFromConfig() { + System.out.println("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + System.out.println("Properties in ConfigurationHostSupplier: "); + System.out.println(properties); String hosts = properties.getHosts(); if (hosts == null) { String message = diff --git a/rest/build.gradle b/rest/build.gradle index 97d66d816..dc19c73dd 100644 --- a/rest/build.gradle +++ b/rest/build.gradle @@ -7,5 +7,5 @@ dependencies { implementation "com.netflix.runtime:health-api:${revHealth}" - implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}" } diff --git a/rest/dependencies.lock b/rest/dependencies.lock index 00169a86d..77e50509f 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -48,137 +15,72 @@ "locked": "1.1.4" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -220,26 +122,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "org.apache.bval:bval-jsr": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -254,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -262,7 +164,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -270,7 +172,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -278,7 +180,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -286,7 +188,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -298,51 +200,10 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "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" + "locked": "3.1.4" } }, "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 }, @@ -355,150 +216,82 @@ "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "3.1.4" } }, "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.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-annotations", - "com.netflix.conductor:conductor-common", - "com.netflix.conductor:conductor-core" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -540,32 +333,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "junit:junit": { "locked": "4.13.2" }, - "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.6" + "locked": "2.0.5" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -580,7 +370,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -588,7 +378,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -596,7 +386,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -604,7 +394,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -612,10 +402,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.openjdk.nashorn:nashorn-core": { "firstLevelTransitive": [ @@ -627,21 +417,13 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "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" + "locked": "3.1.4" } } } \ No newline at end of file diff --git a/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java b/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java index ab5c47eee..f61b8e95d 100644 --- a/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java +++ b/rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java @@ -15,8 +15,6 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; @@ -33,6 +31,7 @@ import com.netflix.conductor.metrics.Monitors; import com.fasterxml.jackson.databind.exc.InvalidFormatException; +import jakarta.servlet.http.HttpServletRequest; @RestControllerAdvice @Order(ValidationExceptionMapper.ORDER + 1) diff --git a/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java b/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java index 704f72e05..928e7419f 100644 --- a/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java +++ b/rest/src/main/java/com/netflix/conductor/rest/controllers/ValidationExceptionMapper.java @@ -16,11 +16,6 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ValidationException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.Ordered; @@ -35,6 +30,11 @@ import com.netflix.conductor.core.utils.Utils; import com.netflix.conductor.metrics.Monitors; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ValidationException; + /** This class converts Hibernate {@link ValidationException} into http response. */ @RestControllerAdvice @Order(ValidationExceptionMapper.ORDER) diff --git a/server/build.gradle b/server/build.gradle index 7870d4df0..38ebba808 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -37,11 +37,13 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-log4j2' implementation 'org.apache.logging.log4j:log4j-web' + implementation "redis.clients:jedis:${revJedis}" implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation "io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}" - implementation "org.springdoc:springdoc-openapi-ui:${revOpenapi}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}" + runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${revJAXB}" diff --git a/server/dependencies.lock b/server/dependencies.lock index e8aa04b88..551cb5f20 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -1,43 +1,10 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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 }, @@ -75,46 +42,46 @@ "project": true }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" + "locked": "2.0.3" }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "redis.clients:jedis": { + "locked": "3.3.0" } }, "productionRuntimeClasspath": { @@ -122,13 +89,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -138,210 +105,43 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "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-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" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.1.2-jre" + "locked": "32.0.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -349,13 +149,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -476,48 +276,54 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -558,6 +364,12 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -576,7 +388,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -596,7 +408,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -616,7 +428,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -636,7 +448,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -656,28 +468,34 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "8.7.1" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -698,49 +516,32 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "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" + "locked": "2.0.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } }, "runtimeClasspath": { @@ -748,13 +549,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -764,210 +565,43 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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" + "com.netflix.conductor:conductor-core" ], - "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.2" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "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-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" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.1.2-jre" + "locked": "32.0.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -975,13 +609,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.22.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -1102,48 +736,54 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -1184,6 +824,12 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -1202,7 +848,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -1222,7 +868,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -1242,7 +888,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -1262,7 +908,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -1282,28 +928,34 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "8.7.1" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -1324,87 +976,37 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "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" + "locked": "2.0.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } }, "testCompileClasspath": { - "com.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.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-awss3-storage": { "project": true @@ -1446,67 +1048,64 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.springdoc:springdoc-openapi-ui": { "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" + "locked": "2.0.3" }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "redis.clients:jedis": { + "locked": "3.3.0" } }, "testRuntimeClasspath": { @@ -1514,13 +1113,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -1530,210 +1129,43 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ - "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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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.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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "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-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" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.1.2-jre" + "locked": "32.0.1-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -1741,13 +1173,13 @@ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-grpc" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -1868,51 +1300,57 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.59.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -1929,9 +1367,6 @@ "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" @@ -1959,6 +1394,12 @@ ], "locked": "3.12.0" }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -1977,7 +1418,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -1997,7 +1438,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -2017,7 +1458,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -2037,7 +1478,7 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -2057,31 +1498,37 @@ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-rest" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "8.7.1" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { - "locked": "2.3.3" + "locked": "4.0.1" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -2102,52 +1549,35 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "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" + "locked": "2.0.3" }, "redis.clients:jedis": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-concurrency-limit", "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "3.8.0" + "locked": "3.3.0" } } } \ No newline at end of file diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 09b8f22b4..9889a2022 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -15,7 +15,7 @@ spring.application.name=conductor springdoc.api-docs.path=/api-docs loadSample=true -conductor.db.type=memory +conductor.db.type=redis_standalone conductor.queue.type=redis_standalone conductor.indexing.enabled=false diff --git a/springboot-bom-overrides.gradle b/springboot-bom-overrides.gradle index dc9f79b60..328a12a2a 100644 --- a/springboot-bom-overrides.gradle +++ b/springboot-bom-overrides.gradle @@ -12,7 +12,7 @@ */ // Contains overrides for Spring Boot Dependency Management plugin -// Dependency version override properties can be found at https://docs.spring.io/spring-boot/docs/2.7.3/reference/htmlsingle/#appendix.dependency-versions.properties +// Dependency version override properties can be found at https://docs.spring.io/spring-boot/docs/3.1.4/reference/htmlsingle/#appendix.dependency-versions.properties // Conductor's default is ES6, but SB brings in ES7 ext['elasticsearch.version'] = revElasticSearch6 diff --git a/test-harness/build.gradle b/test-harness/build.gradle index 8947327e1..ea410db62 100644 --- a/test-harness/build.gradle +++ b/test-harness/build.gradle @@ -28,12 +28,12 @@ dependencies { testImplementation "redis.clients:jedis:${revJedis}" testImplementation "com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}" - testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}" + testImplementation "org.apache.groovy:groovy-all:${revGroovy}" testImplementation "org.spockframework:spock-core:${revSpock}" testImplementation "org.spockframework:spock-spring:${revSpock}" - testImplementation "org.elasticsearch.client:elasticsearch-rest-client" - testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client" + testImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.8.23" + testImplementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.23" testImplementation "org.testcontainers:elasticsearch:${revTestContainer}" testImplementation('junit:junit:4.13.2') diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 0a6f5f251..3473f8f56 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1,154 +1,55 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.18" + "locked": "3.1.4" } }, "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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.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" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "2.20.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": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.24.3" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-cassandra-persistence": { "project": true @@ -195,65 +96,59 @@ "junit:junit": { "locked": "4.13.2" }, - "net.java.dev.jna:jna": { - "locked": "5.13.0" - }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, "org.apache.logging.log4j:log4j-api": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { - "locked": "6.8.17" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { - "locked": "6.8.17" + "locked": "6.8.23" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.4" + "locked": "2.0.3" }, "org.springframework:spring-web": { - "locked": "5.3.31" + "locked": "6.0.12" }, "org.testcontainers:elasticsearch": { - "locked": "1.19.1" - }, - "org.yaml:snakeyaml": { - "locked": "2.0" + "locked": "1.15.3" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -264,19 +159,19 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awss3-storage" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue" ], - "locked": "1.12.604" + "locked": "1.11.86" }, "com.datastax.cassandra:cassandra-driver-core": { "firstLevelTransitive": [ @@ -286,236 +181,48 @@ }, "com.fasterxml.jackson.core:jackson-annotations": { "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-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" + "com.netflix.conductor:conductor-core" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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" + "com.netflix.conductor:conductor-core" ], "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-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-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" + "com.netflix.conductor:conductor-core" ], "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-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" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "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-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" + "com.netflix.conductor:conductor-client" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "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-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" + "com.netflix.conductor:conductor-common" ], - "locked": "2.15.3" + "locked": "2.15.2" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core", "com.netflix.conductor:conductor-json-jq-task" ], - "locked": "2.9.3" + "locked": "3.1.8" }, "com.google.guava:guava": { "firstLevelTransitive": [ @@ -523,7 +230,7 @@ "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "32.1.2-jre" + "locked": "30.0-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -532,13 +239,13 @@ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "3.24.3" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.7.0" + "locked": "2.8.0" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -720,7 +427,7 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ @@ -728,45 +435,52 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.59.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.0.3" + "locked": "1.0.7" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-core" ], - "locked": "1.3.8" + "locked": "1.2.2" }, "jakarta.activation:jakarta.activation-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "1.2.2" + "locked": "2.1.2" + }, + "jakarta.annotation:jakarta.annotation-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client" + ], + "locked": "2.1.1" }, "jakarta.xml.bind:jakarta.xml.bind-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.3.3" + "locked": "4.0.1" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -789,9 +503,6 @@ "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" @@ -821,6 +532,15 @@ ], "locked": "3.12.0" }, + "org.apache.groovy:groovy-all": { + "locked": "4.0.9" + }, + "org.apache.httpcomponents.client5:httpclient5": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-http-task" + ], + "locked": "5.2.1" + }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations", @@ -842,7 +562,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ @@ -865,7 +585,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-jul": { "firstLevelTransitive": [ @@ -888,7 +608,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-slf4j-impl": { "firstLevelTransitive": [ @@ -911,7 +631,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" + "locked": "2.20.0" }, "org.apache.logging.log4j:log4j-web": { "firstLevelTransitive": [ @@ -934,34 +654,31 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.17.2" - }, - "org.codehaus.groovy:groovy-all": { - "locked": "3.0.19" + "locked": "2.20.0" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.23" }, "org.elasticsearch.client:elasticsearch-rest-high-level-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.23" }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "6.8.17" + "locked": "6.8.12" }, "org.glassfish.jaxb:jaxb-runtime": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.3.9" + "locked": "4.0.3" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -970,7 +687,13 @@ "locked": "2.22.2" }, "org.junit.vintage:junit-vintage-engine": { - "locked": "5.8.2" + "locked": "5.9.3" + }, + "org.openjdk.nashorn:nashorn-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "15.4" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ @@ -989,13 +712,13 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.7.36" + "locked": "2.0.9" }, "org.spockframework:spock-core": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.spockframework:spock-spring": { - "locked": "2.3-groovy-3.0" + "locked": "2.4-M1-groovy-4.0" }, "org.springdoc:springdoc-openapi-ui": { "firstLevelTransitive": [ @@ -1008,73 +731,54 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-actuator": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-validation": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.7.18" + "locked": "3.1.4" }, "org.springframework.retry:spring-retry": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.3.4" + "locked": "2.0.3" }, "org.springframework:spring-web": { - "locked": "5.3.31" + "locked": "6.0.12" }, "org.testcontainers:elasticsearch": { - "locked": "1.19.1" + "locked": "1.15.3" }, - "org.yaml:snakeyaml": { + "redis.clients:jedis": { "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": [ - "com.netflix.conductor:conductor-redis-concurrency-limit", - "com.netflix.conductor:conductor-redis-persistence" - ], "locked": "3.3.0" } } diff --git a/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy b/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy index 8a70dabf0..4f13a99df 100644 --- a/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy +++ b/test-harness/src/test/groovy/com/netflix/conductor/test/util/WorkflowTestUtil.groovy @@ -12,8 +12,6 @@ */ package com.netflix.conductor.test.util -import javax.annotation.PostConstruct - import org.apache.commons.lang3.StringUtils import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component @@ -31,6 +29,7 @@ import com.netflix.conductor.service.ExecutionService import com.netflix.conductor.service.MetadataService import com.fasterxml.jackson.databind.ObjectMapper +import jakarta.annotation.PostConstruct /** * This is a helper class used to initialize task definitions required by the tests when loaded up. diff --git a/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java b/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java index 09f7b25b3..e04a2a991 100644 --- a/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/test/integration/http/AbstractHttpEndToEndTest.java @@ -22,7 +22,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner;