#0 fix: upgrade packages

Sanketika-Obsrv · Oct 10, 2023 · 0d8c6df · 0d8c6df
1 parent 23aa3c7
commit 0d8c6df
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 29 deletions.
diff --git 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
+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
@@ -228,4 +228,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/dataset-registry/pom.xml b/dataset-registry/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.4</version>
+            <version>2.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe</groupId>
@@ -178,4 +178,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/framework/pom.xml b/framework/pom.xml
@@ -25,7 +25,6 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-streaming-scala_${scala.maj.version}</artifactId>
             <version>${flink.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
@@ -51,17 +50,17 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.4</version>
+            <version>2.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.7</version>
+            <version>2.15.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-scala_${scala.maj.version}</artifactId>
-            <version>2.12.7</version>
+            <version>2.15.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
@@ -74,11 +73,6 @@
             <artifactId>jedis</artifactId>
             <version>2.9.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-core</artifactId>
-            <version>3.7.0</version>
-        </dependency>
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
@@ -249,4 +243,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/pipeline/druid-router/pom.xml b/pipeline/druid-router/pom.xml
@@ -65,9 +65,17 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-test-utils</artifactId>

diff --git a/pipeline/extractor/pom.xml b/pipeline/extractor/pom.xml
@@ -72,6 +72,17 @@
             <artifactId>embedded-redis</artifactId>
             <version>0.7.1</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
@@ -225,4 +236,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/pipeline/kafka-connector/pom.xml b/pipeline/kafka-connector/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.12.7</version>
+            <version>2.15.2</version>
         </dependency>
         <dependency>
             <groupId>org.sunbird.obsrv</groupId>
@@ -229,4 +229,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/pipeline/master-data-processor/pom.xml b/pipeline/master-data-processor/pom.xml
@@ -73,8 +73,17 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
+        </dependency>
         <dependency>
             <groupId>org.json4s</groupId>
             <artifactId>json4s-native_${scala.maj.version}</artifactId>

diff --git a/pipeline/pipeline-merged/pom.xml b/pipeline/pipeline-merged/pom.xml
@@ -83,9 +83,17 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>

diff --git a/pipeline/preprocessor/pom.xml b/pipeline/preprocessor/pom.xml
@@ -53,8 +53,17 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>