Skip to content

Commit 29bb1ea

Browse files
senthhpan3793shubhluck
authored
ODP-2151 Remove protobuf-java 2.5.0 (#23)
* ODP-2149 Remove protobuf-java 2.5.0 * ODP-2151 Remove protobuf-java 2.5.0 --------- Co-authored-by: Cheng Pan <[email protected]> Co-authored-by: Shubham Sharma <[email protected]>
1 parent ecc7b4b commit 29bb1ea

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

dev/deps/spark-deps-hadoop-2-hive-2.3

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ parquet-format-structures/1.12.3//parquet-format-structures-1.12.3.jar
236236
parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar
237237
parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar
238238
pickle/1.3//pickle-1.3.jar
239-
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
240239
py4j/0.10.9.7//py4j-0.10.9.7.jar
241240
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
242241
rocksdbjni/7.8.3//rocksdbjni-7.8.3.jar

dev/deps/spark-deps-hadoop-3-hive-2.3

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ parquet-format-structures/1.12.3//parquet-format-structures-1.12.3.jar
223223
parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar
224224
parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar
225225
pickle/1.3//pickle-1.3.jar
226-
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
227226
py4j/0.10.9.7//py4j-0.10.9.7.jar
228227
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
229228
rocksdbjni/7.8.3//rocksdbjni-7.8.3.jar

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,13 @@
840840
<groupId>com.google.protobuf</groupId>
841841
<artifactId>protobuf-java</artifactId>
842842
<version>${protobuf.version}</version>
843-
<scope>${hadoop.deps.scope}</scope>
843+
<scope>provided</scope>
844+
</dependency>
845+
<dependency>
846+
<groupId>com.google.protobuf</groupId>
847+
<artifactId>protobuf-java-util</artifactId>
848+
<version>${protobuf.version}</version>
849+
<scope>provided</scope>
844850
</dependency>
845851
<dependency>
846852
<groupId>org.roaringbitmap</groupId>

sql/hive/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,6 @@
8585
<artifactId>scala-parallel-collections_${scala.binary.version}</artifactId>
8686
</dependency>
8787
--><!-- #endif scala-2.13 -->
88-
<!--
89-
<dependency>
90-
<groupId>com.google.guava</groupId>
91-
<artifactId>guava</artifactId>
92-
</dependency>
93-
<dependency>
94-
<groupId>com.google.protobuf</groupId>
95-
<artifactId>protobuf-java</artifactId>
96-
<version>${protobuf.version}</version>
97-
</dependency>
98-
-->
9988
<dependency>
10089
<groupId>${hive.group}</groupId>
10190
<artifactId>hive-common</artifactId>

0 commit comments

Comments
 (0)