From a570380aa125f65b4d66a1bc094b9d3a5553ac0d Mon Sep 17 00:00:00 2001 From: JumasJM <108924588+JumasJM@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:25:57 +0200 Subject: [PATCH] Update dependencies (#176) - prevent old dependencies to cause errors and build fails - update Dockerfile Type: Improvement Signed-off-by: jmasar Co-authored-by: jmasar --- annotations-processor/build.gradle | 4 +- annotations-processor/dependencies.lock | 22 +-- annotations/dependencies.lock | 10 +- build.gradle | 17 ++- client/dependencies.lock | 58 +++---- common/dependencies.lock | 62 ++++---- conductor-community | 2 +- core/dependencies.lock | 80 +++++----- .../IsolatedTaskQueueProducerSpec.groovy | 2 +- dependencies.gradle | 14 +- dependencies.lock | 10 +- docker/server/Dockerfile | 2 + es6-persistence/dependencies.lock | 54 +++---- http-task/dependencies.lock | 46 +++--- json-jq-task/dependencies.lock | 36 ++--- redis-persistence/dependencies.lock | 36 ++--- rest/dependencies.lock | 42 ++--- server/build.gradle | 4 + server/dependencies.lock | 143 +++++++++--------- test-harness/dependencies.lock | 78 +++++----- 20 files changed, 367 insertions(+), 355 deletions(-) diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle index 2bb9a52aa3..008983429f 100644 --- a/annotations-processor/build.gradle +++ b/annotations-processor/build.gradle @@ -5,10 +5,10 @@ sourceSets { dependencies { implementation project(':conductor-annotations') - api 'com.google.guava:guava:31.1-jre' + api 'com.google.guava:guava:32.1.2-jre' api 'com.squareup:javapoet:1.13.+' api 'com.github.jknack:handlebars:4.3.+' - api 'com.google.protobuf:protobuf-java:3.21.7' + api 'com.google.protobuf:protobuf-java:3.21.12' api 'javax.annotation:javax.annotation-api:1.3.2' api gradleApi() diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock index 481b791d0a..d0006d22a3 100644 --- a/annotations-processor/dependencies.lock +++ b/annotations-processor/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -9,10 +9,10 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -84,10 +84,10 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -134,7 +134,7 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.7" @@ -170,10 +170,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -181,7 +181,7 @@ "locked": "4.3.1" }, "com.google.guava:guava": { - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "locked": "3.21.7" @@ -232,10 +232,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock index 7b2c9a2acf..14b3eca049 100644 --- a/annotations/dependencies.lock +++ b/annotations/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -61,10 +61,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -90,10 +90,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7555f2b373..4814f4a7a9 100644 --- a/build.gradle +++ b/build.gradle @@ -8,18 +8,18 @@ buildscript { } } dependencies { - classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0' - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.3' + classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.16' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+' } } plugins { - id 'io.spring.dependency-management' version '1.0.13.RELEASE' + id 'io.spring.dependency-management' version '1.1.3' id 'java' id 'application' id 'jacoco' - id 'nebula.netflixoss' version '10.6.0' + id 'com.netflix.nebula.netflixoss' version '11.3.2' id 'org.sonarqube' version '3.4.0.2513' } @@ -47,13 +47,16 @@ apply from: "$rootDir/dependencies.gradle" apply from: "$rootDir/springboot-bom-overrides.gradle" allprojects { - apply plugin: 'nebula.netflixoss' + apply plugin: 'com.netflix.nebula.netflixoss' apply plugin: 'io.spring.dependency-management' apply plugin: 'java-library' apply plugin: 'project-report' - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } group = 'com.netflix.conductor' diff --git a/client/dependencies.lock b/client/dependencies.lock index 6b0ee6cac9..d070447de8 100644 --- a/client/dependencies.lock +++ b/client/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -9,10 +9,10 @@ "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.netflix.conductor:conductor-common": { "project": true @@ -68,31 +68,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -122,7 +122,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -177,10 +177,10 @@ "locked": "1.11.86" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.netflix.conductor:conductor-common": { "project": true @@ -222,7 +222,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -240,16 +240,16 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -260,31 +260,31 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -317,7 +317,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -361,7 +361,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jersey.core:jersey-common": { "locked": "2.22.2" @@ -379,16 +379,16 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/common/dependencies.lock b/common/dependencies.lock index 83f5cb299a..9310ea3944 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "annotationsProcessorCodegen": { @@ -15,13 +15,13 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "31.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-annotations-processor" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "firstLevelTransitive": [ @@ -82,22 +82,22 @@ }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -121,30 +121,30 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -182,16 +182,16 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -200,7 +200,7 @@ "locked": "4.13.2" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -224,27 +224,27 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-annotations": { "project": true @@ -253,7 +253,7 @@ "locked": "4.13.2" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -292,13 +292,13 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/conductor-community b/conductor-community index b38adcebe0..bfaca28872 160000 --- a/conductor-community +++ b/conductor-community @@ -1 +1 @@ -Subproject commit b38adcebe08e29c2c3b38dcb780621ee0c74ca28 +Subproject commit bfaca288723a1dafdf1502d5eabbe9f0186a3b5e diff --git a/core/dependencies.lock b/core/dependencies.lock index 5699af6af0..47426a63a3 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -1,24 +1,24 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -45,7 +45,7 @@ "locked": "2.3.3" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -69,36 +69,36 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "runtimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" @@ -107,7 +107,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -143,7 +143,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -192,19 +192,19 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -234,7 +234,7 @@ "locked": "4.13.2" }, "org.apache.bval:bval-jsr": { - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -255,7 +255,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -267,45 +267,45 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "testRuntimeClasspath": { "com.fasterxml.jackson.core:jackson-annotations": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "locked": "2.9.3" @@ -314,7 +314,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "locked": "2.4.0" @@ -353,7 +353,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -397,7 +397,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.glassfish.jaxb:jaxb-runtime": { "locked": "2.3.3" @@ -409,22 +409,22 @@ "locked": "15.4" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } } } \ No newline at end of file diff --git a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy index 3673c00911..25e565fac9 100644 --- a/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy +++ b/core/src/test/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy @@ -45,7 +45,7 @@ class IsolatedTaskQueueProducerSpec extends Specification { Duration.ofSeconds(10)) } - @Test + def "addTaskQueuesAddsElementToQueue"() { given: TaskDef taskDef = new TaskDef(isolationGroupId: "isolated") diff --git a/dependencies.gradle b/dependencies.gradle index b5c1ea4d53..6177af6399 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -18,7 +18,7 @@ ext { revActivation = '2.0.0' revAwaitility = '3.1.6' revAwsSdk = '1.11.86' - revBval = '2.0.5' + revBval = '2.0.6' revCaffeine = '3.1.4' revCassandra = '3.10.2' revCassandraUnit = '3.11.2.0' @@ -27,9 +27,9 @@ ext { revElasticSearch6 = '6.8.12' revEmbeddedRedis = '0.6' revEurekaClient = '1.10.10' - revGroovy = '2.5.22' - revGrpc = '1.+' - revGuava = '30.0-jre' + revGroovy = '3.0.19' + revGrpc = '1.57.+' + revGuava = '32.1.2-jre' revHamcrestAllMatchers = '1.8' revHealth = '1.1.+' revJAXB = '2.3.3' @@ -44,16 +44,16 @@ ext { revOpenapi = '1.6.+' //revOrkesQueues = '1.0.3' revPowerMock = '2.0.9' - revProtoBuf = '3.21.7' + revProtoBuf = '3.21.12' revProtogenAnnotations = '1.0.0' revProtogenCodegen = '1.4.0' revRarefiedRedis = '0.0.17' revRedisson = '3.13.3' revRxJava = '1.2.2' revSpectator = '0.122.0' - revSpock = '1.3-groovy-2.5' + revSpock = '2.3-groovy-3.0' revSpotifyCompletableFutures = '0.3.3' - revTestContainer = '1.15.3' + revTestContainer = '1.18.3' // Dependencies for conductor-community revLog4J= '2.17.1!!' diff --git a/dependencies.lock b/dependencies.lock index b2d91aea12..a5a57a3279 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -71,10 +71,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -100,10 +100,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 8170a33b11..6d4984483f 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -13,6 +13,8 @@ LABEL maintainer="Netflix OSS " COPY . /conductor WORKDIR /conductor +RUN apt-get update && apt-get install -y git + # Build the server on run RUN ./gradlew -Prelease.version=2.0.0-SNAPSHOT build -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000 -x test diff --git a/es6-persistence/dependencies.lock b/es6-persistence/dependencies.lock index 9fb73e7bc5..d121a0ec45 100644 --- a/es6-persistence/dependencies.lock +++ b/es6-persistence/dependencies.lock @@ -1,12 +1,12 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -45,10 +45,10 @@ "locked": "6.8.12" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "runtimeClasspath": { @@ -56,27 +56,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -85,14 +85,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -156,7 +156,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -223,7 +223,7 @@ }, "testCompileClasspath": { "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.netflix.conductor:conductor-common": { "project": true @@ -271,16 +271,16 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" } }, "testRuntimeClasspath": { @@ -288,27 +288,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -317,14 +317,14 @@ "locked": "2.9.3" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -391,7 +391,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -462,16 +462,16 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" } } } \ No newline at end of file diff --git a/http-task/dependencies.lock b/http-task/dependencies.lock index f6669d5c91..3d3972570d 100644 --- a/http-task/dependencies.lock +++ b/http-task/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -30,10 +30,10 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -41,27 +41,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -238,16 +238,16 @@ "locked": "5.12.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testcontainers:mockserver": { - "locked": "1.15.3" + "locked": "1.18.3" } }, "testRuntimeClasspath": { @@ -255,27 +255,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -288,7 +288,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -358,7 +358,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -426,16 +426,16 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.testcontainers:mockserver": { - "locked": "1.15.3" + "locked": "1.18.3" } } } \ No newline at end of file diff --git a/json-jq-task/dependencies.lock b/json-jq-task/dependencies.lock index 27e43fb550..c33e34a503 100644 --- a/json-jq-task/dependencies.lock +++ b/json-jq-task/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "2.17.2" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -41,27 +41,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -232,10 +232,10 @@ "locked": "5.8.2" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -243,27 +243,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -276,7 +276,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -346,7 +346,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -405,10 +405,10 @@ "locked": "15.4" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index e5545e2aa9..72f660c988 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -36,7 +36,7 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -47,27 +47,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -80,7 +80,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -150,7 +150,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -250,10 +250,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -264,27 +264,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -297,7 +297,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -370,7 +370,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -432,10 +432,10 @@ "locked": "0.0.17" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "redis.clients:jedis": { "locked": "3.3.0" diff --git a/rest/dependencies.lock b/rest/dependencies.lock index a3cfdea4b4..6ce7d3209a 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -33,7 +33,7 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "runtimeClasspath": { @@ -41,27 +41,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -74,7 +74,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -141,7 +141,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -200,7 +200,7 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testCompileClasspath": { @@ -238,13 +238,13 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "testRuntimeClasspath": { @@ -252,27 +252,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -285,7 +285,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -355,7 +355,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -417,13 +417,13 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" } } } \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 70c92e0047..08a14ec357 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -64,6 +64,10 @@ bootJar { classifier = 'boot' } +// https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#integrating-with-actuator.build-info +// This will configure a BuildInfo task named bootBuildInfo springBoot { buildInfo() } + +compileJava.dependsOn bootBuildInfo diff --git a/server/dependencies.lock b/server/dependencies.lock index c197447906..f931878308 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -63,22 +63,22 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "productionRuntimeClasspath": { @@ -104,27 +104,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -138,7 +138,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -273,25 +273,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -338,7 +339,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -500,25 +501,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "redis.clients:jedis": { "firstLevelTransitive": [ @@ -551,27 +552,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -585,7 +586,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -720,25 +721,26 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -785,7 +787,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -947,25 +949,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "redis.clients:jedis": { "firstLevelTransitive": [ @@ -1019,13 +1021,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1055,25 +1057,25 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" } }, "testRuntimeClasspath": { @@ -1099,27 +1101,27 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -1133,7 +1135,7 @@ "com.netflix.conductor:conductor-awssqs-event-queue", "com.netflix.conductor:conductor-es6-persistence" ], - "locked": "32.0.1-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -1268,28 +1270,29 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ - "com.netflix.conductor:conductor-grpc" + "com.netflix.conductor:conductor-grpc", + "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-testing": { - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "locked": "1.0.3" @@ -1339,7 +1342,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -1504,28 +1507,28 @@ "locked": "1.6.15" }, "org.springframework.boot:spring-boot-starter": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "redis.clients:jedis": { "firstLevelTransitive": [ diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 2dd48417dc..03a48a75a0 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.springframework.boot:spring-boot-configuration-processor": { - "locked": "2.7.3" + "locked": "2.7.16" } }, "compileClasspath": { @@ -40,16 +40,16 @@ }, "testCompileClasspath": { "com.fasterxml.jackson.core:jackson-core": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.13.3" + "locked": "2.13.5" }, "com.google.guava:guava": { - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { - "locked": "3.21.7" + "locked": "3.21.12" }, "com.netflix.conductor:conductor-cassandra-persistence": { "project": true @@ -115,7 +115,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { "locked": "6.8.12" @@ -130,25 +130,25 @@ "locked": "5.8.2" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springframework.boot:spring-boot-starter-log4j2": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { - "locked": "1.3.3" + "locked": "1.3.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.30" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" }, "redis.clients:jedis": { "locked": "3.3.0" @@ -183,39 +183,39 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.core:jackson-databind": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-client" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.fasterxml.jackson.module:jackson-module-afterburner": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common" ], - "locked": "2.13.3" + "locked": "2.13.5" }, "com.github.ben-manes.caffeine:caffeine": { "firstLevelTransitive": [ @@ -230,7 +230,7 @@ "com.netflix.conductor:conductor-es6-persistence", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "30.0-jre" + "locked": "32.1.2-jre" }, "com.google.protobuf:protobuf-java": { "firstLevelTransitive": [ @@ -239,7 +239,7 @@ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "3.21.7" + "locked": "3.21.12" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -427,27 +427,27 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.57.1" + "locked": "1.57.2" }, "io.orkes.queues:orkes-conductor-queues": { "firstLevelTransitive": [ @@ -506,7 +506,7 @@ "com.netflix.conductor:conductor-common", "com.netflix.conductor:conductor-core" ], - "locked": "2.0.5" + "locked": "2.0.6" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -640,7 +640,7 @@ "locked": "2.17.2" }, "org.codehaus.groovy:groovy-all": { - "locked": "2.5.22" + "locked": "3.0.19" }, "org.elasticsearch.client:elasticsearch-rest-client": { "firstLevelTransitive": [ @@ -664,7 +664,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.3.6" + "locked": "2.3.8" }, "org.glassfish.jersey.core:jersey-common": { "firstLevelTransitive": [ @@ -701,10 +701,10 @@ "locked": "1.7.36" }, "org.spockframework:spock-core": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.spockframework:spock-spring": { - "locked": "1.3-groovy-2.5" + "locked": "2.3-groovy-3.0" }, "org.springdoc:springdoc-openapi-ui": { "firstLevelTransitive": [ @@ -717,47 +717,47 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-actuator": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-log4j2": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-test": { - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-validation": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.boot:spring-boot-starter-web": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "2.7.3" + "locked": "2.7.16" }, "org.springframework.retry:spring-retry": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-server" ], - "locked": "1.3.3" + "locked": "1.3.4" }, "org.springframework:spring-web": { - "locked": "5.3.22" + "locked": "5.3.30" }, "org.testcontainers:elasticsearch": { - "locked": "1.15.3" + "locked": "1.18.3" }, "redis.clients:jedis": { "firstLevelTransitive": [