Skip to content

Commit 906aaea

Browse files
senthhpan3793shubhluck
committed
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 a9048c1 commit 906aaea

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ commons-dbcp2/2.9.0//commons-dbcp2-2.9.0.jar
4646
commons-digester/1.8//commons-digester-1.8.jar
4747
commons-httpclient/3.1//commons-httpclient-3.1.jar
4848
commons-io/2.4//commons-io-2.4.jar
49+
commons-lang/2.6//commons-lang-2.6.jar
4950
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
5051
commons-logging/1.1.3//commons-logging-1.1.3.jar
5152
commons-math3/3.6.1//commons-math3-3.6.1.jar
@@ -235,8 +236,7 @@ parquet-encoding/1.12.3//parquet-encoding-1.12.3.jar
235236
parquet-format-structures/1.12.3//parquet-format-structures-1.12.3.jar
236237
parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar
237238
parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar
238-
pickle/1.2//pickle-1.2.jar
239-
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
239+
pickle/1.3//pickle-1.3.jar
240240
py4j/0.10.9.7//py4j-0.10.9.7.jar
241241
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
242242
rocksdbjni/7.6.0//rocksdbjni-7.6.0.jar

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ parquet-encoding/1.12.3//parquet-encoding-1.12.3.jar
224224
parquet-format-structures/1.12.3//parquet-format-structures-1.12.3.jar
225225
parquet-hadoop/1.12.3//parquet-hadoop-1.12.3.jar
226226
parquet-jackson/1.12.3//parquet-jackson-1.12.3.jar
227-
pickle/1.2//pickle-1.2.jar
228-
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
227+
pickle/1.3//pickle-1.3.jar
229228
py4j/0.10.9.7//py4j-0.10.9.7.jar
230229
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
231230
rocksdbjni/7.6.0//rocksdbjni-7.6.0.jar

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,13 @@
849849
<groupId>com.google.protobuf</groupId>
850850
<artifactId>protobuf-java</artifactId>
851851
<version>${protobuf.version}</version>
852-
<scope>${hadoop.deps.scope}</scope>
852+
<scope>provided</scope>
853+
</dependency>
854+
<dependency>
855+
<groupId>com.google.protobuf</groupId>
856+
<artifactId>protobuf-java-util</artifactId>
857+
<version>${protobuf.version}</version>
858+
<scope>provided</scope>
853859
</dependency>
854860
<dependency>
855861
<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)