diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | hdfs-packaging.patch | 2 | ||||
| -rw-r--r-- | shaded-fasterxml-jackson.patch | 46 |
4 files changed, 60 insertions, 9 deletions
@@ -1,6 +1,6 @@ pkgbase = parquet-tools pkgdesc = Java based command line tools that aid in the inspection of the Parquet files - pkgver = 1.10.1 + pkgver = 1.11.0 pkgrel = 1 url = https://github.com/apache/parquet-mr arch = any @@ -8,10 +8,12 @@ pkgbase = parquet-tools makedepends = maven makedepends = java-environment>=8 depends = java-runtime>=8 - source = https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=parquet/apache-parquet-1.10.1/apache-parquet-1.10.1.tar.gz + source = https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=parquet/apache-parquet-1.11.0/apache-parquet-1.11.0.tar.gz source = hdfs-packaging.patch - sha256sums = bf5fdcd3f1572bec105651ee9523159bf9c374dc09dbdbeea6c4907d91c48c29 - sha256sums = e6250e855909e5437d8ea8d9230aad6e1b9ad7ea5519dc17f4a94d2b7460aac8 + source = shaded-fasterxml-jackson.patch + sha256sums = bf33f08595a908ec865e664f66bb9f9ee8a0b5fd424d6a7dda52893f92545b1a + sha256sums = 6a3bf99c1b556257bb224a654e5d8bc93f10929b907d92874e97b68de49e04ea + sha256sums = 29e395981eff9b3530a9f381bbc6e0dc5480ead174cbc06f973578540ec6b452 pkgname = parquet-tools @@ -1,7 +1,7 @@ #Maintainer: Dmytro Aleksandrov <alkersan@gmail.com> pkgname=parquet-tools -pkgver=1.10.1 +pkgver=1.11.0 pkgrel=1 pkgdesc='Java based command line tools that aid in the inspection of the Parquet files' depends=('java-runtime>=8') @@ -9,16 +9,19 @@ makedepends=('maven' 'java-environment>=8') arch=('any') source=( "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=parquet/apache-parquet-${pkgver}/apache-parquet-${pkgver}.tar.gz" - "hdfs-packaging.patch") + "hdfs-packaging.patch" + "shaded-fasterxml-jackson.patch") url='https://github.com/apache/parquet-mr' license=('Apache') -sha256sums=('bf5fdcd3f1572bec105651ee9523159bf9c374dc09dbdbeea6c4907d91c48c29' - 'e6250e855909e5437d8ea8d9230aad6e1b9ad7ea5519dc17f4a94d2b7460aac8') +sha256sums=('bf33f08595a908ec865e664f66bb9f9ee8a0b5fd424d6a7dda52893f92545b1a' + '6a3bf99c1b556257bb224a654e5d8bc93f10929b907d92874e97b68de49e04ea' + '29e395981eff9b3530a9f381bbc6e0dc5480ead174cbc06f973578540ec6b452') prepare() { cd "apache-parquet-${pkgver}/parquet-tools" # Properly package HDFS service descriptors to work with files on remote filesystems patch -Np1 -i "${srcdir}/hdfs-packaging.patch" + patch -Np1 -i "${srcdir}/shaded-fasterxml-jackson.patch" } build() { diff --git a/hdfs-packaging.patch b/hdfs-packaging.patch index 108fd0af8ebd..8a79b8b1fc04 100644 --- a/hdfs-packaging.patch +++ b/hdfs-packaging.patch @@ -13,4 +13,4 @@ </execution> </executions> </plugin> - </plugins>
\ No newline at end of file + </plugins> diff --git a/shaded-fasterxml-jackson.patch b/shaded-fasterxml-jackson.patch new file mode 100644 index 000000000000..678df6fd3924 --- /dev/null +++ b/shaded-fasterxml-jackson.patch @@ -0,0 +1,46 @@ +--- a/src/main/java/org/apache/parquet/tools/json/JsonRecordFormatter.java ++++ b/src/main/java/org/apache/parquet/tools/json/JsonRecordFormatter.java +@@ -19,7 +19,7 @@ + + package org.apache.parquet.tools.json; + +-import com.fasterxml.jackson.databind.ObjectMapper; ++import shaded.parquet.com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.parquet.schema.GroupType; + import org.apache.parquet.schema.MessageType; + import org.apache.parquet.schema.Type; +--- a/src/test/java/org/apache/parquet/tools/read/TestJsonRecordFormatter.java ++++ b/src/test/java/org/apache/parquet/tools/read/TestJsonRecordFormatter.java +@@ -19,7 +19,7 @@ + + package org.apache.parquet.tools.read; + +-import com.fasterxml.jackson.databind.ObjectMapper; ++import shaded.parquet.com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.parquet.schema.GroupType; + import org.apache.parquet.schema.MessageType; + import org.apache.parquet.schema.PrimitiveType; +--- a/src/main/java/org/apache/parquet/tools/read/SimpleRecord.java ++++ b/src/main/java/org/apache/parquet/tools/read/SimpleRecord.java +@@ -26,8 +26,8 @@ + import java.util.List; + import java.util.Map; + +-import com.fasterxml.jackson.databind.ObjectMapper; +-import com.fasterxml.jackson.databind.node.BinaryNode; ++import shaded.parquet.com.fasterxml.jackson.databind.ObjectMapper; ++import shaded.parquet.com.fasterxml.jackson.databind.node.BinaryNode; + import com.google.common.base.Strings; + import com.google.common.collect.Maps; + +--- a/src/main/java/org/apache/parquet/tools/read/SimpleMapRecord.java ++++ b/src/main/java/org/apache/parquet/tools/read/SimpleMapRecord.java +@@ -18,7 +18,7 @@ + */ + package org.apache.parquet.tools.read; + +-import com.fasterxml.jackson.databind.node.BinaryNode; ++import shaded.parquet.com.fasterxml.jackson.databind.node.BinaryNode; + import com.google.common.collect.Maps; + + import java.util.Arrays; |