HAWQ-1535. PXF make install should also generate non versioned jars
diff --git a/pxf/Makefile b/pxf/Makefile
index 3ac38b1..ae50996 100644
--- a/pxf/Makefile
+++ b/pxf/Makefile
@@ -92,6 +92,11 @@
install:
./gradlew install $(BUILD_PARAMS)
+ # Create symlink for PXF jars
+ @pushd $(PXF_HOME)/lib && \
+ for X in pxf-*-[0-9]*.jar; do \
+ ln -sf $$X `echo $$X | sed -e 's/-[a-zA-Z0-9.]*.jar/.jar/'`; \
+ done && popd
bundle:
./gradlew bundle $(BUILD_PARAMS)
diff --git a/pxf/build.gradle b/pxf/build.gradle
index 6ac55b7..2c451e3 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -611,7 +611,7 @@
task install(type: Copy, dependsOn: [subprojects.build, tomcatGet]) {
into "${pxfTargetDir}"
- subprojects { subProject ->
+ subprojects { project ->
from("${project.name}/build/libs") { into 'lib' }
}
from("pxf-service/src/scripts/pxf-service") {
diff --git a/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template b/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
index d5d1910..9dd5cf5 100644
--- a/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
+++ b/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template
@@ -23,16 +23,15 @@
PXF_HOME/conf
# PXF Libraries
-PXF_HOME/lib/pxf-hbase-*[0-9].jar
-PXF_HOME/lib/pxf-hdfs-*[0-9].jar
-PXF_HOME/lib/pxf-hive-*[0-9].jar
-PXF_HOME/lib/pxf-json-*[0-9].jar
-PXF_HOME/lib/pxf-jdbc-*[0-9].jar
+PXF_HOME/lib/pxf-hbase.jar
+PXF_HOME/lib/pxf-hdfs.jar
+PXF_HOME/lib/pxf-hive.jar
+PXF_HOME/lib/pxf-json.jar
+PXF_HOME/lib/pxf-jdbc.jar
-# Hadoop/Hive/HBase configurations
+# Hadoop/Hive configurations
HADOOP_HOME/etc/hadoop
HIVE_HOME/conf
-HBASE_HOME/conf
# Hadoop Libraries
HADOOP_HOME/share/hadoop/common/hadoop-common-*[0-9].jar
@@ -70,11 +69,3 @@
HIVE_HOME/lib/hive-metastore*.jar
HIVE_HOME/lib/jdo-api*.jar
HIVE_HOME/lib/libfb303*.jar
-
-# HBase Libraries
-HBASE_HOME/lib/hbase-client*.jar
-HBASE_HOME/lib/hbase-common*.jar
-HBASE_HOME/lib/hbase-protocol*.jar
-HBASE_HOME/lib/htrace-core*.jar
-HBASE_HOME/lib/netty*.jar
-HBASE_HOME/lib/zookeeper*.jar
\ No newline at end of file
