Skip to content

Commit 799364e

Browse files
committed
Upgrade Parquet to 1.12.0
1 parent 4a3200b commit 799364e

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ orc-shims/1.6.7//orc-shims-1.6.7.jar
203203
oro/2.0.8//oro-2.0.8.jar
204204
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
205205
paranamer/2.8//paranamer-2.8.jar
206-
parquet-column/1.11.1//parquet-column-1.11.1.jar
207-
parquet-common/1.11.1//parquet-common-1.11.1.jar
208-
parquet-encoding/1.11.1//parquet-encoding-1.11.1.jar
209-
parquet-format-structures/1.11.1//parquet-format-structures-1.11.1.jar
210-
parquet-hadoop/1.11.1//parquet-hadoop-1.11.1.jar
211-
parquet-jackson/1.11.1//parquet-jackson-1.11.1.jar
206+
parquet-column/1.12.0//parquet-column-1.12.0.jar
207+
parquet-common/1.12.0//parquet-common-1.12.0.jar
208+
parquet-encoding/1.12.0//parquet-encoding-1.12.0.jar
209+
parquet-format-structures/1.12.0//parquet-format-structures-1.12.0.jar
210+
parquet-hadoop/1.12.0//parquet-hadoop-1.12.0.jar
211+
parquet-jackson/1.12.0//parquet-jackson-1.12.0.jar
212212
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
213213
py4j/0.10.9.1//py4j-0.10.9.1.jar
214214
pyrolite/4.30//pyrolite-4.30.jar

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ orc-shims/1.6.7//orc-shims-1.6.7.jar
173173
oro/2.0.8//oro-2.0.8.jar
174174
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
175175
paranamer/2.8//paranamer-2.8.jar
176-
parquet-column/1.11.1//parquet-column-1.11.1.jar
177-
parquet-common/1.11.1//parquet-common-1.11.1.jar
178-
parquet-encoding/1.11.1//parquet-encoding-1.11.1.jar
179-
parquet-format-structures/1.11.1//parquet-format-structures-1.11.1.jar
180-
parquet-hadoop/1.11.1//parquet-hadoop-1.11.1.jar
181-
parquet-jackson/1.11.1//parquet-jackson-1.11.1.jar
176+
parquet-column/1.12.0//parquet-column-1.12.0.jar
177+
parquet-common/1.12.0//parquet-common-1.12.0.jar
178+
parquet-encoding/1.12.0//parquet-encoding-1.12.0.jar
179+
parquet-format-structures/1.12.0//parquet-format-structures-1.12.0.jar
180+
parquet-hadoop/1.12.0//parquet-hadoop-1.12.0.jar
181+
parquet-jackson/1.12.0//parquet-jackson-1.12.0.jar
182182
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
183183
py4j/0.10.9.1//py4j-0.10.9.1.jar
184184
pyrolite/4.30//pyrolite-4.30.jar

pom.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<kafka.version>2.6.0</kafka.version>
137137
<!-- After 10.15.1.3, the minimum required version is JDK9 -->
138138
<derby.version>10.14.2.0</derby.version>
139-
<parquet.version>1.11.1</parquet.version>
139+
<parquet.version>1.12.0</parquet.version>
140140
<orc.version>1.6.7</orc.version>
141141
<jetty.version>9.4.36.v20210114</jetty.version>
142142
<jakartaservlet.version>4.0.3</jakartaservlet.version>
@@ -291,6 +291,17 @@
291291
<enabled>false</enabled>
292292
</snapshots>
293293
</repository>
294+
<repository>
295+
<id>staging</id>
296+
<name>apache-staging-releases</name>
297+
<url>https://repository.apache.org/content/repositories/staging/</url>
298+
<releases>
299+
<enabled>true</enabled>
300+
</releases>
301+
<snapshots>
302+
<enabled>true</enabled>
303+
</snapshots>
304+
</repository>
294305
</repositories>
295306
<pluginRepositories>
296307
<pluginRepository>
@@ -2061,7 +2072,7 @@
20612072
<groupId>${hive.group}</groupId>
20622073
<artifactId>hive-service-rpc</artifactId>
20632074
</exclusion>
2064-
<!-- parquet-hadoop-bundle:1.8.1 conflict with 1.10.1 -->
2075+
<!-- parquet-hadoop-bundle:1.8.1 conflict with 1.12.0 -->
20652076
<exclusion>
20662077
<groupId>org.apache.parquet</groupId>
20672078
<artifactId>parquet-hadoop-bundle</artifactId>

project/SparkBuild.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,9 @@ object SparkBuild extends PomBuild {
271271
DefaultMavenRepository,
272272
Resolver.mavenLocal,
273273
Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
274+
) ++ Seq(
275+
"apache-staging-releases" at "https://repository.apache.org/content/repositories/staging/",
276+
Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
274277
),
275278
externalResolvers := resolvers.value,
276279
otherResolvers := SbtPomKeys.mvnLocalRepository(dotM2 => Seq(Resolver.file("dotM2", dotM2))).value,

0 commit comments

Comments
 (0)