hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adenis...@apache.org
Subject incubator-hawq git commit: HAWQ-1545. Fix pxf-private.classpath file for Cloudera tarball distro
Date Thu, 09 Nov 2017 21:48:06 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 8d18e6b25 -> 72b719794


HAWQ-1545. Fix pxf-private.classpath file for Cloudera tarball distro


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/72b71979
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/72b71979
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/72b71979

Branch: refs/heads/master
Commit: 72b719794857658f63f6f579356fdd269822aaed
Parents: 8d18e6b
Author: lavjain <ljain@pivotal.io>
Authored: Tue Nov 7 16:22:34 2017 -0800
Committer: Alexander Denissov <adenissov@pivotal.io>
Committed: Thu Nov 9 13:46:55 2017 -0800

----------------------------------------------------------------------
 .../src/configs/templates/pxf-private-tar.classpath.template  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/72b71979/pxf/pxf-service/src/configs/templates/pxf-private-tar.classpath.template
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/configs/templates/pxf-private-tar.classpath.template b/pxf/pxf-service/src/configs/templates/pxf-private-tar.classpath.template
index b1c5df0..24c5cf2 100644
--- a/pxf/pxf-service/src/configs/templates/pxf-private-tar.classpath.template
+++ b/pxf/pxf-service/src/configs/templates/pxf-private-tar.classpath.template
@@ -57,12 +57,13 @@ HADOOP_ROOT/hadoop/share/hadoop/common/lib/protobuf-java-*[0-9].jar
 HADOOP_ROOT/hadoop/share/hadoop/common/lib/slf4j-api-*[0-9].jar
 HADOOP_ROOT/hadoop/share/hadoop/common/lib/snappy-java-*[0-9].jar
 HADOOP_ROOT/hadoop/share/hadoop/hdfs/hadoop-hdfs-*[0-9].jar
-HADOOP_ROOT/hadoop/share/hadoop/hdfs/lib/jackson-core-asl-*[0-9].jar
-HADOOP_ROOT/hadoop/share/hadoop/hdfs/lib/jackson-mapper-asl-*[0-9].jar
 HADOOP_ROOT/hadoop/share/hadoop/mapreduce/hadoop-mapreduce-client-core-*[0-9].jar
-# CDH only Library
 HADOOP_ROOT/hadoop/share/hadoop/mapreduce/hadoop-mapreduce-client-common-*[0-9].jar
 
+# Pick Jackson 1.9 jars from hdfs dir for HDP tar and from mapreduce1 for CDH tar
+HADOOP_ROOT/hadoop/share/hadoop/[hdfs|madreduce1]/lib/jackson-core-asl-1.9*[0-9].jar
+HADOOP_ROOT/hadoop/share/hadoop/[hdfs|madreduce1]/lib/jackson-mapper-asl-1.9*[0-9].jar
+
 # Hive Libraries
 HADOOP_ROOT/hive/lib/antlr-runtime*.jar
 HADOOP_ROOT/hive/lib/datanucleus-api-jdo*.jar


Mime
View raw message