From 62f3531636d91097d441bc7af6e4847513bb2548 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 10 Dec 2021 11:48:30 -0500 Subject: [PATCH 1/2] fix: update log4j --- .../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 e9175471e..71cc6f7a4 100644 --- a/hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts +++ b/hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts @@ -59,7 +59,7 @@ dependencies { // Logging implementation("org.slf4j:slf4j-api:1.7.30") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.15.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 b0ab77c7d..4bc062164 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.14.1") + testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.15.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 19ed7f4b6..c3325a574 100644 --- a/raw-spans-grouper/raw-spans-grouper/build.gradle.kts +++ b/raw-spans-grouper/raw-spans-grouper/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.14.1") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.15.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 da4c04ea6..772f90f1d 100644 --- a/span-normalizer/span-normalizer/build.gradle.kts +++ b/span-normalizer/span-normalizer/build.gradle.kts @@ -61,7 +61,7 @@ dependencies { // Logging implementation("org.slf4j:slf4j-api:1.7.30") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.15.0") testImplementation("org.junit.jupiter:junit-jupiter:5.7.1") testImplementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.26") From 0e970f34f5964807c6dd02a3c80e1c78db88439d Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 10 Dec 2021 12:05:46 -0500 Subject: [PATCH 2/2] fix: more vuln fixes --- hypertrace-ingester/build.gradle.kts | 2 +- .../hypertrace-view-creator/build.gradle.kts | 2 +- .../hypertrace-view-generator/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hypertrace-ingester/build.gradle.kts b/hypertrace-ingester/build.gradle.kts index bc507d6f6..bd314e128 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.1") + implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.7") implementation("com.typesafe:config:1.4.1") implementation("org.apache.commons:commons-lang3:3.12.0") diff --git a/hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts b/hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts index 624f469c2..b20b8a3b2 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.1") + implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.3.7") constraints { // to have calcite libs on the same version implementation("org.apache.calcite:calcite-babel:1.26.0") { diff --git a/hypertrace-view-generator/hypertrace-view-generator/build.gradle.kts b/hypertrace-view-generator/hypertrace-view-generator/build.gradle.kts index cab859176..86eefa357 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.1") + implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.3.7") implementation("org.hypertrace.core.datamodel:data-model:0.1.20") implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.26")