ATLAS-4241: fix import-hbase errors
(cherry picked from commit da27bb1b497db7f234c66203255a3ded37af3631)
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index 20063e8..ca598ab 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -345,6 +345,16 @@
<version>${kafka.version}</version>
</artifactItem>
<artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ </artifactItem>
+ <artifactItem>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<version>${jersey.version}</version>
@@ -365,6 +375,16 @@
<version>${jackson.version}</version>
</artifactItem>
<artifactItem>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson.version}</version>
+ </artifactItem>
+ <artifactItem>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${commons-conf.version}</version>
@@ -375,6 +395,11 @@
<version>${jersey.version}</version>
</artifactItem>
<artifactItem>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ <version>${jersey.version}</version>
+ </artifactItem>
+ <artifactItem>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jsr.version}</version>
diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh b/addons/hbase-bridge/src/bin/import-hbase.sh
index a343036..8ae7350 100644
--- a/addons/hbase-bridge/src/bin/import-hbase.sh
+++ b/addons/hbase-bridge/src/bin/import-hbase.sh
@@ -97,8 +97,14 @@
HBASE_CP="${HBASE_CONF}"
-for i in "${HBASE_HOME}/lib/"*.jar; do
- HBASE_CP="${HBASE_CP}:$i"
+# Multiple jars in HBASE_CP_EXCLUDE_LIST can be added using "\|" separator
+# Ex: HBASE_CP_EXCLUDE_LIST="commons-configuration-1."
+HBASE_CP_EXCLUDE_LIST="commons-configuration-1\|jersey-client"
+
+for i in "${HBASE_HOME}/lib/"*.jar "${HBASE_HOME}/lib/client-facing-thirdparty/"*.jar; do
+ if [ "`echo $i | grep -v \"$HBASE_CP_EXCLUDE_LIST\"`" == "$i" ]; then
+ HBASE_CP="${HBASE_CP}:$i"
+ fi
done
#Add hadoop conf in classpath
@@ -110,11 +116,14 @@
HADOOP_CP=`hadoop classpath`
echo $HADOOP_CP
else
- echo "Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set"
- exit 1
+ echo "WARN: Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set"
fi
-CP="${HBASE_CP}:${HADOOP_CP}:${ATLASCPPATH}"
+if [ ! -z "$HADOOP_CP" ]; then
+ CP="${HBASE_CP}:${HADOOP_CP}:${ATLASCPPATH}"
+else
+ CP="${HBASE_CP}:${ATLASCPPATH}"
+fi
# If running in cygwin, convert pathnames and classpath to Windows format.
if [ "${CYGWIN}" == "true" ]
