diff --git a/.gitignore b/.gitignore index 8fdac0813d..a1bedb5ac6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ dump.rdb .idea *.iml out/ +bin/ +target/ .DS_Store diff --git a/build.gradle b/build.gradle index d19e8b3848..d74a2e41fa 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,11 @@ allprojects { repositories { jcenter() + + // oss-candidate for -rc.* verions: + maven { + url "https://dl.bintray.com/netflixoss/oss-candidate" + } } } diff --git a/client/dependencies.lock b/client/dependencies.lock index 9100a36a33..87507c7efc 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -4,6 +4,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -14,6 +26,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -33,6 +57,12 @@ "locked": "1.19.4", "requested": "1.19.4" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -45,6 +75,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -55,6 +97,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -74,6 +128,12 @@ "locked": "1.19.4", "requested": "1.19.4" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -86,6 +146,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -96,6 +168,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -115,6 +199,12 @@ "locked": "1.19.4", "requested": "1.19.4" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -127,6 +217,16 @@ "locked": "3.0.1" } }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "pmd": { "net.sourceforge.pmd:pmd-java": { "locked": "5.6.1" @@ -137,6 +237,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -147,6 +259,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -166,6 +290,12 @@ "locked": "1.19.4", "requested": "1.19.4" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -178,6 +308,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -188,6 +330,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -207,6 +361,12 @@ "locked": "1.19.4", "requested": "1.19.4" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -219,6 +379,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -229,6 +401,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -248,13 +432,19 @@ "locked": "1.19.4", "requested": "1.19.4" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -272,6 +462,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -282,6 +484,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -301,13 +515,19 @@ "locked": "1.19.4", "requested": "1.19.4" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -325,6 +545,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -335,6 +567,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -354,13 +598,19 @@ "locked": "1.19.4", "requested": "1.19.4" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -378,6 +628,18 @@ "locked": "1.11.86", "requested": "1.11.86" }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.8.7" + }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "locked": "2.7.5", "requested": "2.7.5" @@ -388,6 +650,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.netflix.archaius:archaius-core": { "locked": "0.7.5", "requested": "0.7.5" @@ -407,13 +681,19 @@ "locked": "1.19.4", "requested": "1.19.4" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/common/dependencies.lock b/common/dependencies.lock index bdb1a81c24..c7bb58e90f 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -1,66 +1,196 @@ { "compile": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, "org.slf4j:slf4j-api": { "locked": "1.7.25", "requested": "1.7.25" } }, "compileClasspath": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, "org.slf4j:slf4j-api": { "locked": "1.7.25", "requested": "1.7.25" } }, "default": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, "org.slf4j:slf4j-api": { "locked": "1.7.25", "requested": "1.7.25" } }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "runtime": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, "org.slf4j:slf4j-api": { "locked": "1.7.25", "requested": "1.7.25" } }, "runtimeClasspath": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, "org.slf4j:slf4j-api": { "locked": "1.7.25", "requested": "1.7.25" } }, "testCompile": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -68,17 +198,37 @@ } }, "testCompileClasspath": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -86,17 +236,37 @@ } }, "testRuntime": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -104,17 +274,37 @@ } }, "testRuntimeClasspath": { + "com.fasterxml.jackson.core:jackson-core": { + "locked": "2.7.5", + "requested": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "locked": "2.7.5", + "requested": "2.7.5" + }, "com.github.rholder:guava-retrying": { "locked": "2.0.0", "requested": "2.0.0" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "com.github.vmg.protogen:protogen-annotations": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.protobuf:protobuf-java": { + "locked": "3.5.1", + "requested": "3.5.1" + }, + "javax.inject:javax.inject": { + "locked": "1", + "requested": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", 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 0f1216011c..5392b59763 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 @@ -241,6 +241,9 @@ public static class TaskDetails { @ProtoField(id = 4) private Any outputMessage; + @ProtoField(id = 5) + private String taskId; + /** * @return the workflowId */ @@ -293,6 +296,20 @@ public Any getOutputMessage() { public void setOutputMessage(Any outputMessage) { this.outputMessage = outputMessage; } + + /** + * @return the taskId + */ + public String getTaskId() { + return taskId; + } + + /** + * @param taskId the taskId to set + */ + public void setTaskId(String taskId) { + this.taskId = taskId; + } } @ProtoMessage diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java index fa0ecae2b0..0aae4b857e 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java @@ -622,7 +622,7 @@ public void setOutputMessage(Any outputMessage) { */ public Optional getTaskDefinition() { return Optional.ofNullable(this.getWorkflowTask()) - .map(workflowTask -> workflowTask.getTaskDefinition()); + .map(WorkflowTask::getTaskDefinition); } public int getRateLimitPerFrequency() { diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/TaskType.java b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/TaskType.java index 866b3b3ea6..aa541f421d 100644 --- a/common/src/main/java/com/netflix/conductor/common/metadata/workflow/TaskType.java +++ b/common/src/main/java/com/netflix/conductor/common/metadata/workflow/TaskType.java @@ -2,9 +2,6 @@ import com.github.vmg.protogen.annotations.ProtoEnum; -import java.util.HashSet; -import java.util.Set; - @ProtoEnum public enum TaskType { diff --git a/contribs/dependencies.lock b/contribs/dependencies.lock index 81ac30b343..d7bb7cc4e1 100644 --- a/contribs/dependencies.lock +++ b/contribs/dependencies.lock @@ -7,17 +7,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -28,6 +30,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -41,6 +49,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -96,9 +110,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -125,17 +141,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -146,6 +164,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -159,6 +183,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -214,6 +244,12 @@ "locked": "1.5.9", "requested": "1.5.9" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", "requested": "1.1.1" @@ -235,6 +271,12 @@ "locked": "1.7.25" } }, + "compileOnly": { + "javax.ws.rs:jsr311-api": { + "locked": "1.1.1", + "requested": "1.1.1" + } + }, "default": { "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -243,17 +285,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -264,6 +308,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -277,6 +327,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -329,12 +385,14 @@ "locked": "1.2.2" }, "io.swagger:swagger-jaxrs": { - "project": true, + "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "project": true, - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -344,7 +402,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "3.0" + "locked": "3.2.1" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -353,14 +411,14 @@ "locked": "1.7.25" } }, - "provided": { - "io.swagger:swagger-jaxrs": { - "locked": "1.5.9", - "requested": "1.5.9" - }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" } }, "runtime": { @@ -371,17 +429,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -392,6 +452,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -405,6 +471,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -460,9 +532,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -489,17 +563,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -510,6 +586,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -523,6 +605,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -578,9 +666,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -607,17 +697,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -628,6 +720,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -641,6 +739,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -696,13 +800,15 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -722,9 +828,9 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -741,17 +847,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -762,6 +870,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -775,6 +889,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -830,13 +950,15 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -856,9 +978,9 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -875,17 +997,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -896,6 +1020,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -909,6 +1039,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -964,13 +1100,15 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -990,9 +1128,9 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -1009,17 +1147,19 @@ "locked": "1.11.86" }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.415", + "locked": "1.11.426", "requested": "latest.release" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -1030,6 +1170,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1043,6 +1189,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1098,13 +1250,15 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.ws.rs:jsr311-api": { - "locked": "1.1.1", - "requested": "1.1.1" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "net.thisptr:jackson-jq": { "locked": "0.0.8", @@ -1124,9 +1278,9 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueAdminResource.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueAdminResource.java index 57a9e20b8e..1b8e3df3e7 100644 --- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueAdminResource.java +++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueAdminResource.java @@ -18,6 +18,7 @@ */ package com.netflix.conductor.contribs.queue; +import java.util.HashMap; import java.util.Map; import javax.inject.Inject; @@ -73,7 +74,14 @@ public Map names() { @Path("/update/{workflowId}/{taskRefName}/{status}") @ApiOperation("Publish a message in queue to mark a wait task as completed.") public void update(@PathParam("workflowId") String workflowId, @PathParam("taskRefName") String taskRefName, @PathParam("status") Status status, Map output) throws Exception { - qm.update(workflowId, taskRefName, output, status); + qm.updateByTaskRefName(workflowId, taskRefName, output, status); + } + + @POST + @Path("/update/{workflowId}/task/{taskId}/{status}") + @ApiOperation("Publish a message in queue to mark a wait task (by taskId) as completed.") + public void updateByTaskId(@PathParam("workflowId") String workflowId, @PathParam("taskId") String taskId, @PathParam("status") Status status, Map output) throws Exception { + qm.updateByTaskId(workflowId, taskId, output, status); } } diff --git a/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueManager.java b/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueManager.java index 93f38add50..a20769b8e4 100644 --- a/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueManager.java +++ b/contribs/src/main/java/com/netflix/conductor/contribs/queue/QueueManager.java @@ -28,6 +28,7 @@ import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,6 +94,7 @@ private void startMonitor(Status status, ObservableQueue queue) { JsonNode json = objectMapper.readTree(externalId); String workflowId = getValue("workflowId", json); String taskRefName = getValue("taskRefName", json); + String taskId = getValue("taskId", json); if(workflowId == null || "".equals(workflowId)) { //This is a bad message, we cannot process it logger.error("No workflow id found in the message. {}", payload); @@ -101,7 +103,9 @@ private void startMonitor(Status status, ObservableQueue queue) { } Workflow workflow = executionService.getExecutionStatus(workflowId, true); Optional taskOptional; - if(taskRefName == null || "".equals(taskRefName)) { + if (StringUtils.isNotEmpty(taskId)) { + taskOptional = workflow.getTasks().stream().filter(task -> !task.getStatus().isTerminal() && task.getTaskId().equals(taskId)).findFirst(); + } else if(StringUtils.isEmpty(taskRefName)) { logger.error("No taskRefName found in the message. If there is only one WAIT task, will mark it as completed. {}", payload); taskOptional = workflow.getTasks().stream().filter(task -> !task.getStatus().isTerminal() && task.getTaskType().equals(Wait.NAME)).findFirst(); } else { @@ -109,7 +113,8 @@ private void startMonitor(Status status, ObservableQueue queue) { } if(!taskOptional.isPresent()) { - logger.error("No matching tasks to be found to be marked as completed for workflow {}", workflowId); + logger.error("No matching tasks to be found to be marked as completed for workflow {}, taskRefName {}, taskId {}", workflowId, taskRefName, taskId); + queue.ack(Arrays.asList(msg)); return; } @@ -169,16 +174,28 @@ public Map queues() { return size; } - public void update(String workflowId, String taskRefName, Map output, Status status) throws Exception { - Map outputMap = new HashMap<>(); - + public void updateByTaskRefName(String workflowId, String taskRefName, Map output, Status status) throws Exception { Map externalIdMap = new HashMap<>(); externalIdMap.put("workflowId", workflowId); externalIdMap.put("taskRefName", taskRefName); - + + update(externalIdMap, output, status); + } + + public void updateByTaskId(String workflowId, String taskId, Map output, Status status) throws Exception { + Map externalIdMap = new HashMap<>(); + externalIdMap.put("workflowId", workflowId); + externalIdMap.put("taskId", taskId); + + update(externalIdMap, output, status); + } + + private void update(Map externalIdMap, Map output, Status status) throws Exception { + Map outputMap = new HashMap<>(); + outputMap.put("externalId", objectMapper.writeValueAsString(externalIdMap)); outputMap.putAll(output); - + Message msg = new Message(UUID.randomUUID().toString(), objectMapper.writeValueAsString(outputMap), null); ObservableQueue queue = queues.get(status); if(queue == null) { diff --git a/contribs/src/test/java/com/netflix/conductor/contribs/queue/sqs/TestQueueManager.java b/contribs/src/test/java/com/netflix/conductor/contribs/queue/sqs/TestQueueManager.java index f4d4e8ec7c..85a652aab7 100644 --- a/contribs/src/test/java/com/netflix/conductor/contribs/queue/sqs/TestQueueManager.java +++ b/contribs/src/test/java/com/netflix/conductor/contribs/queue/sqs/TestQueueManager.java @@ -18,11 +18,13 @@ */ package com.netflix.conductor.contribs.queue.sqs; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -81,6 +83,23 @@ public List answer(InvocationOnMock invocation) throws Throwable { when(queue.getOnSubscribe()).thenCallRealMethod(); when(queue.observe()).thenCallRealMethod(); when(queue.getName()).thenReturn(Status.COMPLETED.name()); + + Task task0 = new Task(); + task0.setStatus(Status.IN_PROGRESS); + task0.setTaskId("t0"); + task0.setReferenceTaskName("t0"); + task0.setTaskType(Wait.NAME); + Workflow workflow0 = new Workflow(); + workflow0.setWorkflowId("v_0"); + workflow0.getTasks().add(task0); + + Task task2 = new Task(); + task2.setStatus(Status.IN_PROGRESS); + task2.setTaskId("t2"); + task2.setTaskType(Wait.NAME); + Workflow workflow2 = new Workflow(); + workflow2.setWorkflowId("v_2"); + workflow2.getTasks().add(task2); doAnswer(new Answer() { @@ -96,26 +115,10 @@ public Void answer(InvocationOnMock invocation) throws Throwable { es = mock(ExecutionService.class); assertNotNull(es); - doAnswer(new Answer() { - @Override - public Workflow answer(InvocationOnMock invocation) throws Throwable { - try { - String workflowId = invocation.getArgumentAt(0, String.class); - Workflow workflow = new Workflow(); - workflow.setWorkflowId(workflowId); - Task task = new Task(); - task.setStatus(Status.IN_PROGRESS); - task.setReferenceTaskName("t0"); - task.setTaskType(Wait.NAME); - workflow.getTasks().add(task); - return workflow; - } catch(Throwable t) { - t.printStackTrace(); - throw t; - } - } - }).when(es).getExecutionStatus(any(), anyBoolean()); + doReturn(workflow0).when(es).getExecutionStatus(eq("v_0"), anyBoolean()); + + doReturn(workflow2).when(es).getExecutionStatus(eq("v_2"), anyBoolean()); doAnswer(new Answer() { @@ -129,16 +132,16 @@ public Void answer(InvocationOnMock invocation) throws Throwable { } - - + @Test public void test() throws Exception { Map queues = new HashMap<>(); queues.put(Status.COMPLETED, queue); QueueManager qm = new QueueManager(queues, es); - qm.update("v_0", "t0", new HashMap<>(), Status.COMPLETED); + qm.updateByTaskRefName("v_0", "t0", new HashMap<>(), Status.COMPLETED); Uninterruptibles.sleepUninterruptibly(1_000, TimeUnit.MILLISECONDS); - assertEquals("updatedTasks are: " + updatedTasks.toString(), 1, updatedTasks.size()); + + assertTrue(updatedTasks.stream().anyMatch(task -> task.getTaskId().equals("t0"))); } @Test(expected=IllegalArgumentException.class) @@ -146,8 +149,18 @@ public void testFailure() throws Exception { Map queues = new HashMap<>(); queues.put(Status.COMPLETED, queue); QueueManager qm = new QueueManager(queues, es); - qm.update("v_1", "t1", new HashMap<>(), Status.CANCELED); + qm.updateByTaskRefName("v_1", "t1", new HashMap<>(), Status.CANCELED); Uninterruptibles.sleepUninterruptibly(1_000, TimeUnit.MILLISECONDS); - assertEquals(1, updatedTasks.size()); + } + + @Test + public void testWithTaskId() throws Exception { + Map queues = new HashMap<>(); + queues.put(Status.COMPLETED, queue); + QueueManager qm = new QueueManager(queues, es); + qm.updateByTaskId("v_2", "t2", new HashMap<>(), Status.COMPLETED); + Uninterruptibles.sleepUninterruptibly(1_000, TimeUnit.MILLISECONDS); + + assertTrue(updatedTasks.stream().anyMatch(task -> task.getTaskId().equals("t2"))); } } diff --git a/core/dependencies.lock b/core/dependencies.lock index b4a2b8ae79..ba6607e95b 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -5,10 +5,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -18,6 +24,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -26,6 +38,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -49,6 +67,12 @@ "locked": "1.2.2", "requested": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" @@ -66,10 +90,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -79,6 +109,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -87,6 +123,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -110,6 +152,12 @@ "locked": "1.2.2", "requested": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" @@ -127,10 +175,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -140,6 +194,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -148,6 +208,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -171,6 +237,12 @@ "locked": "1.2.2", "requested": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" @@ -182,16 +254,32 @@ "locked": "1.7.25" } }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "runtime": { "com.amazonaws:aws-java-sdk-s3": { "locked": "1.11.86", "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -201,6 +289,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -209,6 +303,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -232,6 +332,12 @@ "locked": "1.2.2", "requested": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" @@ -249,10 +355,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -262,6 +374,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -270,6 +388,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -293,6 +417,12 @@ "locked": "1.2.2", "requested": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" @@ -310,10 +440,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -323,6 +459,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -331,6 +473,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -354,17 +502,23 @@ "locked": "1.2.2", "requested": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -383,10 +537,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -396,6 +556,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -404,6 +570,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -427,17 +599,23 @@ "locked": "1.2.2", "requested": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -456,10 +634,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -469,6 +653,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -477,6 +667,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -500,17 +696,23 @@ "locked": "1.2.2", "requested": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -529,10 +731,16 @@ "requested": "1.11.86" }, "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], "locked": "2.7.5", "requested": "2.7.5" }, @@ -542,6 +750,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "locked": "4.1.0", "requested": "4.1.0" @@ -550,6 +764,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "locked": "2.2.0", "requested": "2.2.0" @@ -573,17 +793,23 @@ "locked": "1.2.2", "requested": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "locked": "3.0", "requested": "3.0" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/core/src/main/java/com/netflix/conductor/core/config/CoreModule.java b/core/src/main/java/com/netflix/conductor/core/config/CoreModule.java index 5b2a4e3bb6..891bd77bdc 100644 --- a/core/src/main/java/com/netflix/conductor/core/config/CoreModule.java +++ b/core/src/main/java/com/netflix/conductor/core/config/CoreModule.java @@ -13,9 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * - */ package com.netflix.conductor.core.config; import com.fasterxml.jackson.databind.ObjectMapper; @@ -66,8 +63,8 @@ */ public class CoreModule extends AbstractModule { - public static final String CONDUCTOR_QUALIFIER = "conductor"; - public static final String TASK_MAPPERS_QUALIFIER = "TaskMappers"; + private static final String CONDUCTOR_QUALIFIER = "conductor"; + private static final String TASK_MAPPERS_QUALIFIER = "TaskMappers"; @Override protected void configure() { @@ -106,8 +103,8 @@ public TaskMapper getDecisionTaskMapper() { @StringMapKey(TASK_TYPE_DYNAMIC) @Singleton @Named(TASK_MAPPERS_QUALIFIER) - public TaskMapper getDynamicTaskMapper(ParametersUtils parametersUtils) { - return new DynamicTaskMapper(parametersUtils); + public TaskMapper getDynamicTaskMapper(ParametersUtils parametersUtils, MetadataDAO metadataDAO) { + return new DynamicTaskMapper(parametersUtils, metadataDAO); } @ProvidesIntoMap @@ -163,8 +160,8 @@ public TaskMapper getForkJoinTaskMapper() { @StringMapKey(TASK_TYPE_USER_DEFINED) @Singleton @Named(TASK_MAPPERS_QUALIFIER) - public TaskMapper getUserDefinedTaskMapper(ParametersUtils parametersUtils) { - return new UserDefinedTaskMapper(parametersUtils); + public TaskMapper getUserDefinedTaskMapper(ParametersUtils parametersUtils, MetadataDAO metadataDAO) { + return new UserDefinedTaskMapper(parametersUtils, metadataDAO); } @ProvidesIntoMap diff --git a/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java b/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java index 9fe36c982b..c0f48f3633 100644 --- a/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java +++ b/core/src/main/java/com/netflix/conductor/core/events/ActionProcessor.java @@ -29,6 +29,7 @@ import com.netflix.conductor.core.execution.ParametersUtils; import com.netflix.conductor.core.execution.WorkflowExecutor; import com.netflix.conductor.core.utils.JsonUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,24 +82,33 @@ public Map execute(Action action, Object payloadObject, String e @VisibleForTesting Map completeTask(Action action, Object payload, TaskDetails taskDetails, Status status, String event, String messageId) { - Map input = new HashMap<>(); - input.put("workflowId", taskDetails.getWorkflowId()); - input.put("taskRefName", taskDetails.getTaskRefName()); - input.putAll(taskDetails.getOutput()); - - Map replaced = parametersUtils.replace(input, payload); - String workflowId = "" + replaced.get("workflowId"); - String taskRefName = "" + replaced.get("taskRefName"); - Workflow found = executor.getWorkflow(workflowId, true); - if (found == null) { - replaced.put("error", "No workflow found with ID: " + workflowId); - return replaced; - } - Task task = found.getTaskByRefName(taskRefName); - if (task == null) { - replaced.put("error", "No task found with reference name: " + taskRefName + ", workflowId: " + workflowId); - return replaced; - } + Map input = new HashMap<>(); + input.put("workflowId", taskDetails.getWorkflowId()); + input.put("taskId", taskDetails.getTaskId()); + input.put("taskRefName", taskDetails.getTaskRefName()); + input.putAll(taskDetails.getOutput()); + + Map replaced = parametersUtils.replace(input, payload); + String workflowId = (String) replaced.get("workflowId"); + String taskId = (String) replaced.get("taskId"); + String taskRefName = (String) replaced.get("taskRefName"); + + Task task = null; + if (StringUtils.isNotEmpty(taskId)) { + task = executor.getTask(taskId); + } else if (StringUtils.isNotEmpty(workflowId) && StringUtils.isNotEmpty(taskRefName)) { + Workflow workflow = executor.getWorkflow(workflowId, true); + if (workflow == null) { + replaced.put("error", "No workflow found with ID: " + workflowId); + return replaced; + } + task = workflow.getTaskByRefName(taskRefName); + } + + if (task == null) { + replaced.put("error", "No task found with taskId: " + taskId + ", reference name: " + taskRefName + ", workflowId: " + workflowId); + return replaced; + } task.setStatus(status); task.setOutputData(replaced); @@ -124,7 +134,7 @@ private Map startWorkflow(Action action, Object payload, String Map workflowInput = parametersUtils.replace(inputParams, payload); workflowInput.put("conductor.event.messageId", messageId); workflowInput.put("conductor.event.name", event); - + String id = executor.startWorkflow(params.getName(), params.getVersion(), params.getCorrelationId(), workflowInput, event); output.put("workflowId", id); diff --git a/core/src/main/java/com/netflix/conductor/core/execution/ParametersUtils.java b/core/src/main/java/com/netflix/conductor/core/execution/ParametersUtils.java index 7db08828a4..74c4c8b8c5 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/ParametersUtils.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/ParametersUtils.java @@ -252,7 +252,9 @@ private boolean contains(String test) { return true; } } - String value = Optional.ofNullable(System.getProperty(test)).orElse(Optional.ofNullable(System.getenv(test)).orElse(null)); + String value = Optional.ofNullable(System.getProperty(test)) + .orElseGet(() -> Optional.ofNullable(System.getenv(test)) + .orElse(null)); return value != null; } diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java index a5320eb3fb..d468f0d6f9 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java @@ -362,7 +362,7 @@ public void rewind(String workflowId) { } WorkflowDef workflowDef = Optional.ofNullable(workflow.getWorkflowDefinition()) - .orElse(metadataDAO.get(workflow.getWorkflowName(), workflow.getWorkflowVersion()) + .orElseGet(() -> metadataDAO.get(workflow.getWorkflowName(), workflow.getWorkflowVersion()) .orElseThrow(() -> new ApplicationException(NOT_FOUND, String.format("Unable to find definition for %s", workflowId))) ); @@ -517,7 +517,7 @@ void completeWorkflow(Workflow wf) { if (workflow.getParentWorkflowId() != null) { Workflow parent = executionDAO.getWorkflow(workflow.getParentWorkflowId(), false); WorkflowDef parentDef = Optional.ofNullable(parent.getWorkflowDefinition()) - .orElse(metadataDAO.get(parent.getWorkflowName(), parent.getWorkflowVersion()) + .orElseGet(() -> metadataDAO.get(parent.getWorkflowName(), parent.getWorkflowVersion()) .orElseThrow(() -> new ApplicationException(NOT_FOUND, String.format("Unable to find parent workflow definition for %s", wf.getWorkflowId()))) ); logger.debug("Completed sub-workflow {}, deciding parent workflow {}", wf.getWorkflowId(), wf.getParentWorkflowId()); @@ -741,6 +741,12 @@ public void updateTask(TaskResult taskResult) { } } + public Task getTask(String taskId) { + return Optional.ofNullable(executionDAO.getTask(taskId)) + .map(metadataMapperService::populateTaskWithDefinition) + .orElse(null); + } + public List getTasks(String taskType, String startKey, int count) { return executionDAO.getTasks(taskType, startKey, count); } @@ -816,6 +822,15 @@ public boolean decide(String workflowId) { stateChanged = scheduleTask(workflow, tasksToBeScheduled) || stateChanged; + if (!outcome.tasksToBeUpdated.isEmpty()) { + for (Task task : tasksToBeUpdated) { + if (task.getStatus() != null && (!task.getStatus().equals(Task.Status.IN_PROGRESS) + || !task.getStatus().equals(Task.Status.SCHEDULED))) { + queueDAO.remove(QueueUtils.getQueueName(task), task.getTaskId()); + } + } + } + if (!outcome.tasksToBeUpdated.isEmpty() || !outcome.tasksToBeScheduled.isEmpty()) { executionDAO.updateTasks(tasksToBeUpdated); executionDAO.updateWorkflow(workflow); diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapper.java index 0618dfb23c..a1ea6e9dc0 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapper.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapper.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2018 Netflix, Inc. *

* Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.netflix.conductor.core.execution.mapper; import com.google.common.annotations.VisibleForTesting; @@ -25,10 +24,11 @@ import com.netflix.conductor.common.run.Workflow; import com.netflix.conductor.core.execution.ParametersUtils; import com.netflix.conductor.core.execution.TerminateWorkflowException; +import com.netflix.conductor.dao.MetadataDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; @@ -42,13 +42,14 @@ public class DynamicTaskMapper implements TaskMapper { public static final Logger logger = LoggerFactory.getLogger(DynamicTaskMapper.class); - private ParametersUtils parametersUtils; + private final ParametersUtils parametersUtils; + private final MetadataDAO metadataDAO; - public DynamicTaskMapper(ParametersUtils parametersUtils) { + public DynamicTaskMapper(ParametersUtils parametersUtils, MetadataDAO metadataDAO) { this.parametersUtils = parametersUtils; + this.metadataDAO = metadataDAO; } - /** * This method maps a dynamic task to a {@link Task} based on the input params * @@ -68,6 +69,7 @@ public List getMappedTasks(TaskMapperContext taskMapperContext) throws Ter String taskName = getDynamicTaskName(taskInput, taskNameParam); taskToSchedule.setName(taskName); TaskDef taskDefinition = getDynamicTaskDefinition(taskToSchedule); + taskToSchedule.setTaskDefinition(taskDefinition); Map input = parametersUtils.getTaskInput(taskToSchedule.getInputParameters(), workflowInstance, taskDefinition, taskMapperContext.getTaskId()); @@ -89,7 +91,7 @@ public List getMappedTasks(TaskMapperContext taskMapperContext) throws Ter dynamicTask.setWorkflowTask(taskToSchedule); dynamicTask.setTaskType(taskName); dynamicTask.setRetriedTaskId(retriedTaskId); - return Arrays.asList(dynamicTask); + return Collections.singletonList(dynamicTask); } /** @@ -98,8 +100,8 @@ public List getMappedTasks(TaskMapperContext taskMapperContext) throws Ter * @param taskInput: a map which contains different input parameters and * also contains the mapping between the dynamic task name param and the actual name representing the dynamic task * @param taskNameParam: the key that is used to look up the dynamic task name. + * @return The name of the dynamic task * @throws TerminateWorkflowException : In case is there is no value dynamic task name in the input parameters. - * @return: The name of the dynamic task */ @VisibleForTesting String getDynamicTaskName(Map taskInput, String taskNameParam) throws TerminateWorkflowException { @@ -116,16 +118,17 @@ String getDynamicTaskName(Map taskInput, String taskNameParam) t * This method gets the TaskDefinition for a specific {@link WorkflowTask} * * @param taskToSchedule: An instance of {@link WorkflowTask} which has the name of the using which the {@link TaskDef} can be retrieved. - * @throws TerminateWorkflowException : in case of no work flow definition available - * @return: An instance of TaskDefinition + * @return An instance of TaskDefinition + * @throws TerminateWorkflowException : in case of no workflow definition available */ @VisibleForTesting TaskDef getDynamicTaskDefinition(WorkflowTask taskToSchedule) throws TerminateWorkflowException { //TODO this is a common pattern in code base can be moved to DAO return Optional.ofNullable(taskToSchedule.getTaskDefinition()) - .orElseThrow(() -> { - String reason = String.format("Invalid task specified. Cannot find task by name %s in the task definitions", - taskToSchedule.getName()); - return new TerminateWorkflowException(reason); - }); + .orElseGet(() -> Optional.ofNullable(metadataDAO.getTaskDef(taskToSchedule.getName())) + .orElseThrow(() -> { + String reason = String.format("Invalid task specified. Cannot find task by name %s in the task definitions", + taskToSchedule.getName()); + return new TerminateWorkflowException(reason); + })); } } diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapper.java index 8010510b8d..b9c8124a7d 100644 --- a/core/src/main/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapper.java +++ b/core/src/main/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapper.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2018 Netflix, Inc. *

* Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.netflix.conductor.core.execution.mapper; import com.netflix.conductor.common.metadata.tasks.Task; @@ -24,6 +23,7 @@ import com.netflix.conductor.common.run.Workflow; import com.netflix.conductor.core.execution.ParametersUtils; import com.netflix.conductor.core.execution.TerminateWorkflowException; +import com.netflix.conductor.dao.MetadataDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,10 +40,12 @@ public class UserDefinedTaskMapper implements TaskMapper { public static final Logger logger = LoggerFactory.getLogger(UserDefinedTaskMapper.class); - private ParametersUtils parametersUtils; + private final ParametersUtils parametersUtils; + private final MetadataDAO metadataDAO; - public UserDefinedTaskMapper(ParametersUtils parametersUtils) { + public UserDefinedTaskMapper(ParametersUtils parametersUtils, MetadataDAO metadataDAO) { this.parametersUtils = parametersUtils; + this.metadataDAO = metadataDAO; } /** @@ -51,8 +53,8 @@ public UserDefinedTaskMapper(ParametersUtils parametersUtils) { * to a {@link Task} in a {@link Task.Status#SCHEDULED} state * * @param taskMapperContext: A wrapper class containing the {@link WorkflowTask}, {@link WorkflowDef}, {@link Workflow} and a string representation of the TaskId + * @return a List with just one User defined task * @throws TerminateWorkflowException In case if the task definition does not exist - * @return: a List with just one User defined task */ @Override public List getMappedTasks(TaskMapperContext taskMapperContext) throws TerminateWorkflowException { @@ -65,10 +67,11 @@ public List getMappedTasks(TaskMapperContext taskMapperContext) throws Ter int retryCount = taskMapperContext.getRetryCount(); TaskDef taskDefinition = Optional.ofNullable(taskMapperContext.getTaskDefinition()) - .orElseThrow(() -> { - String reason = String.format("Invalid task specified. Cannot find task by name %s in the task definitions", taskToSchedule.getName()); - return new TerminateWorkflowException(reason); - }); + .orElseGet(() -> Optional.ofNullable(metadataDAO.getTaskDef(taskToSchedule.getName())) + .orElseThrow(() -> { + String reason = String.format("Invalid task specified. Cannot find task by name %s in the task definitions", taskToSchedule.getName()); + return new TerminateWorkflowException(reason); + })); Map input = parametersUtils.getTaskInputV2(taskToSchedule.getInputParameters(), workflowInstance, taskId, taskDefinition); @@ -90,5 +93,4 @@ public List getMappedTasks(TaskMapperContext taskMapperContext) throws Ter userDefinedTask.setRateLimitFrequencyInSeconds(taskDefinition.getRateLimitFrequencyInSeconds()); return Collections.singletonList(userDefinedTask); } - } diff --git a/core/src/main/java/com/netflix/conductor/service/ExecutionService.java b/core/src/main/java/com/netflix/conductor/service/ExecutionService.java index 70035772aa..46bb98a8f6 100644 --- a/core/src/main/java/com/netflix/conductor/service/ExecutionService.java +++ b/core/src/main/java/com/netflix/conductor/service/ExecutionService.java @@ -211,9 +211,7 @@ public List getTasks(String taskType, String startKey, int count) { } public Task getTask(String taskId) { - return Optional.ofNullable(executionDAO.getTask(taskId)) - .map(t -> metadataMapperService.populateTaskWithDefinition(t)) - .orElse(null); + return workflowExecutor.getTask(taskId); } public Task getPendingTaskForWorkflow(String taskReferenceName, String workflowId) { diff --git a/core/src/test/java/com/netflix/conductor/core/events/TestActionProcessor.java b/core/src/test/java/com/netflix/conductor/core/events/TestActionProcessor.java new file mode 100644 index 0000000000..bfa1751140 --- /dev/null +++ b/core/src/test/java/com/netflix/conductor/core/events/TestActionProcessor.java @@ -0,0 +1,129 @@ +package com.netflix.conductor.core.events; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.netflix.conductor.common.metadata.events.EventHandler.Action; +import com.netflix.conductor.common.metadata.events.EventHandler.Action.Type; +import com.netflix.conductor.common.metadata.events.EventHandler.StartWorkflow; +import com.netflix.conductor.common.metadata.events.EventHandler.TaskDetails; +import com.netflix.conductor.common.metadata.tasks.Task; +import com.netflix.conductor.common.metadata.tasks.TaskResult; +import com.netflix.conductor.common.metadata.tasks.TaskResult.Status; +import com.netflix.conductor.common.metadata.workflow.WorkflowDef; +import com.netflix.conductor.common.run.Workflow; +import com.netflix.conductor.core.execution.ParametersUtils; +import com.netflix.conductor.core.execution.WorkflowExecutor; +import java.util.Map; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +public class TestActionProcessor { + private WorkflowExecutor workflowExecutor; + private ActionProcessor actionProcessor; + + @Before + public void setup() { + workflowExecutor = mock(WorkflowExecutor.class); + + actionProcessor = new ActionProcessor(workflowExecutor, new ParametersUtils()); + } + + @Test + public void testStartWorkflow() throws Exception { + StartWorkflow startWorkflow = new StartWorkflow(); + startWorkflow.setName("testWorkflow"); + startWorkflow.getInput().put("testInput", "${testId}"); + + Action action = new Action(); + action.setAction(Type.START_WORKFLOW); + action.setStartWorkflow(startWorkflow); + + Object payload = new ObjectMapper().readValue("{\"testId\":\"test_1\"}", Object.class); + + WorkflowDef workflowDef = new WorkflowDef(); + workflowDef.setName("testWorkflow"); + workflowDef.setVersion(1); + + when(workflowExecutor.startWorkflow(eq("testWorkflow"), eq(null), any(), any(), eq("testEvent"))) + .thenReturn("workflow_1"); + + Map output = actionProcessor.execute(action, payload, "testEvent", "testMessage"); + + assertNotNull(output); + assertEquals("workflow_1", output.get("workflowId")); + + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Map.class); + verify(workflowExecutor).startWorkflow(eq("testWorkflow"), eq(null), any(), argumentCaptor.capture(), eq("testEvent")); + assertEquals("test_1", argumentCaptor.getValue().get("testInput")); + assertEquals("testMessage", argumentCaptor.getValue().get("conductor.event.messageId")); + assertEquals("testEvent", argumentCaptor.getValue().get("conductor.event.name")); + } + + @Test + public void testCompleteTask() throws Exception { + TaskDetails taskDetails = new TaskDetails(); + taskDetails.setWorkflowId("${workflowId}"); + taskDetails.setTaskRefName("testTask"); + + Action action = new Action(); + action.setAction(Type.COMPLETE_TASK); + action.setCompleteTask(taskDetails); + + Object payload = new ObjectMapper().readValue("{\"workflowId\":\"workflow_1\"}", Object.class); + + Task task = new Task(); + task.setReferenceTaskName("testTask"); + Workflow workflow = new Workflow(); + workflow.getTasks().add(task); + + when(workflowExecutor.getWorkflow(eq("workflow_1"), anyBoolean())).thenReturn(workflow); + + actionProcessor.execute(action, payload, "testEvent", "testMessage"); + + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TaskResult.class); + verify(workflowExecutor).updateTask(argumentCaptor.capture()); + assertEquals(Status.COMPLETED, argumentCaptor.getValue().getStatus()); + assertEquals("testMessage", argumentCaptor.getValue().getOutputData().get("conductor.event.messageId")); + assertEquals("testEvent", argumentCaptor.getValue().getOutputData().get("conductor.event.name")); + assertEquals("workflow_1", argumentCaptor.getValue().getOutputData().get("workflowId")); + assertEquals("testTask", argumentCaptor.getValue().getOutputData().get("taskRefName")); + } + + @Test + public void testCompleteTaskByTaskId() throws Exception { + TaskDetails taskDetails = new TaskDetails(); + taskDetails.setWorkflowId("${workflowId}"); + taskDetails.setTaskId("${taskId}"); + + Action action = new Action(); + action.setAction(Type.COMPLETE_TASK); + action.setCompleteTask(taskDetails); + + Object payload = new ObjectMapper().readValue("{\"workflowId\":\"workflow_1\", \"taskId\":\"task_1\"}", Object.class); + + Task task = new Task(); + task.setTaskId("task_1"); + task.setReferenceTaskName("testTask"); + + when(workflowExecutor.getTask(eq("task_1"))).thenReturn(task); + + actionProcessor.execute(action, payload, "testEvent", "testMessage"); + + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(TaskResult.class); + verify(workflowExecutor).updateTask(argumentCaptor.capture()); + assertEquals(Status.COMPLETED, argumentCaptor.getValue().getStatus()); + assertEquals("testMessage", argumentCaptor.getValue().getOutputData().get("conductor.event.messageId")); + assertEquals("testEvent", argumentCaptor.getValue().getOutputData().get("conductor.event.name")); + assertEquals("workflow_1", argumentCaptor.getValue().getOutputData().get("workflowId")); + assertEquals("task_1", argumentCaptor.getValue().getOutputData().get("taskId")); + } +} diff --git a/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderOutcomes.java b/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderOutcomes.java index 2122759d46..e56e618b38 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderOutcomes.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderOutcomes.java @@ -99,11 +99,11 @@ public void init() { ParametersUtils parametersUtils = new ParametersUtils(); Map taskMappers = new HashMap<>(); taskMappers.put("DECISION", new DecisionTaskMapper()); - taskMappers.put("DYNAMIC", new DynamicTaskMapper(parametersUtils)); + taskMappers.put("DYNAMIC", new DynamicTaskMapper(parametersUtils, metadataDAO)); taskMappers.put("FORK_JOIN", new ForkJoinTaskMapper()); taskMappers.put("JOIN", new JoinTaskMapper()); taskMappers.put("FORK_JOIN_DYNAMIC", new ForkJoinDynamicTaskMapper(parametersUtils, objectMapper, metadataDAO)); - taskMappers.put("USER_DEFINED", new UserDefinedTaskMapper(parametersUtils)); + taskMappers.put("USER_DEFINED", new UserDefinedTaskMapper(parametersUtils, metadataDAO)); taskMappers.put("SIMPLE", new SimpleTaskMapper(parametersUtils)); taskMappers.put("SUB_WORKFLOW", new SubWorkflowTaskMapper(parametersUtils)); taskMappers.put("EVENT", new EventTaskMapper(parametersUtils)); diff --git a/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java b/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java index ca8ef4fbf1..3f5d9f8cb0 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/TestDeciderService.java @@ -124,11 +124,11 @@ public void setup() { parametersUtils = new ParametersUtils(); Map taskMappers = new HashMap<>(); taskMappers.put("DECISION", new DecisionTaskMapper()); - taskMappers.put("DYNAMIC", new DynamicTaskMapper(parametersUtils)); + taskMappers.put("DYNAMIC", new DynamicTaskMapper(parametersUtils, metadataDAO)); taskMappers.put("FORK_JOIN", new ForkJoinTaskMapper()); taskMappers.put("JOIN", new JoinTaskMapper()); taskMappers.put("FORK_JOIN_DYNAMIC", new ForkJoinDynamicTaskMapper(parametersUtils, objectMapper, metadataDAO)); - taskMappers.put("USER_DEFINED", new UserDefinedTaskMapper(parametersUtils)); + taskMappers.put("USER_DEFINED", new UserDefinedTaskMapper(parametersUtils, metadataDAO)); taskMappers.put("SIMPLE", new SimpleTaskMapper(parametersUtils)); taskMappers.put("SUB_WORKFLOW", new SubWorkflowTaskMapper(parametersUtils)); taskMappers.put("EVENT", new EventTaskMapper(parametersUtils)); diff --git a/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java b/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java index d5ec4a0096..9bd791dcc8 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java @@ -91,11 +91,11 @@ public void init() { ParametersUtils parametersUtils = new ParametersUtils(); Map taskMappers = new HashMap<>(); taskMappers.put("DECISION", new DecisionTaskMapper()); - taskMappers.put("DYNAMIC", new DynamicTaskMapper(parametersUtils)); + taskMappers.put("DYNAMIC", new DynamicTaskMapper(parametersUtils, metadataDAO)); taskMappers.put("FORK_JOIN", new ForkJoinTaskMapper()); taskMappers.put("JOIN", new JoinTaskMapper()); taskMappers.put("FORK_JOIN_DYNAMIC", new ForkJoinDynamicTaskMapper(parametersUtils, objectMapper, metadataDAO)); - taskMappers.put("USER_DEFINED", new UserDefinedTaskMapper(parametersUtils)); + taskMappers.put("USER_DEFINED", new UserDefinedTaskMapper(parametersUtils, metadataDAO)); taskMappers.put("SIMPLE", new SimpleTaskMapper(parametersUtils)); taskMappers.put("SUB_WORKFLOW", new SubWorkflowTaskMapper(parametersUtils)); taskMappers.put("EVENT", new EventTaskMapper(parametersUtils)); @@ -326,19 +326,19 @@ public void testGetFailedTasksToRetry() { Workflow workflow = new Workflow(); //2 different task definitions - workflow.setTasks(Arrays.asList(task_1_1,task_2_1)); + workflow.setTasks(Arrays.asList(task_1_1, task_2_1)); List tasks = workflowExecutor.getFailedTasksToRetry(workflow); assertEquals(1, tasks.size()); assertEquals(task_1_1.getTaskId(), tasks.get(0).getTaskId()); //2 tasks with the same definition but different reference numbers - workflow.setTasks(Arrays.asList(task_1_3_1,task_1_3_2)); + workflow.setTasks(Arrays.asList(task_1_3_1, task_1_3_2)); tasks = workflowExecutor.getFailedTasksToRetry(workflow); assertEquals(1, tasks.size()); assertEquals(task_1_3_2.getTaskId(), tasks.get(0).getTaskId()); //3 tasks with definitions and reference numbers - workflow.setTasks(Arrays.asList(task_1_1,task_1_2, task_1_3_1, task_1_3_2, task_2_1, task_2_2, task_3_1)); + workflow.setTasks(Arrays.asList(task_1_1, task_1_2, task_1_3_1, task_1_3_2, task_2_1, task_2_2, task_3_1)); tasks = workflowExecutor.getFailedTasksToRetry(workflow); assertEquals(4, tasks.size()); assertTrue(tasks.contains(task_1_1)); @@ -449,7 +449,7 @@ public void testRetryWorkflow() { task_4_1.setTaskDefName("task1"); task_4_1.setReferenceTaskName("task4_refABC"); - workflow.setTasks(Arrays.asList(task_1_1,task_1_2, task_2_1, task_3_1, task_4_1)); + workflow.setTasks(Arrays.asList(task_1_1, task_1_2, task_2_1, task_3_1, task_4_1)); //end of setup //when: diff --git a/core/src/test/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapperTest.java b/core/src/test/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapperTest.java index f0ef216bbb..936325d074 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapperTest.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/mapper/DynamicTaskMapperTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2018 Netflix, Inc. + *

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

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

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.netflix.conductor.core.execution.mapper; import com.netflix.conductor.common.metadata.tasks.Task; @@ -8,6 +23,7 @@ import com.netflix.conductor.core.execution.ParametersUtils; import com.netflix.conductor.core.execution.TerminateWorkflowException; import com.netflix.conductor.core.utils.IDGenerator; +import com.netflix.conductor.dao.MetadataDAO; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -27,19 +43,23 @@ public class DynamicTaskMapperTest { private ParametersUtils parametersUtils; + private MetadataDAO metadataDAO; private DynamicTaskMapper dynamicTaskMapper; @Rule public ExpectedException expectedException = ExpectedException.none(); @Before - public void setUp() throws Exception { + public void setUp() { parametersUtils = mock(ParametersUtils.class); - dynamicTaskMapper = new DynamicTaskMapper(parametersUtils); + metadataDAO = mock(MetadataDAO.class); + + dynamicTaskMapper = new DynamicTaskMapper(parametersUtils, metadataDAO); } + @SuppressWarnings("unchecked") @Test - public void getMappedTasks() throws Exception { + public void getMappedTasks() { WorkflowTask workflowTask = new WorkflowTask(); workflowTask.setName("DynoTask"); @@ -69,6 +89,8 @@ public void getMappedTasks() throws Exception { .withTaskId(taskId) .build(); + when(metadataDAO.getTaskDef("DynoTask")).thenReturn(new TaskDef()); + List mappedTasks = dynamicTaskMapper.getMappedTasks(taskMapperContext); assertEquals(1, mappedTasks.size()); @@ -78,7 +100,7 @@ public void getMappedTasks() throws Exception { } @Test - public void getDynamicTaskName() throws Exception { + public void getDynamicTaskName() { Map taskInput = new HashMap<>(); taskInput.put("dynamicTaskName", "DynoTask"); @@ -88,7 +110,7 @@ public void getDynamicTaskName() throws Exception { } @Test - public void getDynamicTaskNameNotAvailable() throws Exception { + public void getDynamicTaskNameNotAvailable() { Map taskInput = new HashMap<>(); expectedException.expect(TerminateWorkflowException.class); @@ -96,11 +118,10 @@ public void getDynamicTaskNameNotAvailable() throws Exception { "Parameter= %s, input= %s", "dynamicTaskName", taskInput)); dynamicTaskMapper.getDynamicTaskName(taskInput, "dynamicTaskName"); - } @Test - public void getDynamicTaskDefinition() throws Exception { + public void getDynamicTaskDefinition() { //Given WorkflowTask workflowTask = new WorkflowTask(); workflowTask.setName("Foo"); @@ -108,6 +129,8 @@ public void getDynamicTaskDefinition() throws Exception { taskDef.setName("Foo"); workflowTask.setTaskDefinition(taskDef); + when(metadataDAO.getTaskDef(any())).thenReturn(new TaskDef()); + //when TaskDef dynamicTaskDefinition = dynamicTaskMapper.getDynamicTaskDefinition(workflowTask); @@ -126,7 +149,5 @@ public void getDynamicTaskDefinitionNull() { workflowTask.getName())); dynamicTaskMapper.getDynamicTaskDefinition(workflowTask); - } - } diff --git a/core/src/test/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapperTest.java b/core/src/test/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapperTest.java index f55416c311..0337365c1b 100644 --- a/core/src/test/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapperTest.java +++ b/core/src/test/java/com/netflix/conductor/core/execution/mapper/UserDefinedTaskMapperTest.java @@ -9,6 +9,7 @@ import com.netflix.conductor.core.execution.ParametersUtils; import com.netflix.conductor.core.execution.TerminateWorkflowException; import com.netflix.conductor.core.utils.IDGenerator; +import com.netflix.conductor.dao.MetadataDAO; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -23,19 +24,21 @@ public class UserDefinedTaskMapperTest { private ParametersUtils parametersUtils; + private MetadataDAO metadataDAO; private UserDefinedTaskMapper userDefinedTaskMapper; @Rule public ExpectedException expectedException = ExpectedException.none(); @Before - public void setUp() throws Exception { + public void setUp() { parametersUtils = mock(ParametersUtils.class); - userDefinedTaskMapper = new UserDefinedTaskMapper(parametersUtils); + metadataDAO = mock(MetadataDAO.class); + userDefinedTaskMapper = new UserDefinedTaskMapper(parametersUtils, metadataDAO); } @Test - public void getMappedTasks() throws Exception { + public void getMappedTasks() { //Given WorkflowTask taskToSchedule = new WorkflowTask(); taskToSchedule.setName("user_task"); @@ -68,7 +71,7 @@ public void getMappedTasks() throws Exception { } @Test - public void getMappedTasksException() throws Exception { + public void getMappedTasksException() { //Given WorkflowTask taskToSchedule = new WorkflowTask(); taskToSchedule.setName("user_task"); @@ -97,5 +100,4 @@ public void getMappedTasksException() throws Exception { userDefinedTaskMapper.getMappedTasks(taskMapperContext); } - } diff --git a/dependencies.lock b/dependencies.lock index 544b7b4ddd..e4e6e4be64 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,3 +1,12 @@ { - + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + } } \ No newline at end of file diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle deleted file mode 100644 index 5e0b388fea..0000000000 --- a/elasticsearch/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -dependencies { - compile project(':conductor-core') - - compile "com.google.inject:guice:${revGuice}" - -} diff --git a/es5-persistence/dependencies.lock b/es5-persistence/dependencies.lock index 3b0573d567..88f9de49a4 100644 --- a/es5-persistence/dependencies.lock +++ b/es5-persistence/dependencies.lock @@ -8,12 +8,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -24,6 +26,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -34,8 +42,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -80,6 +93,12 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -94,6 +113,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -118,12 +141,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -134,6 +159,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -144,8 +175,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -190,6 +226,12 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -204,6 +246,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -228,12 +274,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -244,6 +292,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -254,8 +308,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -300,6 +359,12 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -314,6 +379,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -329,6 +398,16 @@ "locked": "1.7.25" } }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "runtime": { "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -338,12 +417,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -354,6 +435,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -364,8 +451,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -410,6 +502,12 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -424,6 +522,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -448,12 +550,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -464,6 +568,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -474,8 +584,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -520,6 +635,12 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -534,6 +655,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -558,12 +683,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -574,6 +701,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -584,8 +717,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -630,9 +768,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -648,6 +792,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -656,9 +804,9 @@ "locked": "5.6.8", "requested": "5.6.8" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -676,12 +824,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -692,6 +842,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -702,8 +858,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -748,9 +909,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -766,6 +933,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -774,9 +945,9 @@ "locked": "5.6.8", "requested": "5.6.8" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -794,12 +965,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -810,6 +983,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -820,8 +999,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -866,9 +1050,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -884,6 +1074,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -892,9 +1086,9 @@ "locked": "5.6.8", "requested": "5.6.8" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -912,12 +1106,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.6" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -928,6 +1124,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -938,8 +1140,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "4.1.0", - "requested": "4.1.0" + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -984,9 +1191,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -1002,6 +1215,10 @@ "locked": "2.9.1", "requested": "2.9.1" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "locked": "5.6.8", + "requested": "5.6.8" + }, "org.elasticsearch.client:transport": { "locked": "5.6.8", "requested": "5.6.8" @@ -1010,9 +1227,9 @@ "locked": "5.6.8", "requested": "5.6.8" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock new file mode 100644 index 0000000000..947e908a69 --- /dev/null +++ b/grpc-client/dependencies.lock @@ -0,0 +1,1376 @@ +{ + "compile": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "compileClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "default": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, + "runtime": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "runtimeClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testCompile": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testCompileClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testRuntime": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testRuntimeClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + } +} \ No newline at end of file diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock new file mode 100644 index 0000000000..10b1310883 --- /dev/null +++ b/grpc-server/dependencies.lock @@ -0,0 +1,1460 @@ +{ + "compile": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "compileClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "default": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, + "runtime": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "runtimeClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testCompile": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-testing": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-all": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + }, + "org.testinfected.hamcrest-matchers:all-matchers": { + "locked": "1.8", + "requested": "1.8" + } + }, + "testCompileClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-testing": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-all": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + }, + "org.testinfected.hamcrest-matchers:all-matchers": { + "locked": "1.8", + "requested": "1.8" + } + }, + "testRuntime": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-testing": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-all": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + }, + "org.testinfected.hamcrest-matchers:all-matchers": { + "locked": "1.8", + "requested": "1.8" + } + }, + "testRuntimeClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "project": true + }, + "com.netflix.runtime:health-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.1.3" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-netty": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-testing": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "locked": "1.2.17", + "requested": "1.2.17" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-all": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + }, + "org.testinfected.hamcrest-matchers:all-matchers": { + "locked": "1.8", + "requested": "1.8" + } + } +} \ No newline at end of file diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock new file mode 100644 index 0000000000..8ad446b834 --- /dev/null +++ b/grpc/dependencies.lock @@ -0,0 +1,1187 @@ +{ + "compile": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "compileClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "default": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, + "protobuf": { + "io.chaossystems.grpc:grpc-healthcheck": { + "locked": "1.0.1", + "requested": "1.0.+" + } + }, + "protobufToolsLocator_grpc": { + "io.grpc:protoc-gen-grpc-java": { + "locked": "1.14.0", + "requested": "1.14.+" + } + }, + "protobufToolsLocator_protoc": { + "com.google.protobuf:protoc": { + "locked": "3.5.1", + "requested": "3.5.1" + } + }, + "runtime": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "runtimeClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testCompile": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testCompileClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testRuntime": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + }, + "testRuntimeClasspath": { + "com.amazonaws:aws-java-sdk-s3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.11.86" + }, + "com.fasterxml.jackson.core:jackson-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.fasterxml.jackson.core:jackson-databind": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", + "com.netflix.conductor:conductor-core" + ], + "locked": "2.7.5" + }, + "com.github.rholder:guava-retrying": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "2.0.0" + }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "locked": "1.0.0", + "requested": "1.0.0" + }, + "com.google.inject.extensions:guice-multibindings": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.inject:guice": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "4.1.0" + }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, + "com.jayway.jsonpath:json-path": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "2.2.0" + }, + "com.netflix.conductor:conductor-common": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "project": true + }, + "com.netflix.conductor:conductor-core": { + "project": true + }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, + "com.netflix.servo:servo-core": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.12.17" + }, + "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.68.0" + }, + "com.spotify:completable-futures": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "0.3.1" + }, + "io.grpc:grpc-protobuf": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.grpc:grpc-stub": { + "locked": "1.14.0", + "requested": "1.14.+" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "1.2.2" + }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "org.apache.commons:commons-lang3": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-core" + ], + "locked": "3.0" + }, + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.7.25" + } + } +} \ 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 3b3deebce2..74fdeb3e49 100644 --- a/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java +++ b/grpc/src/main/java/com/netflix/conductor/grpc/AbstractProtoMapper.java @@ -197,6 +197,9 @@ public EventHandlerPb.EventHandler.TaskDetails toProto(EventHandler.TaskDetails if (from.getOutputMessage() != null) { to.setOutputMessage( toProto( from.getOutputMessage() ) ); } + if (from.getTaskId() != null) { + to.setTaskId( from.getTaskId() ); + } return to.build(); } @@ -212,6 +215,7 @@ public EventHandler.TaskDetails fromProto(EventHandlerPb.EventHandler.TaskDetail if (from.hasOutputMessage()) { to.setOutputMessage( fromProto( from.getOutputMessage() ) ); } + to.setTaskId( from.getTaskId() ); return to; } diff --git a/grpc/src/main/proto/model/eventhandler.proto b/grpc/src/main/proto/model/eventhandler.proto index 5dd866230e..c8f16c2775 100644 --- a/grpc/src/main/proto/model/eventhandler.proto +++ b/grpc/src/main/proto/model/eventhandler.proto @@ -21,6 +21,7 @@ message EventHandler { string task_ref_name = 2; map output = 3; google.protobuf.Any output_message = 4; + string task_id = 5; } message Action { enum Type { diff --git a/jersey/dependencies.lock b/jersey/dependencies.lock index a22e55ecdc..da28b2f122 100644 --- a/jersey/dependencies.lock +++ b/jersey/dependencies.lock @@ -8,12 +8,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -24,6 +26,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -36,6 +44,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -51,6 +65,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -83,9 +101,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", @@ -113,12 +133,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -129,6 +151,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -141,6 +169,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -156,6 +190,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -188,6 +226,12 @@ "locked": "1.5.9", "requested": "1.5.9" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" @@ -209,6 +253,12 @@ "locked": "1.7.25" } }, + "compileOnly": { + "javax.servlet:javax.servlet-api": { + "locked": "3.1.0", + "requested": "3.1.0" + } + }, "default": { "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -218,12 +268,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -234,6 +286,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -246,6 +304,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -261,6 +325,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -293,9 +361,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "project": true, - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", @@ -314,10 +384,14 @@ "locked": "1.7.25" } }, - "provided": { - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" } }, "runtime": { @@ -329,12 +403,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -345,6 +421,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -357,6 +439,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -372,6 +460,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -404,9 +496,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", @@ -434,12 +528,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -450,6 +546,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -462,6 +564,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -477,6 +585,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -509,9 +621,11 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", @@ -539,12 +653,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -555,6 +671,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -567,6 +689,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -582,6 +710,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -614,17 +746,19 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", "requested": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -632,9 +766,9 @@ ], "locked": "3.2.1" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -652,12 +786,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -668,6 +804,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -680,6 +822,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -695,6 +843,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -727,17 +879,19 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", "requested": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -745,9 +899,9 @@ ], "locked": "3.2.1" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -765,12 +919,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -781,6 +937,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -793,6 +955,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -808,6 +976,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -840,17 +1012,19 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", "requested": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -858,9 +1032,9 @@ ], "locked": "3.2.1" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -878,12 +1052,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" @@ -894,6 +1070,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -906,6 +1088,12 @@ ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -921,6 +1109,10 @@ "com.netflix.conductor:conductor-core": { "project": true }, + "com.netflix.runtime:health-api": { + "locked": "1.1.3", + "requested": "1.1.+" + }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -953,17 +1145,19 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { - "locked": "3.1.0", - "requested": "3.1.0" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" }, "javax.ws.rs:jsr311-api": { "locked": "1.1.1", "requested": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -971,9 +1165,9 @@ ], "locked": "3.2.1" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/jersey/src/main/java/com/netflix/conductor/server/resources/WorkflowBulkResource.java b/jersey/src/main/java/com/netflix/conductor/server/resources/WorkflowBulkResource.java index b56f762abd..42483453a7 100644 --- a/jersey/src/main/java/com/netflix/conductor/server/resources/WorkflowBulkResource.java +++ b/jersey/src/main/java/com/netflix/conductor/server/resources/WorkflowBulkResource.java @@ -179,7 +179,7 @@ public BulkResponse retry(List workflowIds) throws IllegalArgumentExcept * @throws NullPointerException workflowIds list is null */ @DELETE - @Path("/") + @Path("/terminate") @ApiOperation("Terminate workflows execution") public BulkResponse terminate(List workflowIds, @QueryParam("reason") String reason) throws IllegalArgumentException, NullPointerException { Preconditions.checkNotNull(workflowIds, "workflowIds list cannot be null."); diff --git a/redis-persistence/build.gradle b/redis-persistence/build.gradle index 68fa8d37e9..adc96fff2c 100644 --- a/redis-persistence/build.gradle +++ b/redis-persistence/build.gradle @@ -1,11 +1,9 @@ dependencies { - compile project(':conductor-core') - compile "redis.clients:jedis:${revJedis}" - compile "com.google.inject:guice:${revGuice}" - compile "com.netflix.dyno:dyno-core:${revDynoCore}" - compile ("com.netflix.dyno:dyno-jedis:${revDynoJedis}") - compile ("com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}") + compile project(':conductor-core') + compile "redis.clients:jedis:${revJedis}" + compile "com.google.inject:guice:${revGuice}" + compile "com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}" //In memory compile "org.rarefiedredis.redis:redis-java:${revRarefiedRedis}" diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index 64786fd3a9..1a177fa82c 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -8,12 +8,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -24,6 +26,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -37,6 +45,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -53,16 +67,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -88,12 +94,22 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "3.6" }, + "org.rarefiedredis.redis:redis-java": { + "locked": "0.0.17", + "requested": "0.0.17" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -114,12 +130,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -130,6 +148,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -143,6 +167,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -159,16 +189,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -194,12 +216,22 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "3.6" }, + "org.rarefiedredis.redis:redis-java": { + "locked": "0.0.17", + "requested": "0.0.17" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -220,12 +252,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -236,6 +270,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -249,6 +289,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -265,16 +311,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -300,12 +338,22 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "3.6" }, + "org.rarefiedredis.redis:redis-java": { + "locked": "0.0.17", + "requested": "0.0.17" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -317,6 +365,16 @@ "requested": "2.9.0" } }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "runtime": { "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -326,12 +384,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -342,6 +402,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -355,6 +421,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -371,16 +443,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -406,12 +470,22 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "3.6" }, + "org.rarefiedredis.redis:redis-java": { + "locked": "0.0.17", + "requested": "0.0.17" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -432,12 +506,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -448,6 +524,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -461,6 +543,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -477,16 +565,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -512,12 +592,22 @@ ], "locked": "1.2.2" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], "locked": "3.6" }, + "org.rarefiedredis.redis:redis-java": { + "locked": "0.0.17", + "requested": "0.0.17" + }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" @@ -538,12 +628,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -554,6 +646,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -567,6 +665,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -583,16 +687,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -618,9 +714,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -628,9 +730,9 @@ ], "locked": "3.6" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", @@ -656,12 +758,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -672,6 +776,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -685,6 +795,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -701,16 +817,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -736,9 +844,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -746,9 +860,9 @@ ], "locked": "3.6" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", @@ -774,12 +888,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -790,6 +906,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -803,6 +925,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -819,16 +947,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -854,9 +974,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -864,9 +990,9 @@ ], "locked": "3.6" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", @@ -892,12 +1018,14 @@ }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -908,6 +1036,12 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -921,6 +1055,12 @@ "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -937,16 +1077,8 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc3", - "requested": "2.0.0-rc3" - }, - "com.netflix.dyno:dyno-core": { - "locked": "1.6.4", - "requested": "1.6.4" - }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.4", - "requested": "1.6.4" + "locked": "2.0.0-rc4", + "requested": "2.0.0-rc4" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -972,9 +1104,15 @@ ], "locked": "1.2.2" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -982,9 +1120,9 @@ ], "locked": "3.6" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", diff --git a/server/build.gradle b/server/build.gradle index c27dbf71c8..e484af718c 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -80,6 +80,6 @@ task server(type: JavaExec) { // Switch between Elasticsearch versions 2 & 5 with major version number. systemProperty 'loadSample', 'true' systemProperties System.properties - main = 'com.netflix.conductor.server.Main' + main = 'com.netflix.conductor.bootstrap.Main' classpath = sourceSets.test.runtimeClasspath } diff --git a/server/dependencies.lock b/server/dependencies.lock index 2a61900b88..d2604f8178 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -10,16 +10,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -30,6 +32,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -44,13 +58,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -61,6 +80,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -71,18 +92,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -98,19 +126,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -165,6 +192,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -188,20 +239,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -222,14 +281,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -242,6 +299,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -261,8 +324,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -288,16 +353,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -308,6 +375,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -322,13 +401,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -339,6 +423,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -349,18 +435,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -376,19 +469,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -443,6 +535,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -466,20 +582,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -500,14 +624,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -520,6 +642,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -539,8 +667,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -566,16 +696,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -586,6 +718,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -600,13 +744,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -617,6 +766,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -627,18 +778,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -654,19 +812,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -721,6 +878,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -744,20 +925,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -778,14 +967,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -798,6 +985,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -817,8 +1010,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -844,16 +1039,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -864,6 +1061,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -878,13 +1087,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -895,6 +1109,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -905,18 +1121,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -932,19 +1155,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -999,6 +1221,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -1022,20 +1268,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -1056,14 +1310,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -1076,6 +1328,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -1095,8 +1353,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -1159,6 +1419,16 @@ "requested": "1.2.4" } }, + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "providedCompile": { "javax.servlet:javax.servlet-api": { "locked": "3.1.0", @@ -1182,16 +1452,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -1202,6 +1474,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1216,13 +1500,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1233,6 +1522,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -1243,18 +1534,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -1270,19 +1568,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -1337,6 +1634,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -1360,20 +1681,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -1394,14 +1723,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -1414,6 +1741,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -1433,8 +1766,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -1460,16 +1795,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -1480,6 +1817,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1494,13 +1843,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1511,6 +1865,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -1521,18 +1877,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -1548,19 +1911,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -1615,6 +1977,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -1638,20 +2024,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -1672,14 +2066,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -1692,6 +2084,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -1711,8 +2109,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -1738,16 +2138,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -1758,6 +2160,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1772,13 +2186,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1789,6 +2208,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -1799,18 +2220,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -1826,19 +2254,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -1893,6 +2320,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -1916,20 +2367,28 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" + }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-mysql-persistence" @@ -1950,14 +2409,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -1970,6 +2427,12 @@ "project": true, "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -1989,8 +2452,10 @@ "locked": "4.0.3" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -2016,16 +2481,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -2036,6 +2503,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2050,13 +2529,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2067,6 +2551,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -2077,18 +2563,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { + "project": true + }, + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -2104,19 +2597,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -2171,6 +2663,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -2194,23 +2710,31 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -2232,14 +2756,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -2252,6 +2774,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -2270,13 +2798,15 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -2302,16 +2832,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -2322,6 +2854,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2336,13 +2880,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2353,6 +2902,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -2363,18 +2914,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -2390,19 +2948,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -2457,6 +3014,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -2480,23 +3061,31 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -2518,14 +3107,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -2538,6 +3125,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -2556,13 +3149,15 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -2588,16 +3183,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -2608,6 +3205,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2622,13 +3231,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2639,6 +3253,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -2649,18 +3265,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -2676,19 +3299,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -2743,6 +3365,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -2766,23 +3412,31 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -2804,14 +3458,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -2824,6 +3476,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -2842,13 +3500,15 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -2874,16 +3534,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -2894,6 +3556,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2908,13 +3582,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "locked": "4.1.0", "requested": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -2925,6 +3604,8 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -2935,18 +3616,25 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence" ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "project": true }, "com.netflix.conductor:conductor-jersey": { @@ -2962,19 +3650,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.dyno:dyno-jedis": { - "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" - ], - "locked": "1.6.4" + "com.netflix.runtime:health-guice": { + "locked": "1.1.3", + "requested": "1.1.+" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -3029,6 +3716,30 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -3052,23 +3763,31 @@ "locked": "1.5.9", "requested": "1.5.9" }, - "javax.servlet:javax.servlet-api": { + "javax.inject:javax.inject": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey" + "com.netflix.conductor:conductor-common" ], + "locked": "1" + }, + "javax.servlet:javax.servlet-api": { "locked": "3.1.0", "requested": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -3090,14 +3809,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -3110,6 +3827,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -3128,13 +3851,15 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { - "locked": "0.0.17", - "requested": "0.0.17" + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-redis-persistence" + ], + "locked": "0.0.17" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/server/src/main/java/com/netflix/conductor/bootstrap/ModulesProvider.java b/server/src/main/java/com/netflix/conductor/bootstrap/ModulesProvider.java index 482f86fb0d..fa8797f1e1 100644 --- a/server/src/main/java/com/netflix/conductor/bootstrap/ModulesProvider.java +++ b/server/src/main/java/com/netflix/conductor/bootstrap/ModulesProvider.java @@ -3,7 +3,11 @@ import com.google.inject.AbstractModule; import com.google.inject.ProvisionException; import com.netflix.conductor.common.utils.ExternalPayloadStorage; +import com.netflix.conductor.contribs.http.HttpTask; +import com.netflix.conductor.contribs.http.RestClientManager; +import com.netflix.conductor.contribs.json.JsonJqTransform; import com.netflix.conductor.core.config.Configuration; +import com.netflix.conductor.core.config.SystemPropertiesConfiguration; import com.netflix.conductor.core.utils.DummyPayloadStorage; import com.netflix.conductor.core.utils.S3PayloadStorage; import com.netflix.conductor.dao.RedisWorkflowModule; @@ -117,6 +121,8 @@ protected void configure() { }); } + new HttpTask(new RestClientManager(), configuration); + new JsonJqTransform(); modules.add(new ServerModule()); return modules; diff --git a/server/src/main/java/com/netflix/conductor/jetty/server/JettyServer.java b/server/src/main/java/com/netflix/conductor/jetty/server/JettyServer.java index 2f026e3611..862131e8ae 100644 --- a/server/src/main/java/com/netflix/conductor/jetty/server/JettyServer.java +++ b/server/src/main/java/com/netflix/conductor/jetty/server/JettyServer.java @@ -1,11 +1,11 @@ /** * Copyright 2017 Netflix, Inc. - * + *

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

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

* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,29 +15,26 @@ */ package com.netflix.conductor.jetty.server; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.inject.servlet.GuiceFilter; - -import com.fasterxml.jackson.databind.ObjectMapper; import com.netflix.conductor.bootstrap.Main; import com.netflix.conductor.common.metadata.tasks.TaskDef; import com.netflix.conductor.service.Lifecycle; import com.sun.jersey.api.client.Client; - import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.DispatcherType; +import javax.ws.rs.core.MediaType; import java.io.InputStream; import java.util.EnumSet; import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.servlet.DispatcherType; -import javax.ws.rs.core.MediaType; - /** * @author Viren */ @@ -121,8 +118,7 @@ private static void createKitchenSink(int port) throws Exception { stream = Main.class.getResourceAsStream("/sub_flow_1.json"); client.resource("http://localhost:" + port + "/api/metadata/workflow").type(MediaType.APPLICATION_JSON).post(stream); - Map payload = ImmutableMap.of("input", - ImmutableMap.of("task2Name", "task_5")); + Map payload = ImmutableMap.of("task2Name", "task_5"); String payloadStr = objectMapper.writeValueAsString(payload); client.resource("http://localhost:" + port + "/api/workflow/kitchensink").type(MediaType.APPLICATION_JSON).post(payloadStr); diff --git a/server/src/main/java/com/netflix/conductor/server/ServerModule.java b/server/src/main/java/com/netflix/conductor/server/ServerModule.java index 955dd8dd30..e459c9bcce 100644 --- a/server/src/main/java/com/netflix/conductor/server/ServerModule.java +++ b/server/src/main/java/com/netflix/conductor/server/ServerModule.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with @@ -10,9 +10,6 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -/** - * - */ package com.netflix.conductor.server; import com.fasterxml.jackson.databind.ObjectMapper; @@ -31,7 +28,6 @@ /** * @author Viren - * */ public class ServerModule extends AbstractModule { diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index b87b93ce0e..4988ec5c01 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1,10 +1,20 @@ { + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "testCompile": { "com.amazonaws:aws-java-sdk-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -16,16 +26,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -42,6 +54,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -59,13 +83,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-server" ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -86,6 +115,9 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -99,8 +131,10 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", @@ -108,13 +142,23 @@ ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-client": { + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], @@ -145,25 +189,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.eureka:eureka-client": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-client" ], - "locked": "1.6.4" + "locked": "1.8.7" }, - "com.netflix.dyno:dyno-jedis": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.eureka:eureka-client": { + "com.netflix.runtime:health-guice": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-server" ], - "locked": "1.8.7" + "locked": "1.1.3" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -228,6 +273,31 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -254,23 +324,34 @@ "locked": "1.5.9", "requested": "1.5.0" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "javax.servlet:javax.servlet-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-server" ], "locked": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -292,14 +373,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -318,6 +397,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -337,13 +422,13 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-server" + "com.netflix.conductor:conductor-redis-persistence" ], "locked": "0.0.17", "requested": "0.0.17" @@ -366,7 +451,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -378,16 +463,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -404,6 +491,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -421,13 +520,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-server" ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -448,6 +552,9 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -461,8 +568,10 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", @@ -470,13 +579,23 @@ ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-client": { + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], @@ -507,25 +626,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.eureka:eureka-client": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-client" ], - "locked": "1.6.4" + "locked": "1.8.7" }, - "com.netflix.dyno:dyno-jedis": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.eureka:eureka-client": { + "com.netflix.runtime:health-guice": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-server" ], - "locked": "1.8.7" + "locked": "1.1.3" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -590,6 +710,31 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -616,23 +761,34 @@ "locked": "1.5.9", "requested": "1.5.0" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "javax.servlet:javax.servlet-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-server" ], "locked": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -654,14 +810,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -680,6 +834,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -699,13 +859,13 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-server" + "com.netflix.conductor:conductor-redis-persistence" ], "locked": "0.0.17", "requested": "0.0.17" @@ -728,7 +888,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -740,16 +900,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -766,6 +928,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -783,13 +957,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-server" ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -810,6 +989,9 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -823,8 +1005,10 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", @@ -832,13 +1016,23 @@ ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-client": { + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], @@ -869,25 +1063,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.eureka:eureka-client": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-client" ], - "locked": "1.6.4" + "locked": "1.8.7" }, - "com.netflix.dyno:dyno-jedis": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.eureka:eureka-client": { + "com.netflix.runtime:health-guice": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-server" ], - "locked": "1.8.7" + "locked": "1.1.3" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -952,6 +1147,31 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -978,23 +1198,34 @@ "locked": "1.5.9", "requested": "1.5.0" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "javax.servlet:javax.servlet-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-server" ], "locked": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -1016,14 +1247,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -1042,6 +1271,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -1061,13 +1296,13 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-server" + "com.netflix.conductor:conductor-redis-persistence" ], "locked": "0.0.17", "requested": "0.0.17" @@ -1090,7 +1325,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.amazonaws:aws-java-sdk-s3": { "firstLevelTransitive": [ @@ -1102,16 +1337,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" ], - "locked": "1.11.415" + "locked": "1.11.426" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.7.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], "locked": "2.8.7" @@ -1128,6 +1365,18 @@ ], "locked": "2.0.0" }, + "com.github.vmg.protogen:protogen-annotations": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1.0.0" + }, + "com.google.api.grpc:proto-google-common-protos": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.0.0" + }, "com.google.inject.extensions:guice-multibindings": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1145,13 +1394,18 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", - "com.netflix.conductor:conductor-es5-persistence", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", "com.netflix.conductor:conductor-server" ], "locked": "4.1.0" }, + "com.google.protobuf:protobuf-java": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "3.5.1" + }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" @@ -1172,6 +1426,9 @@ "com.netflix.conductor:conductor-client", "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-core", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey" ], "project": true @@ -1185,8 +1442,10 @@ "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs", - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence", + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server", "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-mysql-persistence", "com.netflix.conductor:conductor-redis-persistence", @@ -1194,13 +1453,23 @@ ], "project": true }, - "com.netflix.conductor:conductor-es2-persistence": { + "com.netflix.conductor:conductor-es5-persistence": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], "project": true }, - "com.netflix.conductor:conductor-es5-persistence": { + "com.netflix.conductor:conductor-grpc": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "project": true + }, + "com.netflix.conductor:conductor-grpc-client": { + "project": true + }, + "com.netflix.conductor:conductor-grpc-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], @@ -1231,25 +1500,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-redis-persistence" ], - "locked": "2.0.0-rc3" + "locked": "2.0.0-rc4" }, - "com.netflix.dyno:dyno-core": { + "com.netflix.eureka:eureka-client": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-client" ], - "locked": "1.6.4" + "locked": "1.8.7" }, - "com.netflix.dyno:dyno-jedis": { + "com.netflix.runtime:health-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-redis-persistence" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-jersey" ], - "locked": "1.6.4" + "locked": "1.1.3" }, - "com.netflix.eureka:eureka-client": { + "com.netflix.runtime:health-guice": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-client" + "com.netflix.conductor:conductor-server" ], - "locked": "1.8.7" + "locked": "1.1.3" }, "com.netflix.servo:servo-core": { "firstLevelTransitive": [ @@ -1314,6 +1584,31 @@ ], "locked": "2.4" }, + "io.grpc:grpc-netty": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-protobuf": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-services": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.14.0" + }, + "io.grpc:grpc-stub": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc" + ], + "locked": "1.14.0" + }, "io.nats:java-nats-streaming": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-contribs" @@ -1340,23 +1635,34 @@ "locked": "1.5.9", "requested": "1.5.0" }, + "javax.inject:javax.inject": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-common" + ], + "locked": "1" + }, "javax.servlet:javax.servlet-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-jersey", "com.netflix.conductor:conductor-server" ], "locked": "3.1.0" }, "javax.ws.rs:jsr311-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-contribs", "com.netflix.conductor:conductor-jersey" ], "locked": "1.1.1" }, - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" + }, + "log4j:log4j": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-grpc-client", + "com.netflix.conductor:conductor-grpc-server" + ], + "locked": "1.2.17" }, "mysql:mysql-connector-java": { "firstLevelTransitive": [ @@ -1378,14 +1684,12 @@ }, "org.apache.logging.log4j:log4j-api": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" }, "org.apache.logging.log4j:log4j-core": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-es2-persistence", "com.netflix.conductor:conductor-es5-persistence" ], "locked": "2.9.1" @@ -1404,6 +1708,12 @@ "locked": "9.3.9.v20160517", "requested": "9.3.9.v20160517" }, + "org.elasticsearch.client:elasticsearch-rest-high-level-client": { + "firstLevelTransitive": [ + "com.netflix.conductor:conductor-es5-persistence" + ], + "locked": "5.6.8" + }, "org.elasticsearch.client:transport": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-es5-persistence" @@ -1423,13 +1733,13 @@ ], "locked": "4.0.3" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" }, "org.rarefiedredis.redis:redis-java": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-server" + "com.netflix.conductor:conductor-redis-persistence" ], "locked": "0.0.17", "requested": "0.0.17" diff --git a/test-harness/src/test/java/com/netflix/conductor/tests/integration/AbstractWorkflowServiceTest.java b/test-harness/src/test/java/com/netflix/conductor/tests/integration/AbstractWorkflowServiceTest.java index ac61fdf22a..02a4b219a9 100644 --- a/test-harness/src/test/java/com/netflix/conductor/tests/integration/AbstractWorkflowServiceTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/tests/integration/AbstractWorkflowServiceTest.java @@ -132,7 +132,7 @@ public abstract class AbstractWorkflowServiceTest { private static List taskDefs; - protected static final String LINEAR_WORKFLOW_T1_T2 = "junit_test_wf"; + private static final String LINEAR_WORKFLOW_T1_T2 = "junit_test_wf"; private static final String LINEAR_WORKFLOW_T1_T2_SW = "junit_test_wf_sw"; diff --git a/test-harness/src/test/java/com/netflix/conductor/tests/integration/WorkflowServiceTest.java b/test-harness/src/test/java/com/netflix/conductor/tests/integration/WorkflowServiceTest.java index fdc4eee01e..534f0a48a0 100644 --- a/test-harness/src/test/java/com/netflix/conductor/tests/integration/WorkflowServiceTest.java +++ b/test-harness/src/test/java/com/netflix/conductor/tests/integration/WorkflowServiceTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Netflix, Inc. *

* Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,9 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * - */ package com.netflix.conductor.tests.integration; import com.netflix.conductor.tests.utils.TestRunner; diff --git a/test-harness/src/test/java/com/netflix/conductor/tests/utils/TestModule.java b/test-harness/src/test/java/com/netflix/conductor/tests/utils/TestModule.java index 9abed623b3..695a989087 100644 --- a/test-harness/src/test/java/com/netflix/conductor/tests/utils/TestModule.java +++ b/test-harness/src/test/java/com/netflix/conductor/tests/utils/TestModule.java @@ -1,18 +1,15 @@ -/** +/* * Copyright 2016 Netflix, Inc. - * + *

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

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

* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -/** - * - */ package com.netflix.conductor.tests.utils; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,20 +26,15 @@ import com.netflix.conductor.dao.dynomite.RedisExecutionDAO; import com.netflix.conductor.dao.dynomite.RedisMetadataDAO; import com.netflix.conductor.dao.dynomite.queue.DynoQueueDAO; -import com.netflix.conductor.jedis.InMemoryJedisProvider; -import com.netflix.conductor.jedis.JedisMock; -import com.netflix.dyno.queues.ShardSupplier; -import redis.clients.jedis.JedisCommands; +import com.netflix.conductor.dyno.RedisQueuesProvider; +import com.netflix.conductor.server.LocalRedisModule; +import com.netflix.dyno.queues.redis.RedisQueues; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; /** * @author Viren - * */ public class TestModule extends AbstractModule { private int maxThreads = 50; @@ -60,27 +52,14 @@ protected void configure() { MockConfiguration config = new MockConfiguration(); bind(Configuration.class).toInstance(config); - JedisCommands jedisMock = new JedisMock(); - - DynoQueueDAO queueDao = new DynoQueueDAO(jedisMock, jedisMock, new ShardSupplier() { - - @Override - public Set getQueueShards() { - return new HashSet<>(Collections.singletonList("a")); - } - - @Override - public String getCurrentShard() { - return "a"; - } - }, config); + install(new LocalRedisModule()); + bind(RedisQueues.class).toProvider(RedisQueuesProvider.class); bind(MetadataDAO.class).to(RedisMetadataDAO.class); bind(ExecutionDAO.class).to(RedisExecutionDAO.class); - bind(DynoQueueDAO.class).toInstance(queueDao); bind(QueueDAO.class).to(DynoQueueDAO.class); bind(IndexDAO.class).to(MockIndexDAO.class); - bind(JedisCommands.class).toProvider(InMemoryJedisProvider.class); + install(new CoreModule()); bind(UserTask.class).asEagerSingleton(); bind(ObjectMapper.class).toProvider(JsonMapperProvider.class); diff --git a/ui/dependencies.lock b/ui/dependencies.lock index 20127baaed..992110a39e 100644 --- a/ui/dependencies.lock +++ b/ui/dependencies.lock @@ -1,42 +1,52 @@ { + "jacocoAgent": { + "org.jacoco:org.jacoco.agent": { + "locked": "0.8.1" + } + }, + "jacocoAnt": { + "org.jacoco:org.jacoco.ant": { + "locked": "0.8.1" + } + }, "testCompile": { - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" } }, "testCompileClasspath": { - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" } }, "testRuntime": { - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" } }, "testRuntimeClasspath": { - "junit:junit-dep": { - "locked": "4.10", - "requested": "4.10" + "junit:junit": { + "locked": "4.12", + "requested": "4.12" }, - "org.mockito:mockito-all": { - "locked": "1.10.0", - "requested": "1.10.0" + "org.mockito:mockito-core": { + "locked": "1.10.19", + "requested": "1.10.19" } } } \ No newline at end of file diff --git a/ui/src/api/wfe.js b/ui/src/api/wfe.js index e449aead20..c0eae2ffe9 100644 --- a/ui/src/api/wfe.js +++ b/ui/src/api/wfe.js @@ -205,7 +205,7 @@ router.post('/bulk/restart', async (req, res, next) => { router.delete('/bulk/terminate', async (req, res, next) => { try { - const result = await http.delete(baseURL2 + "bulk", req.body, req.token); + const result = await http.delete(baseURL2 + "bulk/terminate", req.body, req.token); res.status(200).send(result); } catch (err) { next(err); diff --git a/ui/src/components/workflow/executions/WorkflowDetails.js b/ui/src/components/workflow/executions/WorkflowDetails.js index e180db0893..7f1fe62255 100644 --- a/ui/src/components/workflow/executions/WorkflowDetails.js +++ b/ui/src/components/workflow/executions/WorkflowDetails.js @@ -147,7 +147,7 @@ class WorkflowDetails extends React.Component { return (

- {wf.workflowType}/{wf.version} + {wf.workflowName}/{wf.version} {wf.status} diff --git a/versionsOfDependencies.gradle b/versionsOfDependencies.gradle index acf4694af5..387c4dc9b3 100644 --- a/versionsOfDependencies.gradle +++ b/versionsOfDependencies.gradle @@ -6,9 +6,7 @@ ext { revArchaius = '0.7.5' revCommonsLang3 = '3.0' revCommonsIo = '2.4' - revDynoCore = '1.6.4' - revDynoJedis = '1.6.4' - revDynoQueues = '2.0.0-rc3' + revDynoQueues = '2.0.0-rc4' revElasticSearch5 = '5.6.8' revElasticSearch5Client = '5.6.8' revEurekaClient = '1.8.7'