diff --git a/hudi-cli/pom.xml b/hudi-cli/pom.xml
index 67e31c34de0fe..f6f11433af6de 100644
--- a/hudi-cli/pom.xml
+++ b/hudi-cli/pom.xml
@@ -153,6 +153,7 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
+      <version>${scala.version}</version>
     </dependency>
 
     <dependency>
diff --git a/hudi-client/hudi-spark-client/pom.xml b/hudi-client/hudi-spark-client/pom.xml
index cf3b075636ae3..de51e4480761c 100644
--- a/hudi-client/hudi-spark-client/pom.xml
+++ b/hudi-client/hudi-spark-client/pom.xml
@@ -34,6 +34,7 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
+      <version>${scala.version}</version>
     </dependency>
 
     <dependency>
diff --git a/hudi-examples/hudi-examples-spark/pom.xml b/hudi-examples/hudi-examples-spark/pom.xml
index 41a1091a621b8..50fda6f7e5723 100644
--- a/hudi-examples/hudi-examples-spark/pom.xml
+++ b/hudi-examples/hudi-examples-spark/pom.xml
@@ -112,6 +112,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
+            <version>${scala.version}</version>
         </dependency>
 
         <dependency>
diff --git a/hudi-flink-datasource/hudi-flink/pom.xml b/hudi-flink-datasource/hudi-flink/pom.xml
index 2d2b6966b9008..a3ab958bf782e 100644
--- a/hudi-flink-datasource/hudi-flink/pom.xml
+++ b/hudi-flink-datasource/hudi-flink/pom.xml
@@ -230,7 +230,8 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>${avro.version}</version>
+            <!-- Override the version to be same with Flink avro -->
+            <version>1.10.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/hudi-spark-datasource/hudi-spark-common/pom.xml b/hudi-spark-datasource/hudi-spark-common/pom.xml
index e3c221fa36f5a..81c0ba6f73f52 100644
--- a/hudi-spark-datasource/hudi-spark-common/pom.xml
+++ b/hudi-spark-datasource/hudi-spark-common/pom.xml
@@ -146,6 +146,7 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
+      <version>${scala.version}</version>
     </dependency>
 
     <dependency>
diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml
index 88d5cd1c1ffad..de0478ff06910 100644
--- a/packaging/hudi-flink-bundle/pom.xml
+++ b/packaging/hudi-flink-bundle/pom.xml
@@ -501,7 +501,8 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>${avro.version}</version>
+      <!-- Override the version to be same with Flink avro -->
+      <version>1.10.0</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index f3fbd467cdbab..91829edb249e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -628,12 +628,6 @@
   <dependencyManagement>
     <dependencies>
       <!-- Scala -->
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>${scala.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.scala-lang.modules</groupId>
         <artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
@@ -2144,13 +2138,8 @@
       </activation>
     </profile>
 
-    <!-- Flink profiles -->
-    <!-- NOTE: Building with both Spark and Flink profiles is not recommended due to avro version conflict-->
     <profile>
       <id>flink1.15</id>
-      <properties>
-        <avro.version>1.10.0</avro.version>
-      </properties>
       <activation>
         <property>
           <name>flink1.15</name>
@@ -2172,7 +2161,6 @@
         <flink.clients.artifactId>flink-clients_${scala.binary.version}</flink.clients.artifactId>
         <flink.connector.kafka.artifactId>flink-connector-kafka_${scala.binary.version}</flink.connector.kafka.artifactId>
         <flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
-        <avro.version>1.10.0</avro.version>
       </properties>
       <activation>
         <property>
@@ -2196,7 +2184,6 @@
         <flink.clients.artifactId>flink-clients_${scala.binary.version}</flink.clients.artifactId>
         <flink.connector.kafka.artifactId>flink-connector-kafka_${scala.binary.version}</flink.connector.kafka.artifactId>
         <flink.hadoop.compatibility.artifactId>flink-hadoop-compatibility_${scala.binary.version}</flink.hadoop.compatibility.artifactId>
-        <avro.version>1.10.0</avro.version>
         <skipITs>true</skipITs>
       </properties>
       <activation>