ATLAS-688 import-hive should depend on Hive CLASSPATH jars instead of packaging…

addons/hive-bridge/pom.xml

@@ -157,20 +157,6 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-bridge-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/dependency/bridge/hive</outputDirectory>
-                            <includeScope>compile</includeScope>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
-                    <execution>
                         <id>copy-hook</id>
                         <phase>package</phase>
                         <goals>

addons/hive-bridge/src/bin/import-hive.sh

@@ -59,10 +59,6 @@ fi
 # and jars from bridge/hive and hook/hive directories.
 ATLASCPPATH="$ATLAS_CONF"
 
-for i in "${BASEDIR}/bridge/hive/"*.jar; do
-  ATLASCPPATH="${ATLASCPPATH}:$i"
-done
-
 for i in "${BASEDIR}/hook/hive/"*.jar; do
   ATLASCPPATH="${ATLASCPPATH}:$i"
 done
@@ -85,9 +81,22 @@ else
     echo "Could not find a valid HIVE configuration"
     exit 1
 fi
-export HIVE_CP
 
-CP="${HIVE_CP}:${ATLASCPPATH}"
+#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`
+else
+    echo "Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set"
+    exit 1
+fi
+
+for i in "${HIVE_HOME}/lib/"*.jar; do
+    HIVE_CP="${HIVE_CP}:$i"
+done
+
+CP="${ATLASCPPATH}:${HIVE_CP}:${HADOOP_CP}"
 
 # If running in cygwin, convert pathnames and classpath to Windows format.
 if [ "${CYGWIN}" == "true" ]
@@ -95,6 +104,7 @@ then
    ATLAS_LOG_DIR=`cygpath -w ${ATLAS_LOG_DIR}`
    LOGFILE=`cygpath -w ${LOGFILE}`
    HIVE_CP=`cygpath -w ${HIVE_CP}`
+   HADOOP_CP=`cygpath -w ${HADOOP_CP}`
    CP=`cygpath -w -p ${CP}`
 fi
 

release-log.txt

@@ -24,6 +24,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 ALL CHANGES:
+ATLAS-688 import-hive should depend on Hive CLASSPATH jars instead of packaging everything (svimal2106 via sumasai)
 ATLAS-877 CreateTime of an entity(for example hive table) changes for every update (sumasai)
 ATLAS-642 import-hive should create the lineage for external tables (svimal2106 via sumasai)
 ATLAS-901 Log messages that cannot be sent to Kafka to a specific log configuration (yhemanth)