diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 0cfa07f..d151374 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -191,7 +191,7 @@ commons-logging - + org.apache.hadoop hadoop-mapreduce-client-jobclient @@ -208,13 +208,19 @@ commons-logging - + org.apache.hadoop hadoop-yarn-server-tests ${hadoop.version} tests test + + + org.slf4j + slf4j-log4j12 + + org.apache.pig diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 8f70bd7..b10f05f 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -178,6 +178,10 @@ ${slider.version} + asm + asm + + org.apache.hadoop hadoop-common @@ -222,8 +226,8 @@ jettison - asm - asm + org.slf4j + slf4j-log4j12 diff --git a/metastore/pom.xml b/metastore/pom.xml index a50bbbc..733f891 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -143,6 +143,22 @@ org.apache.hadoop + hadoop-auth + ${hadoop.version} + true + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + + + org.apache.hadoop hadoop-common ${hadoop.version} true diff --git a/pom.xml b/pom.xml index a73fac0..a7c462e 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ 14.0.1 2.4.4 1.3.166 - 2.7.2 + 2.8.0 ${basedir}/${hive.path.to.root}/testutils/hadoop 1.1 1.1.1 @@ -684,13 +684,24 @@ commons-logging - + + + org.apache.hadoop + hadoop-auth + ${hadoop.version} + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common ${hadoop.version} - + org.slf4j slf4j-log4j12 @@ -730,7 +741,7 @@ org.apache.hadoop - hadoop-mapreduce-client-core + hadoop-mapreduce-client-common ${hadoop.version} @@ -745,10 +756,55 @@ org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + + + org.apache.hadoop hadoop-minikdc ${hadoop.version} + org.apache.hadoop + hadoop-yarn-api + ${hadoop.version} + + + org.apache.hadoop + hadoop-yarn-client + ${hadoop.version} + + + org.apache.hadoop + hadoop-yarn-common + ${hadoop.version} + + + org.apache.hadoop + hadoop-yarn-registry + ${hadoop.version} + + + org.apache.hadoop + hadoop-yarn-server-web-common + ${hadoop.version} + + + org.apache.hadoop + hadoop-yarn-server-web-proxy + ${hadoop.version} + + org.apache.hbase hbase-common ${hbase.version} diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out index 03012df..580da46 100644 --- a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out +++ b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out @@ -77,7 +77,7 @@ PREHOOK: query: ALTER TABLE default.encrypted_table RENAME TO encrypted_db.encry PREHOOK: type: ALTERTABLE_RENAME PREHOOK: Input: default@encrypted_table PREHOOK: Output: default@encrypted_table -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Unable to alter table. Alter Table operation for default.encrypted_table failed to move data due to: '/build/ql/test/data/warehouse/encrypted_table can't be moved from encryption zone /build/ql/test/data/warehouse/encrypted_table to encryption zone /build/ql/test/data/warehouse/encrypted_db.db.' See hive log file for details. +FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Unable to alter table. Alter Table operation for default.encrypted_table failed to move data due to: '/build/ql/test/data/warehouse/encrypted_table can't be moved into an encryption zone.' See hive log file for details. PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml index f4b580e..7c586fa 100644 --- a/shims/0.23/pom.xml +++ b/shims/0.23/pom.xml @@ -179,6 +179,10 @@ javax.servlet servlet-api + + org.slf4j + slf4j-log4j12 + diff --git a/shims/scheduler/pom.xml b/shims/scheduler/pom.xml index 2e868b0..0eadb69 100644 --- a/shims/scheduler/pom.xml +++ b/shims/scheduler/pom.xml @@ -76,6 +76,12 @@ hadoop-yarn-server-resourcemanager ${hadoop.version} true + + + org.slf4j + slf4j-log4j12 + + org.apache.hadoop diff --git a/storage-api/pom.xml b/storage-api/pom.xml index e21bbb6..d0bf088 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -32,7 +32,7 @@ 2.6 14.0.1 - 2.7.2 + 2.8.0 4.11 1.7.10