Skip to content

Commit

Permalink
pinot 1.0.0-rc5 upgrade (#138)
Browse files Browse the repository at this point in the history
  • Loading branch information
laxmanchekka committed Jan 30, 2024
1 parent bb90a30 commit 3bc6e59
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 30 deletions.
24 changes: 1 addition & 23 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -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
CVE-2023-38647 exp:2024-03-31
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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; \
Expand Down
4 changes: 2 additions & 2 deletions pinot-avro-serde/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion pinot-minion-tasks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion pinot-servicemanager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pinot-udf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down

0 comments on commit 3bc6e59

Please sign in to comment.