diff --git a/Dockerfile b/Dockerfile index 699abf55..17efe642 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,41 +1,41 @@ -FROM --platform=linux/x86_64 maven:3.6.0-jdk-11-slim AS build-core +FROM --platform=linux/x86_64 maven:3.9.4-eclipse-temurin-11-focal AS build-core COPY . /app RUN mvn clean install -DskipTests -f /app/framework/pom.xml RUN mvn clean install -DskipTests -f /app/dataset-registry/pom.xml -FROM --platform=linux/x86_64 maven:3.6.0-jdk-11-slim AS build-pipeline +FROM --platform=linux/x86_64 maven:3.9.4-eclipse-temurin-11-focal AS build-pipeline COPY --from=build-core /root/.m2 /root/.m2 COPY . /app RUN mvn clean package -DskipTests -f /app/pipeline/pom.xml -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as extractor-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as extractor-image USER flink COPY --from=build-pipeline /app/pipeline/extractor/target/extractor-1.0.0.jar $FLINK_HOME/lib/ -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as preprocessor-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as preprocessor-image USER flink COPY --from=build-pipeline /app/pipeline/preprocessor/target/preprocessor-1.0.0.jar $FLINK_HOME/lib/ -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as denormalizer-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as denormalizer-image USER flink COPY --from=build-pipeline /app/pipeline/denormalizer/target/denormalizer-1.0.0.jar $FLINK_HOME/lib/ -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as transformer-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as transformer-image USER flink COPY --from=build-pipeline /app/pipeline/transformer/target/transformer-1.0.0.jar $FLINK_HOME/lib/ -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as router-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as router-image USER flink COPY --from=build-pipeline /app/pipeline/druid-router/target/druid-router-1.0.0.jar $FLINK_HOME/lib/ -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as merged-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as merged-image USER flink COPY --from=build-pipeline /app/pipeline/pipeline-merged/target/pipeline-merged-1.0.0.jar $FLINK_HOME/lib/ -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as master-data-processor-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as master-data-processor-image USER flink COPY --from=build-pipeline /app/pipeline/master-data-processor/target/master-data-processor-1.0.0.jar $FLINK_HOME/lib -FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-java11-1.0.1 as kafka-connector-image +FROM --platform=linux/x86_64 sanketikahub/flink:1.15.2-scala_2.12-jdk-11 as kafka-connector-image USER flink -COPY --from=build-pipeline /app/pipeline/kafka-connector/target/kafka-connector-1.0.0.jar $FLINK_HOME/lib \ No newline at end of file +COPY --from=build-pipeline /app/pipeline/kafka-connector/target/kafka-connector-1.0.0.jar $FLINK_HOME/lib diff --git a/data-products/pom.xml b/data-products/pom.xml index fa15ad3c..e79564e5 100644 --- a/data-products/pom.xml +++ b/data-products/pom.xml @@ -228,4 +228,4 @@ - \ No newline at end of file + diff --git a/dataset-registry/pom.xml b/dataset-registry/pom.xml index 56107c1e..e3950291 100644 --- a/dataset-registry/pom.xml +++ b/dataset-registry/pom.xml @@ -36,7 +36,7 @@ com.google.code.gson gson - 2.4 + 2.8.9 com.typesafe @@ -178,4 +178,4 @@ - \ No newline at end of file + diff --git a/framework/pom.xml b/framework/pom.xml index cd411347..31402224 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -25,7 +25,6 @@ org.apache.flink flink-streaming-scala_${scala.maj.version} ${flink.version} - provided org.apache.flink @@ -51,17 +50,17 @@ com.google.code.gson gson - 2.4 + 2.8.9 com.fasterxml.jackson.core jackson-databind - 2.12.7 + 2.15.2 com.fasterxml.jackson.module jackson-module-scala_${scala.maj.version} - 2.12.7 + 2.15.2 com.fasterxml.jackson.core @@ -74,11 +73,6 @@ jedis 2.9.0 - - com.datastax.cassandra - cassandra-driver-core - 3.7.0 - com.typesafe config @@ -249,4 +243,4 @@ - \ No newline at end of file + diff --git a/pipeline/druid-router/pom.xml b/pipeline/druid-router/pom.xml index 9ff38aff..4945f84d 100644 --- a/pipeline/druid-router/pom.xml +++ b/pipeline/druid-router/pom.xml @@ -65,9 +65,17 @@ com.fasterxml.jackson.core jackson-databind + + com.google.guava + guava + - + + com.google.guava + guava + 32.1.2-jre + org.apache.flink flink-test-utils diff --git a/pipeline/extractor/pom.xml b/pipeline/extractor/pom.xml index 206df3cf..b73d697d 100644 --- a/pipeline/extractor/pom.xml +++ b/pipeline/extractor/pom.xml @@ -72,6 +72,17 @@ embedded-redis 0.7.1 test + + + com.google.guava + guava + + + + + com.google.guava + guava + 32.1.2-jre org.apache.flink @@ -225,4 +236,4 @@ - \ No newline at end of file + diff --git a/pipeline/kafka-connector/pom.xml b/pipeline/kafka-connector/pom.xml index f665fc22..bdf2fe8f 100644 --- a/pipeline/kafka-connector/pom.xml +++ b/pipeline/kafka-connector/pom.xml @@ -50,7 +50,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.12.7 + 2.15.2 org.sunbird.obsrv @@ -229,4 +229,4 @@ - \ No newline at end of file + diff --git a/pipeline/master-data-processor/pom.xml b/pipeline/master-data-processor/pom.xml index 38f1b504..52783714 100644 --- a/pipeline/master-data-processor/pom.xml +++ b/pipeline/master-data-processor/pom.xml @@ -73,8 +73,17 @@ com.fasterxml.jackson.core jackson-databind + + com.google.guava + guava + + + com.google.guava + guava + 32.1.2-jre + org.json4s json4s-native_${scala.maj.version} diff --git a/pipeline/pipeline-merged/pom.xml b/pipeline/pipeline-merged/pom.xml index 5aa273ea..e19bc800 100644 --- a/pipeline/pipeline-merged/pom.xml +++ b/pipeline/pipeline-merged/pom.xml @@ -83,9 +83,17 @@ com.fasterxml.jackson.core jackson-databind + + com.google.guava + guava + - + + com.google.guava + guava + 32.1.2-jre + org.apache.kafka kafka-clients diff --git a/pipeline/preprocessor/pom.xml b/pipeline/preprocessor/pom.xml index 63e3334b..96171103 100644 --- a/pipeline/preprocessor/pom.xml +++ b/pipeline/preprocessor/pom.xml @@ -53,8 +53,17 @@ com.fasterxml.jackson.core jackson-databind + + com.google.guava + guava + + + com.google.guava + guava + 32.1.2-jre + org.apache.commons commons-lang3