This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit 567ffb4089f9f024049ad88a56faf3783ddd9258
Author: Madhan Neethiraj <mad...@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
    
    (cherry picked from commit 1a5bf676218d371398e700c1a348a60c11c52867)
---
 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 f777ca29a..35bd4e553 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 727c66a33..496d2692e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -744,7 +744,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>

Reply via email to