diff --git a/pom.xml b/pom.xml index 81c35865..dd9ce972 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,8 @@ 4.13.2 1.8.5 4.1.4 + + 3.21.12 2.10.0 3.2.4 ${hadoop-three.version} @@ -156,8 +158,6 @@ 3.0.0 1.5.1 0.14.0 - - 2.5.0 0.5.0 2.18.0 1.11.4 @@ -179,11 +179,6 @@ - - com.google.protobuf - protobuf-java - ${external.protobuf.version} - org.apache.commons commons-lang3 diff --git a/spark/hbase-spark-protocol/pom.xml b/spark/hbase-spark-protocol/pom.xml index 20e752c7..da946925 100644 --- a/spark/hbase-spark-protocol/pom.xml +++ b/spark/hbase-spark-protocol/pom.xml @@ -36,6 +36,7 @@ com.google.protobuf protobuf-java + ${thirdparty.protobuf.version} diff --git a/spark/pom.xml b/spark/pom.xml index 3f1eb21c..b770e6b9 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -84,7 +84,7 @@ protobuf-maven-plugin ${protobuf.plugin.version} - com.google.protobuf:protoc:${external.protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${thirdparty.protobuf.version}:exe:${os.detected.classifier} ${basedir}/src/main/protobuf/ false true