Repository: bigtop Updated Branches: refs/heads/master f4d023b4c -> d7ca7882d
BIGTOP-2620. Bump oozie version to 4.3.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d7ca7882 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d7ca7882 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d7ca7882 Branch: refs/heads/master Commit: d7ca7882d0cd547feffc176403e8d1cbb05e4346 Parents: f4d023b Author: Roman Shaposhnik <[email protected]> Authored: Sun Dec 4 16:43:30 2016 -0800 Committer: Roman Shaposhnik <[email protected]> Committed: Sun Dec 4 16:43:30 2016 -0800 ---------------------------------------------------------------------- .../src/common/oozie/patch0-OOZIE-2305.diff | 42 -------------------- bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 1 + bigtop.bom | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7ca7882/bigtop-packages/src/common/oozie/patch0-OOZIE-2305.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/oozie/patch0-OOZIE-2305.diff b/bigtop-packages/src/common/oozie/patch0-OOZIE-2305.diff deleted file mode 100644 index ee8463b..0000000 --- a/bigtop-packages/src/common/oozie/patch0-OOZIE-2305.diff +++ /dev/null @@ -1,42 +0,0 @@ ---- oozie-4.2.0/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java -+++ oozie-4.2.0/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java -@@ -48,6 +48,9 @@ import org.apache.oozie.service.Services; - import org.apache.oozie.service.URIHandlerService; - import org.apache.oozie.util.HCatURI; - import org.apache.oozie.util.XLog; -+import org.apache.hadoop.hive.thrift.DelegationTokenIdentifier; -+import org.apache.hadoop.io.Text; -+import org.apache.hadoop.security.token.Token; - - public class HCatURIHandler implements URIHandler { - -@@ -270,8 +273,10 @@ public class HCatURIHandler implements URIHandler { - delegationToken = tokenClient.getDelegationToken(user, UserGroupInformation.getLoginUser() - .getUserName()); - // Store Delegation token in the UGI -- ShimLoader.getHadoopShims().setTokenStr(ugi, delegationToken, -- hiveConf.get("hive.metastore.token.signature")); -+ Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>(); -+ token.decodeFromUrlString(delegationToken); -+ token.setService(new Text(hiveConf.get("hive.metastore.token.signature"))); -+ ugi.addToken(token); - } - finally { - if (tokenClient != null) ---- oozie-4.2.0/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java -+++ oozie-4.2.0/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java -@@ -84,7 +84,6 @@ public class MiniHS2 extends AbstractHiveService { - hiveConf.setVar(ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST, getHost()); - hiveConf.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_PORT, getBinaryPort()); - hiveConf.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_HTTP_PORT, getHttpPort()); -- HiveMetaStore.HMSHandler.resetDefaultDBFlag(); - - Path scratchDir = new Path(baseDfsDir, "scratch"); - fs.mkdirs(scratchDir); -@@ -209,4 +208,4 @@ public class MiniHS2 extends AbstractHiveService { - } while (true); - } - --} -\ No newline at end of file -+} http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7ca7882/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec index 81099fd..933481a 100644 --- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec +++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec @@ -226,6 +226,7 @@ fi %{usr_bin}/oozie %dir %{lib_oozie} %{lib_oozie}/bin/oozie +%{lib_oozie}/conf/oozie-client-env.sh %{lib_oozie}/lib %doc %{doc_oozie} %{man_dir}/man1/oozie.1.* http://git-wip-us.apache.org/repos/asf/bigtop/blob/d7ca7882/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 9df3008..b0a524a 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -208,7 +208,7 @@ bigtop { 'oozie' { name = 'oozie' relNotes = 'Apache Oozie' - version { base = '4.2.0'; pkg = base; release = 1 } + version { base = '4.3.0'; pkg = base; release = 1 } tarball { destination = "$name-${version.base}.tar.gz" source = destination } url { download_path = "/$name/${version.base}/"
