parquet 1.10 update; fixed HDFS service descriptors packaging

4 files changed, 42 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c9f2c6b3dec..4ae621902471 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
-# Generated by mksrcinfo v8
-# Tue Sep  5 21:09:39 UTC 2017
 pkgbase = parquet-tools
 	pkgdesc = Java based command line tools that aid in the inspection of the Parquet files
-	pkgver = 1.9.0
+	pkgver = 1.10.0
 	pkgrel = 1
 	url = https://github.com/apache/parquet-mr
 	arch = any
 	license = Apache
 	makedepends = maven
-	makedepends = java-environment>=7
-	depends = java-runtime>=7
-	source = git+https://github.com/apache/parquet-mr.git#tag=apache-parquet-1.9.0
-	sha256sums = SKIP
+	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.0/apache-parquet-1.10.0.tar.gz
+	source = hdfs-packaging.patch
+	sha256sums = 2971e6847874a5b1f45ed1413be15117595649e30895df9650645999a2032790
+	sha256sums = e6250e855909e5437d8ea8d9230aad6e1b9ad7ea5519dc17f4a94d2b7460aac8
 
 pkgname = parquet-tools
 
diff --git a/.gitignore b/.gitignore
index 75bd249681c9..dcb1af397301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
+!*.patch
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 06e6b2d44fa7..673946bc5afe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,33 @@
 #Maintainer: Dmytro Aleksandrov <alkersan@gmail.com>
 
 pkgname=parquet-tools
-pkgver=1.9.0
+pkgver=1.10.0
 pkgrel=1
 pkgdesc='Java based command line tools that aid in the inspection of the Parquet files'
-depends=('java-runtime>=7')
-makedepends=('maven' 'java-environment>=7')
+depends=('java-runtime>=8')
+makedepends=('maven' 'java-environment>=8')
 arch=('any')
-source=("git+https://github.com/apache/parquet-mr.git#tag=apache-parquet-${pkgver}")
+source=(
+  "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=parquet/apache-parquet-${pkgver}/apache-parquet-${pkgver}.tar.gz"
+  "hdfs-packaging.patch")
 url='https://github.com/apache/parquet-mr'
 license=('Apache')
-sha256sums=('SKIP')
+sha256sums=('2971e6847874a5b1f45ed1413be15117595649e30895df9650645999a2032790'
+            'e6250e855909e5437d8ea8d9230aad6e1b9ad7ea5519dc17f4a94d2b7460aac8')
+
+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"
+}
 
 build() {
-  cd "${srcdir}/parquet-mr/parquet-tools"
-  mvn --batch-mode clean package -Plocal
+  cd "apache-parquet-${pkgver}/parquet-tools"
+  mvn --batch-mode -Dmaven.repo.local="${srcdir}/.m2" clean package -Plocal
 }
 
 package() {
-  cd "${srcdir}/parquet-mr/parquet-tools"
+  cd "apache-parquet-${pkgver}/parquet-tools"
 
   install -m 755 -d "${pkgdir}/usr/share/java/parquet-tools"
   install -m 755 -t "${pkgdir}/usr/share/java/parquet-tools" src/main/scripts/*
@@ -27,7 +36,7 @@ package() {
   install -m 644 -t "${pkgdir}/usr/share/java/parquet-tools/lib" "target/parquet-tools-${pkgver}.jar"
 
   install -m 755 -d "${pkgdir}/usr/bin"
-  for tool in cat dump head merge meta schema; do
+  for tool in cat dump head merge meta rowcount schema size; do
     sed -i 's/dirname \"\$0\"/dirname \$\(readlink -f \"\$0\"\)/g' "${pkgdir}/usr/share/java/parquet-tools/parquet-${tool}"
     ln -s "/usr/share/java/parquet-tools/parquet-${tool}" "${pkgdir}/usr/bin/parquet-${tool}"
   done
diff --git a/hdfs-packaging.patch b/hdfs-packaging.patch
new file mode 100644
index 000000000000..108fd0af8ebd
--- /dev/null
+++ b/hdfs-packaging.patch
@@ -0,0 +1,16 @@
+--- a/pom.xml	2018-07-23 09:54:45.667127177 +0300
++++ b/pom.xml	2018-07-23 09:54:41.547181643 +0300
+@@ -123,10 +123,13 @@
+               <artifactSet>
+                 <includes>
+                   <include>*</include>
+                 </includes>
+               </artifactSet>
++              <transformers>
++                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
++              </transformers>
+             </configuration>
+           </execution>
+         </executions>
+       </plugin>
+     </plugins>
\ No newline at end of file