[atlas] 01/04: ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2

2022-11-17 Thread madhan 
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 
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 @@
 
jersey-json
 
${jersey.version}
 
-
-javax.ws.rs
-jsr311-api
-${jsr.version}
-
 
 
 
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.version}
 3.3.0
 2.3.3
-3.1.0
+3.1.2
 0.8.1
 
4.5.13
 
4.4.13

[atlas] 01/04: ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2

2022-11-16 Thread madhan 
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 
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 @@
 
jersey-json
 
${jersey.version}
 
-
-javax.ws.rs
-jsr311-api
-${jsr.version}
-
 
 
 
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.version}
 3.3.0
 2.3.3
-3.1.0
+3.1.2
 0.8.1
 
4.5.13
 
4.4.13