You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2022/11/17 04:03:43 UTC
[atlas] branch branch-2.0 updated (8ca041c98 -> 2c2d9197e)
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
from 8ca041c98 ATLAS-2388: enabled InMemoryJAASConfigurationTest
new 1a5bf6762 ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2
new 887ef24c5 ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml
new da27bb1b4 ATLAS-4241: fix import-hbase errors
new 2c2d9197e ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
addons/hbase-bridge/pom.xml | 25 ++++++++
addons/hbase-bridge/src/bin/import-hbase.sh | 19 ++++--
addons/hive-bridge/pom.xml | 5 --
addons/hive-bridge/src/bin/import-hive.sh | 4 +-
addons/kafka-bridge/pom.xml | 72 +++++++++++++++++++++-
addons/kafka-bridge/src/bin/import-kafka.sh | 18 +-----
.../org/apache/atlas/kafka/bridge/KafkaBridge.java | 2 +-
dev-support/atlas-docker/.dockerignore | 1 +
dev-support/atlas-docker/.env | 8 +--
dev-support/atlas-docker/Dockerfile.atlas-kafka | 21 ++++---
dev-support/atlas-docker/scripts/atlas-build.sh | 1 +
.../scripts/atlas-hbase-application.properties | 2 +-
.../scripts/atlas-hive-application.properties | 2 +-
...operties => atlas-kafka-application.properties} | 2 +-
pom.xml | 2 +-
15 files changed, 139 insertions(+), 45 deletions(-)
copy dev-support/atlas-docker/scripts/{atlas-hive-application.properties => atlas-kafka-application.properties} (94%)
[atlas] 02/04: ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 887ef24c5069c91fd1fb118d63c8ebca7f2978d5
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Nov 15 07:51:56 2022 -0800
ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml
---
dev-support/atlas-docker/.env | 8 ++++----
.../atlas-docker/scripts/atlas-hbase-application.properties | 2 +-
.../atlas-docker/scripts/atlas-hive-application.properties | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env
index 19175c2ed..ca597ac04 100644
--- a/dev-support/atlas-docker/.env
+++ b/dev-support/atlas-docker/.env
@@ -1,12 +1,12 @@
BUILD_HOST_SRC=true
SKIPTESTS=true
GIT_URL=https://github.com/apache/atlas.git
-BRANCH=release-2.2.0-rc1
+BRANCH=branch-2.0
PROFILE=dist,external-hbase-solr
-ATLAS_VERSION=2.2.0
+ATLAS_VERSION=2.3.0-SNAPSHOT
HADOOP_VERSION=3.3.0
HBASE_VERSION=2.3.3
-KAFKA_VERSION=2.5.0
+KAFKA_VERSION=2.8.1
HIVE_VERSION=3.1.2
-HIVE_HADOOP_VERSION=3.1.0
+HIVE_HADOOP_VERSION=3.1.1
diff --git a/dev-support/atlas-docker/scripts/atlas-hbase-application.properties b/dev-support/atlas-docker/scripts/atlas-hbase-application.properties
index 8c5b9e088..268e5c8c4 100644
--- a/dev-support/atlas-docker/scripts/atlas-hbase-application.properties
+++ b/dev-support/atlas-docker/scripts/atlas-hbase-application.properties
@@ -17,7 +17,7 @@
#
-atlas.rest.address=http://atlas-example.com:21000
+atlas.rest.address=http://atlas.example.com:21000
atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181
atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092
diff --git a/dev-support/atlas-docker/scripts/atlas-hive-application.properties b/dev-support/atlas-docker/scripts/atlas-hive-application.properties
index 8c5b9e088..268e5c8c4 100644
--- a/dev-support/atlas-docker/scripts/atlas-hive-application.properties
+++ b/dev-support/atlas-docker/scripts/atlas-hive-application.properties
@@ -17,7 +17,7 @@
#
-atlas.rest.address=http://atlas-example.com:21000
+atlas.rest.address=http://atlas.example.com:21000
atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181
atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092
[atlas] 04/04: ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 2c2d9197e68b809198d6e9f1232473d1c2d9e960
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Nov 15 14:22:04 2022 -0800
ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge
---
addons/kafka-bridge/pom.xml | 72 +++++++++++++++++++++-
addons/kafka-bridge/src/bin/import-kafka.sh | 18 +-----
.../org/apache/atlas/kafka/bridge/KafkaBridge.java | 2 +-
dev-support/atlas-docker/.dockerignore | 1 +
dev-support/atlas-docker/Dockerfile.atlas-kafka | 21 ++++---
dev-support/atlas-docker/scripts/atlas-build.sh | 1 +
.../atlas-kafka-application.properties} | 24 ++------
7 files changed, 95 insertions(+), 44 deletions(-)
diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml
index 9ce22a757..31f5d5b3a 100644
--- a/addons/kafka-bridge/pom.xml
+++ b/addons/kafka-bridge/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>12.0.1</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -223,6 +223,21 @@
<artifactId>atlas-common</artifactId>
<version>${project.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>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
@@ -233,11 +248,66 @@
<artifactId>jersey-multipart</artifactId>
<version>${jersey.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.databind.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <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>com.sun.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ <version>${jersey.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents-httpclient.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents-httpcore.version}</version>
+ </artifactItem>
<artifactItem>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${commons-conf.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
diff --git a/addons/kafka-bridge/src/bin/import-kafka.sh b/addons/kafka-bridge/src/bin/import-kafka.sh
index ada3b4ae2..8fe27748a 100644
--- a/addons/kafka-bridge/src/bin/import-kafka.sh
+++ b/addons/kafka-bridge/src/bin/import-kafka.sh
@@ -99,25 +99,12 @@ fi
KAFKA_CP="${KAFKA_CONF}"
-for i in "${KAFKA_HOME}/libs/kafka-clients"*.jar "${KAFKA_HOME}/libs/slf4j-api"*.jar; do
+for i in "${KAFKA_HOME}/libs/kafka-clients"*.jar "${KAFKA_HOME}/libs/slf4j-"*.jar "${KAFKA_HOME}/libs/log4j-"*.jar "${KAFKA_HOME}/libs/commons-"*.jar "${KAFKA_HOME}/libs/jackson-module-jaxb-annotations"*.jar; do
KAFKA_CP="${KAFKA_CP}:$i"
done
-#Add hadoop conf in classpath
-if [ ! -z "$HADOOP_CLASSPATH" ]; then
- HADOOP_CP=$HADOOP_CLASSPATH
-elif [ ! -z "$HADOOP_HOME" ]; then
- HADOOP_CP=`$HADOOP_HOME/bin/hadoop classpath`
-elif [ $(command -v hadoop) ]; then
- HADOOP_CP=`hadoop classpath`
- #echo $HADOOP_CP
-else
- echo "Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set"
- exit 1
-fi
-
-CP="${ATLASCPPATH}:${HADOOP_CP}:${KAFKA_CP}"
+CP="${ATLASCPPATH}:${KAFKA_CP}"
# If running in cygwin, convert pathnames and classpath to Windows format.
if [ "${CYGWIN}" == "true" ]
@@ -125,7 +112,6 @@ then
ATLAS_LOG_DIR=`cygpath -w ${ATLAS_LOG_DIR}`
LOGFILE=`cygpath -w ${LOGFILE}`
KAFKA_CP=`cygpath -w ${KAFKA_CP}`
- HADOOP_CP=`cygpath -w ${HADOOP_CP}`
CP=`cygpath -w -p ${CP}`
fi
diff --git a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
index 8be2fca3a..0878ec29f 100644
--- a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
+++ b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
@@ -134,7 +134,7 @@ public class KafkaBridge {
KafkaBridge importer = new KafkaBridge(atlasConf, atlasClientV2, kafkaUtils);
- if(!KAFKA_SCHEMA_REGISTRY_ENV_VARIABLE.isEmpty()){
+ if(StringUtils.isNotEmpty(KAFKA_SCHEMA_REGISTRY_ENV_VARIABLE)) {
KAFKA_SCHEMA_REGISTRY_HOSTNAME = KAFKA_SCHEMA_REGISTRY_ENV_VARIABLE;
}
diff --git a/dev-support/atlas-docker/.dockerignore b/dev-support/atlas-docker/.dockerignore
index d4a3db26b..14ff6a9fc 100644
--- a/dev-support/atlas-docker/.dockerignore
+++ b/dev-support/atlas-docker/.dockerignore
@@ -2,6 +2,7 @@
!config
!dist/apache-atlas-*-hbase-hook.tar.gz
!dist/apache-atlas-*-hive-hook.tar.gz
+!dist/apache-atlas-*-kafka-hook.tar.gz
!dist/apache-atlas-*-server.tar.gz
!downloads/*
!scripts/*
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-kafka b/dev-support/atlas-docker/Dockerfile.atlas-kafka
index e06d62845..d7a8e3f07 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-kafka
+++ b/dev-support/atlas-docker/Dockerfile.atlas-kafka
@@ -20,17 +20,24 @@ ARG ATLAS_VERSION
ARG KAFKA_VERSION
-COPY ./downloads/kafka_2.12-${KAFKA_VERSION}.tgz /home/atlas/dist/
+COPY ./dist/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz /home/atlas/dist/
+COPY ./downloads/kafka_2.12-${KAFKA_VERSION}.tgz /home/atlas/dist/
-COPY ./scripts/atlas-kafka-setup.sh /home/atlas/scripts/
-COPY ./scripts/atlas-kafka.sh /home/atlas/scripts/
+COPY ./scripts/atlas-kafka-setup.sh /home/atlas/scripts/
+COPY ./scripts/atlas-kafka.sh /home/atlas/scripts/
+COPY ./scripts/atlas-kafka-application.properties /home/atlas/scripts/
RUN tar xvfz /home/atlas/dist/kafka_2.12-${KAFKA_VERSION}.tgz --directory=/opt/ && \
ln -s /opt/kafka_2.12-${KAFKA_VERSION} /opt/kafka && \
- rm -f /home/atlas/dist/kafka_2.12-${KAFKA_VERSION}.tgz
-
-ENV KAFKA_HOME /opt/kafka
-ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
+ rm -f /home/atlas/dist/kafka_2.12-${KAFKA_VERSION}.tgz && \
+ tar xvfz /home/atlas/dist/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz --directory=/opt/ && \
+ ln -s /opt/apache-atlas-kafka-hook-${ATLAS_VERSION} /opt/apache-atlas-kafka-hook && \
+ rm -f /home/atlas/dist/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz && \
+ cp -f /home/atlas/scripts/atlas-kafka-application.properties /opt/kafka/config/atlas-application.properties
+
+ENV KAFKA_HOME /opt/kafka
+ENV KAFKA_CONF_DIR /opt/kafka/config
+ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
EXPOSE 9092
diff --git a/dev-support/atlas-docker/scripts/atlas-build.sh b/dev-support/atlas-docker/scripts/atlas-build.sh
index e53ebbba9..592a055f7 100755
--- a/dev-support/atlas-docker/scripts/atlas-build.sh
+++ b/dev-support/atlas-docker/scripts/atlas-build.sh
@@ -89,3 +89,4 @@ mvn ${ARG_PROFILES} ${ARG_SKIPTESTS} -DskipDocs clean package
mv -f distro/target/apache-atlas-${ATLAS_VERSION}-server.tar.gz /home/atlas/dist/
mv -f distro/target/apache-atlas-${ATLAS_VERSION}-hive-hook.tar.gz /home/atlas/dist/
mv -f distro/target/apache-atlas-${ATLAS_VERSION}-hbase-hook.tar.gz /home/atlas/dist/
+mv -f distro/target/apache-atlas-${ATLAS_VERSION}-kafka-hook.tar.gz /home/atlas/dist/
diff --git a/dev-support/atlas-docker/Dockerfile.atlas-kafka b/dev-support/atlas-docker/scripts/atlas-kafka-application.properties
similarity index 53%
copy from dev-support/atlas-docker/Dockerfile.atlas-kafka
copy to dev-support/atlas-docker/scripts/atlas-kafka-application.properties
index e06d62845..268e5c8c4 100644
--- a/dev-support/atlas-docker/Dockerfile.atlas-kafka
+++ b/dev-support/atlas-docker/scripts/atlas-kafka-application.properties
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -13,25 +14,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
-FROM atlas-base:latest
-
-ARG ATLAS_VERSION
-ARG KAFKA_VERSION
-
-
-COPY ./downloads/kafka_2.12-${KAFKA_VERSION}.tgz /home/atlas/dist/
-
-COPY ./scripts/atlas-kafka-setup.sh /home/atlas/scripts/
-COPY ./scripts/atlas-kafka.sh /home/atlas/scripts/
-
-RUN tar xvfz /home/atlas/dist/kafka_2.12-${KAFKA_VERSION}.tgz --directory=/opt/ && \
- ln -s /opt/kafka_2.12-${KAFKA_VERSION} /opt/kafka && \
- rm -f /home/atlas/dist/kafka_2.12-${KAFKA_VERSION}.tgz
-
-ENV KAFKA_HOME /opt/kafka
-ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
-EXPOSE 9092
+atlas.rest.address=http://atlas.example.com:21000
-ENTRYPOINT [ "/home/atlas/scripts/atlas-kafka.sh" ]
+atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181
+atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092
[atlas] 01/04: ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 1a5bf676218d371398e700c1a348a60c11c52867
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Nov 15 07:45:54 2022 -0800
ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2
---
addons/hive-bridge/pom.xml | 5 -----
addons/hive-bridge/src/bin/import-hive.sh | 4 ++--
pom.xml | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 856e5d95d..80a2252c5 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -311,11 +311,6 @@
<artifactId>jersey-json</artifactId>
<version>${jersey.version}</version>
</artifactItem>
- <artifactItem>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr.version}</version>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
diff --git a/addons/hive-bridge/src/bin/import-hive.sh b/addons/hive-bridge/src/bin/import-hive.sh
index ebe6976f0..951be5ba2 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -92,9 +92,9 @@ fi
HIVE_CP="${HIVE_CONF}"
# Multiple jars in HIVE_CP_EXCLUDE_LIST can be added using "\|" separator
-# Ex: HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multipart"
+# Ex: HIVE_CP_EXCLUDE_LIST="jersey-multipart"
# exclude log4j libs from hive classpath to avoid conflict
-HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web"
+HIVE_CP_EXCLUDE_LIST="log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web"
for i in $(find "${HIVE_HOME}/lib/" -name "*.jar" | grep -v "$HIVE_CP_EXCLUDE_LIST"); do
HIVE_CP="${HIVE_CP}:$i"
diff --git a/pom.xml b/pom.xml
index ca221fe29..4cc2201c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -734,7 +734,7 @@
<hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
<hadoop.version>3.3.0</hadoop.version>
<hbase.version>2.3.3</hbase.version>
- <hive.version>3.1.0</hive.version>
+ <hive.version>3.1.2</hive.version>
<hppc.version>0.8.1</hppc.version>
<httpcomponents-httpclient.version>4.5.13</httpcomponents-httpclient.version>
<httpcomponents-httpcore.version>4.4.13</httpcomponents-httpcore.version>
[atlas] 03/04: ATLAS-4241: fix import-hbase errors
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit da27bb1b497db7f234c66203255a3ded37af3631
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Nov 15 16:46:56 2022 -0800
ATLAS-4241: fix import-hbase errors
---
addons/hbase-bridge/pom.xml | 25 +++++++++++++++++++++++++
addons/hbase-bridge/src/bin/import-hbase.sh | 19 ++++++++++++++-----
2 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index f51a7d6f1..5a0f62fb3 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -344,6 +344,16 @@
<artifactId>kafka-clients</artifactId>
<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>
@@ -364,6 +374,16 @@
<artifactId>jackson-annotations</artifactId>
<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>
@@ -374,6 +394,11 @@
<artifactId>jersey-json</artifactId>
<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>
diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh b/addons/hbase-bridge/src/bin/import-hbase.sh
index a343036fa..8ae735034 100644
--- a/addons/hbase-bridge/src/bin/import-hbase.sh
+++ b/addons/hbase-bridge/src/bin/import-hbase.sh
@@ -97,8 +97,14 @@ fi
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 @@ elif [ $(command -v hadoop) ]; then
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" ]