chore: update dependencies (#167)

* chore: update dependencies

* chore: update kafka test utils

* fix: remove entity span enricher from default config

Author: aaron-steinfeld

.snyk

@@ -5,35 +5,35 @@ ignore:
   SNYK-JAVA-COMMONSHTTPCLIENT-30083:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-COMMONSHTTPCLIENT-31660:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-IONETTY-473694:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-LOG4J-572732:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-ORGAPACHECOMMONS-559327:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-ORGCODEHAUSJACKSON-534878:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-IONETTY-1042268:
     - '*':
         reason: no available replacement
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-ORGAPACHETHRIFT-1074898:
     - '*':
         reason: None Given
-        expires: 2021-03-31T00:00:00.000Z
+        expires: 2021-05-31T00:00:00.000Z
   SNYK-JAVA-NETMINIDEV-1078499:
     - '*':
         reason: None Given

build.gradle.kts

@@ -1,10 +1,10 @@
 plugins {
-  id("org.hypertrace.repository-plugin") version "0.2.1"
-  id("org.hypertrace.ci-utils-plugin") version "0.1.2"
-  id("org.hypertrace.docker-java-application-plugin") version "0.8.1" apply false
-  id("org.hypertrace.docker-publish-plugin") version "0.8.1" apply false
-  id("org.hypertrace.jacoco-report-plugin") version "0.1.1" apply false
-  id("org.hypertrace.publish-plugin") version "0.3.3" apply false
+  id("org.hypertrace.repository-plugin") version "0.2.3"
+  id("org.hypertrace.ci-utils-plugin") version "0.2.0"
+  id("org.hypertrace.docker-java-application-plugin") version "0.8.2" apply false
+  id("org.hypertrace.docker-publish-plugin") version "0.8.2" apply false
+  id("org.hypertrace.jacoco-report-plugin") version "0.1.3" apply false
+  id("org.hypertrace.publish-plugin") version "0.4.2" apply false
   id("org.hypertrace.avro-plugin") version "0.2.4" apply false
   id("org.hypertrace.code-style-plugin") version "1.0.2" apply false
 }

hypertrace-ingester/build.gradle.kts

@@ -25,23 +25,23 @@ hypertraceDocker {
 }
 
 dependencies {
-  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.18")
-  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.21")
-  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.21")
+  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.20")
+  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.23")
+  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.23")
   implementation("org.hypertrace.core.datamodel:data-model:0.1.14")
-  implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.1.23")
-  implementation("com.typesafe:config:1.4.0")
-  implementation("org.apache.commons:commons-lang3:3.11")
+  implementation("org.hypertrace.core.viewgenerator:view-generator-framework:0.1.25")
+  implementation("com.typesafe:config:1.4.1")
+  implementation("org.apache.commons:commons-lang3:3.12.0")
 
   implementation(project(":span-normalizer:span-normalizer"))
   implementation(project(":raw-spans-grouper:raw-spans-grouper"))
   implementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher"))
   implementation(project(":hypertrace-view-generator:hypertrace-view-generator"))
 
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
-  testImplementation("org.mockito:mockito-core:3.6.0")
-  testImplementation("org.junit-pioneer:junit-pioneer:1.0.0")
-  testImplementation("org.apache.kafka:kafka-streams-test-utils:6.0.1-ccs")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
+  testImplementation("org.mockito:mockito-core:3.8.0")
+  testImplementation("org.junit-pioneer:junit-pioneer:1.3.8")
+  testImplementation("org.apache.kafka:kafka-streams-test-utils:6.1.0-ccs")
   testImplementation(project(":hypertrace-view-generator:hypertrace-view-generator-api"))
   testImplementation(project(":span-normalizer:span-normalizer-api"))
 }

hypertrace-trace-enricher/enriched-span-constants/build.gradle.kts

@@ -9,19 +9,19 @@ plugins {
   `java-library`
   jacoco
   id("org.hypertrace.jacoco-report-plugin")
-  id("com.google.protobuf") version "0.8.13"
+  id("com.google.protobuf") version "0.8.15"
   id("org.hypertrace.publish-plugin")
 }
 
 val generateLocalGoGrpcFiles = false
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.13.0"
+    artifact = "com.google.protobuf:protoc:3.15.7"
   }
   plugins {
     id("grpc_java") {
-      artifact = "io.grpc:protoc-gen-grpc-java:1.35.0"
+      artifact = "io.grpc:protoc-gen-grpc-java:1.36.1"
     }
 
     if (generateLocalGoGrpcFiles) {
@@ -63,13 +63,13 @@ sourceSets {
 }
 
 dependencies {
-  api("com.google.protobuf:protobuf-java-util:3.13.0")
+  api("com.google.protobuf:protobuf-java-util:3.15.7")
 
   implementation("org.hypertrace.core.datamodel:data-model:0.1.14")
   implementation(project(":span-normalizer:raw-span-constants"))
   implementation(project(":span-normalizer:span-normalizer-constants"))
-  implementation("org.hypertrace.entity.service:entity-service-api:0.1.23")
+  implementation("org.hypertrace.entity.service:entity-service-api:0.6.0")
 
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
   testImplementation("org.mockito:mockito-core:3.8.0")
 }

hypertrace-trace-enricher/hypertrace-trace-enricher-api/build.gradle.kts

@@ -12,11 +12,6 @@ dependencies {
   implementation("org.hypertrace.core.datamodel:data-model:0.1.14")
 
   implementation("org.slf4j:slf4j-api:1.7.30")
-  implementation("org.apache.commons:commons-lang3:3.11")
-  constraints {
-    implementation("com.google.guava:guava:30.1-jre") {
-      because("Information Disclosure [Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415] in com.google.guava:guava@29.0-android")
-    }
-  }
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  implementation("org.apache.commons:commons-lang3:3.12.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
 }

hypertrace-trace-enricher/hypertrace-trace-enricher-impl/build.gradle.kts

@@ -17,21 +17,21 @@ dependencies {
   implementation(project(":hypertrace-trace-enricher:trace-reader"))
 
   implementation("org.hypertrace.core.datamodel:data-model:0.1.14")
-  implementation("org.hypertrace.entity.service:entity-service-client:0.1.23")
-  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.21")
+  implementation("org.hypertrace.entity.service:entity-service-client:0.6.0")
+  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.23")
   implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.4.0")
   implementation("org.hypertrace.config.service:spaces-config-service-api:0.1.0")
   implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.4.0")
 
   implementation("com.typesafe:config:1.4.1")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
-  implementation("org.apache.commons:commons-lang3:3.11")
+  implementation("org.apache.commons:commons-lang3:3.12.0")
   implementation("org.slf4j:slf4j-api:1.7.30")
   implementation("net.sf.uadetector:uadetector-resources:2014.10")
-  implementation("io.reactivex.rxjava3:rxjava:3.0.7")
+  implementation("io.reactivex.rxjava3:rxjava:3.0.11")
 
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
   testImplementation("org.mockito:mockito-core:3.8.0")
   testImplementation("org.mockito:mockito-junit-jupiter:3.8.0")
-  testImplementation("io.grpc:grpc-core:1.35.0")
+  testImplementation("io.grpc:grpc-core:1.36.1")
 }

hypertrace-trace-enricher/hypertrace-trace-enricher/build.gradle.kts

@@ -36,34 +36,31 @@ tasks.test {
 dependencies {
   implementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher-impl"))
   implementation("org.hypertrace.core.datamodel:data-model:0.1.14")
-  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.21")
-  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.21")
-  implementation("org.hypertrace.entity.service:entity-service-client:0.1.23")
+  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.23")
+  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.23")
+  implementation("org.hypertrace.entity.service:entity-service-client:0.6.0")
 
   implementation("com.typesafe:config:1.4.1")
-  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.18")
+  implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-framework:0.1.20")
   constraints {
-    implementation("com.google.guava:guava:30.1-jre") {
-      because("Information Disclosure [Medium Severity][https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415] in com.google.guava:guava@29.0-android")
-    }
-    runtimeOnly("io.netty:netty-codec-http2:4.1.60.Final") {
+    runtimeOnly("io.netty:netty-codec-http2:4.1.63.Final") {
       because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1083991")
     }
-    runtimeOnly("io.netty:netty-handler-proxy:4.1.60.Final") {
+    runtimeOnly("io.netty:netty-handler-proxy:4.1.63.Final") {
       because("https://snyk.io/vuln/SNYK-JAVA-IONETTY-1083991")
     }
   }
 
   // Required for the GRPC clients.
-  runtimeOnly("io.grpc:grpc-netty:1.35.0")
+  runtimeOnly("io.grpc:grpc-netty:1.36.1")
 
   // Logging
   implementation("org.slf4j:slf4j-api:1.7.30")
   runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1")
 
   testImplementation(project(":hypertrace-trace-enricher:hypertrace-trace-enricher"))
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
   testImplementation("org.mockito:mockito-core:3.8.0")
-  testImplementation("org.junit-pioneer:junit-pioneer:1.1.0")
-  testImplementation("org.apache.kafka:kafka-streams-test-utils:6.0.1-ccs")
+  testImplementation("org.junit-pioneer:junit-pioneer:1.3.8")
+  testImplementation("org.apache.kafka:kafka-streams-test-utils:6.1.0-ccs")
 }

hypertrace-trace-enricher/hypertrace-trace-visualizer/build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
 dependencies {
   implementation("org.hypertrace.core.datamodel:data-model:0.1.14")
 
-  implementation("org.json:json:20201115")
-  implementation("org.apache.commons:commons-lang3:3.11")
+  implementation("org.json:json:20210307")
+  implementation("org.apache.commons:commons-lang3:3.12.0")
 }
 
 description = "Trace Visualizer to help visualize a structured trace."

hypertrace-trace-enricher/trace-reader/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
   implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.4.0")
   implementation("io.reactivex.rxjava3:rxjava:3.0.11")
 
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
   testImplementation("org.mockito:mockito-core:3.8.0")
   testImplementation("org.mockito:mockito-junit-jupiter:3.8.0")
   testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1")

hypertrace-view-generator/hypertrace-view-creator/build.gradle.kts

@@ -17,15 +17,15 @@ tasks.test {
 
 dependencies {
   implementation(project(":hypertrace-view-generator:hypertrace-view-generator-api"))
-  implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.1.24")
+  implementation("org.hypertrace.core.viewcreator:view-creator-framework:0.1.25")
   constraints {
     // to have calcite libs on the same version
     implementation("org.apache.calcite:calcite-babel:1.26.0") {
       because("https://snyk.io/vuln/SNYK-JAVA-ORGAPACHECALCITE-1038296")
     }
   }
 
-  testImplementation("org.junit.jupiter:junit-jupiter:5.7.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
   testImplementation("org.mockito:mockito-core:3.8.0")
 }