chore: update dependencies, ci (#61)

Author: aaron-steinfeld

.github/workflows/pr-build.yml

@@ -9,47 +9,17 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
        # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
-      
-      - name: create checksum file
-        uses: hypertrace/github-actions/checksum@main
-
-      - name: Cache packages
-        id: cache-packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle
-          key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
-          restore-keys: |
-            gradle-packages-${{ runner.os }}-${{ github.job }}
-            gradle-packages-${{ runner.os }}
 
       - name: Build with Gradle
         uses: hypertrace/github-actions/gradle@main
         with: 
           args: build
-
-  snyk-scan:
-    runs-on: ubuntu-20.04
-    steps:
-    # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
-      - name: Check out code
-        uses: actions/[email protected]
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-          fetch-depth: 0
-      - name: Setup snyk
-        uses: snyk/actions/[email protected]
-      - name: Snyk test
-        run: snyk test --all-sub-projects --org=hypertrace --severity-threshold=low --policy-path=.snyk --configuration-matching='^runtimeClasspath$' --remote-repo-url='${{ github.server_url }}/${{ github.repository }}.git'
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/pr-test.yml

@@ -7,53 +7,46 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+      # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      
-      - name: create checksum file
-        uses: hypertrace/github-actions/checksum@main
-
-      - name: Cache packages
-        id: cache-packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle
-          key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
-          restore-keys: |
-            gradle-packages-${{ runner.os }}-${{ github.job }}
-            gradle-packages-${{ runner.os }}
 
       - name: Unit test
         uses: hypertrace/github-actions/gradle@main
-        with: 
+        with:
           args: jacocoTestReport
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           name: unit test reports
           flags: unit
 
       - name: copy test reports
         uses: hypertrace/github-actions/gradle@main
-        with: 
+        with:
           args: copyAllReports --output-dir=/tmp/test-reports
 
       - name: Archive test reports
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: test-reports
           path: /tmp/test-reports
         if: always()
-     
+
       - name: Publish Unit Test Results
-        uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1.6
+        uses: EnricoMi/publish-unit-test-result-action@v2
         if: always()
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          files: ./**/build/test-results/**/*.xml
+          files: ./**/build/test-results/**/*.xml
+
+  dependency-check:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Dependency Check
+        uses: hypertrace/github-actions/dependency-check@main

.github/workflows/publish.yml

@@ -8,26 +8,14 @@ on:
 
 jobs:
   publish-artifacts:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: create checksum file
-        uses: hypertrace/github-actions/checksum@main
-
-      - name: Cache packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle
-          key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
-          restore-keys: |
-            gradle-packages-${{ runner.os }}-${{ github.job }}
-            gradle-packages-${{ runner.os }}
-
       - name: publish java artifacts
         uses: hypertrace/github-actions/gradle@main
         with: 

build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
   id("org.hypertrace.publish-plugin") version "1.0.4" apply false
   id("org.hypertrace.jacoco-report-plugin") version "0.2.0" apply false
   id("org.hypertrace.code-style-plugin") version "1.1.2" apply false
+  id("org.owasp.dependencycheck") version "8.2.1"
 }
 
 subprojects {
@@ -27,3 +28,10 @@ subprojects {
     }
   }
 }
+
+dependencyCheck {
+  format = org.owasp.dependencycheck.reporting.ReportGenerator.Format.ALL.toString()
+  suppressionFile = "owasp-suppressions.xml"
+  scanConfigurations.add("runtimeClasspath")
+  failBuildOnCVSS = 3.0F
+}

kafka-streams-framework/build.gradle.kts

@@ -17,12 +17,12 @@ dependencies {
   api(project(":kafka-streams-serdes"))
   api("org.apache.kafka:kafka-streams:7.2.1-ccs")
   api("io.confluent:kafka-streams-avro-serde:7.2.1")
-  api("org.hypertrace.core.grpcutils:grpc-client-utils:0.11.2")
+  api("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.0")
 
   implementation("org.apache.avro:avro:1.11.1")
   implementation("org.apache.kafka:kafka-clients:7.2.1-ccs")
-  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.48")
-  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.48")
+  implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.52")
+  implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.52")
   implementation("org.apache.commons:commons-lang3:3.12.0")
 
   testCompileOnly("org.projectlombok:lombok:1.18.26")

kafka-streams-partitioners/avro-partitioners/build.gradle.kts

@@ -14,13 +14,17 @@ dependencies {
   annotationProcessor("org.projectlombok:lombok:1.18.24")
   compileOnly("org.projectlombok:lombok:1.18.24")
 
-  implementation("com.google.guava:guava:31.1-jre")
+  implementation("com.google.guava:guava:32.0.1-jre")
   implementation("org.apache.avro:avro:1.11.1")
   implementation("com.typesafe:config:1.4.2")
   implementation("org.apache.kafka:kafka-clients:7.2.1-ccs")
   implementation("org.apache.kafka:kafka-streams:7.2.1-ccs")
   implementation("org.slf4j:slf4j-api:1.7.36")
 
+  constraints {
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
+  }
+
   testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
   testImplementation("org.junit-pioneer:junit-pioneer:1.7.1")
   testImplementation("org.mockito:mockito-core:4.5.1")

kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts

@@ -15,15 +15,15 @@ dependencies {
 
   api("com.typesafe:config:1.4.2")
   api("org.apache.kafka:kafka-streams:7.2.1-ccs")
-  api("org.hypertrace.core.grpcutils:grpc-client-utils:0.11.2")
-  implementation("com.google.guava:guava:31.1-jre")
-  implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.11.2")
+  api("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.0")
+  implementation("com.google.guava:guava:32.0.1-jre")
+  implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.12.0")
   implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.46")
   implementation("org.slf4j:slf4j-api:1.7.36")
 
   testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
   testImplementation("org.junit-pioneer:junit-pioneer:1.7.1")
   testImplementation("org.mockito:mockito-core:4.5.1")
   testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
-  testRuntimeOnly("io.grpc:grpc-netty:1.45.1")
+  testRuntimeOnly("io.grpc:grpc-netty:1.56.0")
 }

kafka-streams-serdes/build.gradle.kts

@@ -15,6 +15,10 @@ dependencies {
   api("org.apache.avro:avro:1.11.1")
 
   testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
+
+  constraints {
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
+  }
 }
 
 // Disabling compatibility check for the test avro definitions.

owasp-suppressions.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress>
+        <notes><![CDATA[
+   Any hypertrace core dep
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\..*@.*$</packageUrl>
+        <cpe>cpe:/a:grpc:grpc</cpe>
+    </suppress>
+</suppressions>