From 2591365918350b0bb6a6c87ea7a57a0609f21565 Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Sat, 18 Dec 2021 15:31:44 +0530 Subject: [PATCH 1/3] upgrade log4j version to 2.17.0 --- .../hypertrace-trace-enricher/build.gradle.kts | 2 +- hypertrace-trace-enricher/trace-reader/build.gradle.kts | 2 +- raw-spans-grouper/raw-spans-grouper/build.gradle.kts | 2 +- span-normalizer/span-normalizer/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts b/hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts index d5beaf1d2..ecb195eb6 100644 --- a/hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts +++ b/hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { // Logging implementation("org.slf4j:slf4j-api:1.7.30") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.16.0") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0") testImplementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher")) testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") diff --git a/hypertrace-trace-enricher/trace-reader/build.gradle.kts b/hypertrace-trace-enricher/trace-reader/build.gradle.kts index e01b8c9b8..256f0d399 100644 --- a/hypertrace-trace-enricher/trace-reader/build.gradle.kts +++ b/hypertrace-trace-enricher/trace-reader/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") testImplementation("org.mockito:mockito-inline:3.8.0") testImplementation("org.mockito:mockito-junit-jupiter:3.8.0") - testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.16.0") + testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0") tasks.test { useJUnitPlatform() diff --git a/raw-spans-grouper/raw-spans-grouper/build.gradle.kts b/raw-spans-grouper/raw-spans-grouper/build.gradle.kts index f3a4d2321..dc1435027 100644 --- a/raw-spans-grouper/raw-spans-grouper/build.gradle.kts +++ b/raw-spans-grouper/raw-spans-grouper/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { // Logging implementation("org.slf4j:slf4j-api:1.7.30") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.16.0") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0") testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") testImplementation("org.mockito:mockito-core:3.8.0") diff --git a/span-normalizer/span-normalizer/build.gradle.kts b/span-normalizer/span-normalizer/build.gradle.kts index 7d7dc0f30..d3a4f1512 100644 --- a/span-normalizer/span-normalizer/build.gradle.kts +++ b/span-normalizer/span-normalizer/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { // Logging implementation("org.slf4j:slf4j-api:1.7.30") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.16.0") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0") testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") testImplementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.26") From 1cd43377190a2bce5a7a2a3d020f170516129dc9 Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Sun, 19 Dec 2021 17:05:23 +0530 Subject: [PATCH 2/3] upgrade log4j version to 2.17.0 --- hypertrace-ingester/build.gradle.kts | 2 +- .../hypertrace-view-generator/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hypertrace-ingester/build.gradle.kts b/hypertrace-ingester/build.gradle.kts index 8d3d7ee88..e9968c9e9 100644 --- a/hypertrace-ingester/build.gradle.kts +++ b/hypertrace-ingester/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.30") implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.30") implementation("org.hypertrace.core.datamodel:data-model:0.1.20") - implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.8") + implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.9") implementation("com.typesafe:config:1.4.1") implementation("org.apache.commons:commons-lang3:3.12.0") diff --git a/hypertrace-view-generator/hypertrace-view-generator/build.gradle.kts b/hypertrace-view-generator/hypertrace-view-generator/build.gradle.kts index cbca4f7cf..0bd7ae2c5 100644 --- a/hypertrace-view-generator/hypertrace-view-generator/build.gradle.kts +++ b/hypertrace-view-generator/hypertrace-view-generator/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { implementation(project(":semantic-convention-utils")) // TODO: migrate in core - implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.8") + implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.9") implementation("org.hypertrace.core.datamodel:data-model:0.1.20") implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.26") From e3b4dd7dc68c35337ea9eb44edab163212375e3a Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Sun, 19 Dec 2021 18:21:54 +0530 Subject: [PATCH 3/3] update view-creator-framework version --- .../hypertrace-view-creator/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts b/hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts index e8ff487b4..675b4e017 100644 --- a/hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts +++ b/hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts @@ -17,7 +17,7 @@ tasks.test { dependencies { implementation(project(":hypertrace-view-generator:hypertrace-view-generator-api")) - implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.3.8") + implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.3.9") constraints { // to have calcite libs on the same version implementation("org.apache.calcite:calcite-babel:1.26.0") {