From 3bc6e59fb430326fa45cfaa73c40400df283006d Mon Sep 17 00:00:00 2001
From: Laxman Ch <60599147+laxmanchekka@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:54:31 +0530
Subject: [PATCH] pinot 1.0.0-rc5 upgrade (#138)

---
 .trivyignore                        | 24 +-----------------------
 Dockerfile                          |  4 ++--
 pinot-avro-serde/build.gradle.kts   |  4 ++--
 pinot-minion-tasks/build.gradle.kts |  2 +-
 pinot-servicemanager/Dockerfile     |  2 +-
 pinot-udf/build.gradle.kts          |  2 +-
 6 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/.trivyignore b/.trivyignore
index 0acfc1e..850df52 100644
--- a/.trivyignore
+++ b/.trivyignore
@@ -1,24 +1,2 @@
-# org.yaml:snakeyaml (from upstream opensource shaded dependency. will be taken care during upgrade.)
-CVE-2022-1471 exp:2024-02-28
-
-# net.minidev:json-smart (from upstream opensource shaded dependency. will be taken care during upgrade.)
-CVE-2023-1370 exp:2024-02-28
-
 # org.apache.helix:helix-core (from upstream opensource shaded dependency. will be taken care during upgrade.)
-CVE-2023-38647 exp:2024-02-28
-
-# org.apache.avro:avro (from upstream opensource shaded dependency. will be taken care during upgrade.)
-CVE-2023-39410 exp:2024-02-28
-
-# org.apache.zookeeper:zookeeper (from upstream opensource shaded dependency. will be taken care during upgrade.)
-CVE-2023-44981 exp:2024-02-28
-
-# io.netty:netty-codec-http2 (from upstream opensource shaded dependency. will be taken care during upgrade.)
-GHSA-xpw8-rcwv-8f8p exp:2024-02-28
-
-# com.fasterxml.jackson
-CVE-2022-42003 exp:2024-02-28
-CVE-2022-42004 exp:2024-02-28
-
-# com.google.oauth-client:google-oauth-client
-CVE-2021-22573 exp:2024-02-28
\ No newline at end of file
+CVE-2023-38647 exp:2024-03-31
diff --git a/Dockerfile b/Dockerfile
index 5ba11db..065d342 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM amd64/ubuntu:jammy AS builder
 
 ARG PINOT_VERSION=1.0.0
 ARG JITPACK_REPO=hypertrace/incubator-pinot
-ARG JITPACK_TAG=hypertrace-1.0.0-rc2
+ARG JITPACK_TAG=hypertrace-1.0.0-rc5
 
 ENV PINOT_HOME=/opt/pinot
 
@@ -21,7 +21,7 @@ RUN curl -L -o $PINOT_HOME/lib/pinot-all-${JITPACK_TAG}-shaded.jar \
         https://jitpack.io/com/github/${JITPACK_REPO}/pinot-distribution/${JITPACK_TAG}/pinot-distribution-${JITPACK_TAG}-shaded.jar
 
 # Fetch plugin jars
-RUN for artifactId in pinot-kafka-2.0 pinot-kinesis pinot-thrift pinot-json pinot-csv pinot-confluent-avro pinot-avro pinot-protobuf pinot-batch-ingestion-standalone pinot-batch-ingestion-hadoop pinot-hdfs pinot-gcs pinot-s3 pinot-dropwizard; do \
+RUN for artifactId in pinot-kafka-2.0 pinot-thrift pinot-json pinot-csv pinot-confluent-avro pinot-avro pinot-protobuf pinot-batch-ingestion-standalone pinot-batch-ingestion-hadoop pinot-hdfs pinot-gcs pinot-s3 pinot-dropwizard; do \
       curl -L -o $PINOT_HOME/plugins/${artifactId}-${JITPACK_TAG}-shaded.jar \
           https://jitpack.io/com/github/${JITPACK_REPO}/${artifactId}/${JITPACK_TAG}/${artifactId}-${JITPACK_TAG}-shaded.jar; \
     done; \
diff --git a/pinot-avro-serde/build.gradle.kts b/pinot-avro-serde/build.gradle.kts
index cd8de86..83a3abd 100644
--- a/pinot-avro-serde/build.gradle.kts
+++ b/pinot-avro-serde/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-  compileOnly("org.apache.pinot:pinot-spi:0.12.0")
-  compileOnly("org.apache.pinot:pinot-avro-base:0.12.0")
+  compileOnly("org.apache.pinot:pinot-spi:1.0.0")
+  compileOnly("org.apache.pinot:pinot-avro-base:1.0.0")
   compileOnly("org.apache.kafka:kafka-streams:7.2.1-ccs")
   compileOnly("org.apache.kafka:kafka-clients:7.2.1-ccs")
   implementation("org.hypertrace.core.kafkastreams.framework:kafka-streams-serdes:0.2.4") {
diff --git a/pinot-minion-tasks/build.gradle.kts b/pinot-minion-tasks/build.gradle.kts
index d0f47a9..e9d307f 100644
--- a/pinot-minion-tasks/build.gradle.kts
+++ b/pinot-minion-tasks/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("org.apache.pinot:pinot-core:0.12.0")
+    compileOnly("org.apache.pinot:pinot-core:1.0.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
 }
diff --git a/pinot-servicemanager/Dockerfile b/pinot-servicemanager/Dockerfile
index 642bee1..2f98eac 100644
--- a/pinot-servicemanager/Dockerfile
+++ b/pinot-servicemanager/Dockerfile
@@ -5,7 +5,7 @@ FROM cimg/openjdk:14.0.2 AS install
 
 # Override to build an image from a fork. Ex. kotharironak
 ARG JITPACK_USER=hypertrace
-ARG JITPACK_TAG=hypertrace-1.0.0-rc2
+ARG JITPACK_TAG=hypertrace-1.0.0-rc5
 
 USER root
 WORKDIR /install
diff --git a/pinot-udf/build.gradle.kts b/pinot-udf/build.gradle.kts
index 3ee938b..6c7882f 100644
--- a/pinot-udf/build.gradle.kts
+++ b/pinot-udf/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
   implementation("org.hypertrace.core.attribute.service:attribute-projection-functions:0.14.18")
-  compileOnly("org.apache.pinot:pinot-common:0.12.0")
+  compileOnly("org.apache.pinot:pinot-common:1.0.0")
 
   testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
 }