You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2021/01/19 08:38:36 UTC
[bigtop] branch master updated: BIGTOP-3476: Fix build Oozie issues
(#713)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 7922b47 BIGTOP-3476: Fix build Oozie issues (#713)
7922b47 is described below
commit 7922b4713b0a59c9856b31b50bad3f191ab9809d
Author: Yuqi Gu <yu...@arm.com>
AuthorDate: Tue Jan 19 16:38:26 2021 +0800
BIGTOP-3476: Fix build Oozie issues (#713)
---
.../src/common/oozie/patch4-OOZIE-3446.diff | 501 +++++++++++++++++++++
.../src/common/oozie/patch5-OOZIE-2733.diff | 54 +++
2 files changed, 555 insertions(+)
diff --git a/bigtop-packages/src/common/oozie/patch4-OOZIE-3446.diff b/bigtop-packages/src/common/oozie/patch4-OOZIE-3446.diff
new file mode 100644
index 0000000..8b17c06
--- /dev/null
+++ b/bigtop-packages/src/common/oozie/patch4-OOZIE-3446.diff
@@ -0,0 +1,501 @@
+diff --git a/core/src/main/java/org/apache/oozie/CoordinatorEngine.java b/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
+index cec634790..c5b1f091e 100644
+--- a/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
++++ b/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
+@@ -35,7 +35,7 @@ import java.util.Map;
+ import java.util.Set;
+ import java.util.StringTokenizer;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.client.CoordinatorAction;
+ import org.apache.oozie.client.CoordinatorJob;
+diff --git a/core/src/main/java/org/apache/oozie/action/ActionExecutor.java b/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
+index 1d6456b23..d252b05e9 100644
+--- a/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
++++ b/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
+@@ -18,7 +18,7 @@
+
+ package org.apache.oozie.action;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.fs.FileSystem;
+ import org.apache.hadoop.fs.Path;
+ import org.apache.hadoop.conf.Configuration;
+diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java
+index e65b74fc7..a424067ee 100644
+--- a/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java
++++ b/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java
+@@ -26,7 +26,7 @@ import java.util.Map;
+ import java.util.Map.Entry;
+ import java.util.Set;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.CoordinatorJobBean;
+ import org.apache.oozie.ErrorCode;
+diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java b/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
+index 0af7edc90..f7b2ba958 100644
+--- a/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
++++ b/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
+@@ -65,7 +65,7 @@ import org.jdom.Attribute;
+ import org.jdom.Element;
+ import org.jdom.JDOMException;
+ import org.quartz.CronExpression;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.CoordinatorJobBean;
+
+ public class CoordCommandUtils {
+diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
+index f6c178217..3a17e8d3e 100644
+--- a/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
++++ b/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
+@@ -18,7 +18,7 @@
+
+ package org.apache.oozie.command.coord;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.AppType;
+ import org.apache.oozie.CoordinatorActionBean;
+diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
+index 6d8aa0ffd..bba4a90e9 100644
+--- a/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
++++ b/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
+@@ -24,7 +24,7 @@ import java.net.URI;
+ import java.util.Date;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.CoordinatorJobBean;
+diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordSLAAlertsXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordSLAAlertsXCommand.java
+index b8affd67a..85ec1fbd3 100644
+--- a/core/src/main/java/org/apache/oozie/command/coord/CoordSLAAlertsXCommand.java
++++ b/core/src/main/java/org/apache/oozie/command/coord/CoordSLAAlertsXCommand.java
+@@ -23,7 +23,7 @@ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Map;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.CoordinatorJobBean;
+diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
+index 502a800fb..a38d9c604 100644
+--- a/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
++++ b/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
+@@ -24,7 +24,7 @@ import java.io.IOException;
+ import java.io.StringReader;
+ import java.util.Date;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.CoordinatorJobBean;
+ import org.apache.oozie.ErrorCode;
+diff --git a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
+index 925a7aa5d..172a707b4 100644
+--- a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
++++ b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
+@@ -20,7 +20,7 @@ package org.apache.oozie.coord;
+
+ import com.google.common.collect.Lists;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.ErrorCode;
+ import org.apache.oozie.client.OozieClient;
+diff --git a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
+index 82f9bede0..74c79d8f0 100644
+--- a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
++++ b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
+@@ -29,7 +29,7 @@ import java.util.Map;
+ import java.util.HashMap;
+ import java.util.concurrent.TimeUnit;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.CoordinatorEngine;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/dependency/AbstractCoordInputDependency.java b/core/src/main/java/org/apache/oozie/coord/input/dependency/AbstractCoordInputDependency.java
+index 0da60ec70..df03dc4de 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/dependency/AbstractCoordInputDependency.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/dependency/AbstractCoordInputDependency.java
+@@ -30,7 +30,7 @@ import java.util.Map;
+ import java.util.Map.Entry;
+ import java.util.Set;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.io.Writable;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.command.CommandException;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependencyFactory.java b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependencyFactory.java
+index ea1546721..0a6572a82 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependencyFactory.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependencyFactory.java
+@@ -20,7 +20,7 @@ package org.apache.oozie.coord.input.dependency;
+
+ import java.io.UnsupportedEncodingException;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.StringBlob;
+ import org.apache.oozie.util.WritableUtils;
+ import org.apache.oozie.util.XLog;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordOldInputDependency.java b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordOldInputDependency.java
+index aabd2bf25..df2a38c67 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordOldInputDependency.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordOldInputDependency.java
+@@ -27,7 +27,7 @@ import java.util.Collection;
+ import java.util.Date;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.security.AccessControlException;
+ import org.apache.oozie.CoordinatorActionBean;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordPullInputDependency.java b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordPullInputDependency.java
+index f20dcae0f..bcfd699a3 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordPullInputDependency.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordPullInputDependency.java
+@@ -29,7 +29,7 @@ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.command.coord.CoordCommandUtils;
+ import org.apache.oozie.coord.CoordELFunctions;
+ import org.apache.oozie.util.WritableUtils;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordUnResolvedInputDependency.java b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordUnResolvedInputDependency.java
+index 096b58882..90539b191 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordUnResolvedInputDependency.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordUnResolvedInputDependency.java
+@@ -24,7 +24,7 @@ import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.io.Writable;
+ import org.apache.oozie.coord.CoordELFunctions;
+ import org.apache.oozie.util.WritableUtils;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicBuilder.java b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicBuilder.java
+index 2326cd7c7..8153c8d23 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicBuilder.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicBuilder.java
+@@ -20,7 +20,7 @@ package org.apache.oozie.coord.input.logic;
+
+ import java.io.IOException;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ public class CoordInputLogicBuilder {
+
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorPhaseTwo.java b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorPhaseTwo.java
+index 16fc40044..2f62668c6 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorPhaseTwo.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorPhaseTwo.java
+@@ -24,7 +24,7 @@ import java.util.Arrays;
+ import java.util.Date;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.coord.CoordELConstants;
+ import org.apache.oozie.coord.CoordELEvaluator;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorResult.java b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorResult.java
+index 2f3f03436..50bf80e30 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorResult.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorResult.java
+@@ -18,7 +18,7 @@
+
+ package org.apache.oozie.coord.input.logic;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.coord.CoordELFunctions;
+
+ public class CoordInputLogicEvaluatorResult {
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorUtil.java b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorUtil.java
+index 653fb2a32..5aa9fc871 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorUtil.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/logic/CoordInputLogicEvaluatorUtil.java
+@@ -24,7 +24,7 @@ import org.apache.commons.jexl2.Expression;
+ import org.apache.commons.jexl2.JexlContext;
+ import org.apache.commons.jexl2.JexlEngine;
+ import org.apache.commons.jexl2.NamespaceResolver;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.CoordinatorActionBean;
+ import org.apache.oozie.ErrorCode;
+ import org.apache.oozie.command.CommandException;
+diff --git a/core/src/main/java/org/apache/oozie/coord/input/logic/InputLogicParser.java b/core/src/main/java/org/apache/oozie/coord/input/logic/InputLogicParser.java
+index f1f6b419f..1571f317f 100644
+--- a/core/src/main/java/org/apache/oozie/coord/input/logic/InputLogicParser.java
++++ b/core/src/main/java/org/apache/oozie/coord/input/logic/InputLogicParser.java
+@@ -20,7 +20,7 @@ package org.apache.oozie.coord.input.logic;
+
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.jdom.Element;
+ import org.jdom.Namespace;
+
+diff --git a/core/src/main/java/org/apache/oozie/dependency/DependencyChecker.java b/core/src/main/java/org/apache/oozie/dependency/DependencyChecker.java
+index bdd854ffb..ebc8ebed4 100644
+--- a/core/src/main/java/org/apache/oozie/dependency/DependencyChecker.java
++++ b/core/src/main/java/org/apache/oozie/dependency/DependencyChecker.java
+@@ -24,7 +24,7 @@ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.ErrorCode;
+ import org.apache.oozie.client.OozieClient;
+diff --git a/core/src/main/java/org/apache/oozie/service/AbandonedCoordCheckerService.java b/core/src/main/java/org/apache/oozie/service/AbandonedCoordCheckerService.java
+index 0ff23e68e..c350f8e2a 100644
+--- a/core/src/main/java/org/apache/oozie/service/AbandonedCoordCheckerService.java
++++ b/core/src/main/java/org/apache/oozie/service/AbandonedCoordCheckerService.java
+@@ -21,7 +21,7 @@ import java.sql.Timestamp;
+ import java.util.Date;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.CoordinatorJobBean;
+ import org.apache.oozie.action.email.EmailActionExecutor;
+ import org.apache.oozie.command.CommandException;
+diff --git a/core/src/main/java/org/apache/oozie/service/JPAService.java b/core/src/main/java/org/apache/oozie/service/JPAService.java
+index 028381d3b..79d1a1ec3 100644
+--- a/core/src/main/java/org/apache/oozie/service/JPAService.java
++++ b/core/src/main/java/org/apache/oozie/service/JPAService.java
+@@ -32,7 +32,7 @@ import javax.persistence.PersistenceException;
+ import javax.persistence.Query;
+
+ import org.apache.commons.dbcp.BasicDataSource;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.BundleActionBean;
+ import org.apache.oozie.BundleJobBean;
+diff --git a/core/src/main/java/org/apache/oozie/service/JobsConcurrencyService.java b/core/src/main/java/org/apache/oozie/service/JobsConcurrencyService.java
+index da2b9aabe..2334f7e08 100644
+--- a/core/src/main/java/org/apache/oozie/service/JobsConcurrencyService.java
++++ b/core/src/main/java/org/apache/oozie/service/JobsConcurrencyService.java
+@@ -22,7 +22,7 @@ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.util.ConfigUtils;
+ import org.apache.oozie.util.Instrumentable;
+ import org.apache.oozie.util.Instrumentation;
+diff --git a/core/src/main/java/org/apache/oozie/service/ShareLibService.java b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+index b79bd37bb..4415090be 100644
+--- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
++++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+@@ -41,7 +41,7 @@ import java.util.Properties;
+ import java.util.Set;
+ import java.util.TimeZone;
+ import java.util.Map.Entry;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.FileStatus;
+ import org.apache.hadoop.fs.FileSystem;
+diff --git a/core/src/main/java/org/apache/oozie/servlet/V2JobServlet.java b/core/src/main/java/org/apache/oozie/servlet/V2JobServlet.java
+index 662a7ff26..3191b37e6 100644
+--- a/core/src/main/java/org/apache/oozie/servlet/V2JobServlet.java
++++ b/core/src/main/java/org/apache/oozie/servlet/V2JobServlet.java
+@@ -25,7 +25,7 @@ import java.util.List;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.BaseEngine;
+ import org.apache.oozie.BaseEngineException;
+diff --git a/core/src/main/java/org/apache/oozie/util/Pair.java b/core/src/main/java/org/apache/oozie/util/Pair.java
+index 1bf45b41e..527d81bbb 100644
+--- a/core/src/main/java/org/apache/oozie/util/Pair.java
++++ b/core/src/main/java/org/apache/oozie/util/Pair.java
+@@ -18,7 +18,7 @@
+
+ package org.apache.oozie.util;
+
+-import org.apache.commons.lang.ObjectUtils;
++import org.apache.commons.lang3.ObjectUtils;
+
+ /**
+ * Utility class for holding a pair of data
+diff --git a/core/src/main/java/org/apache/oozie/util/ParamChecker.java b/core/src/main/java/org/apache/oozie/util/ParamChecker.java
+index 8debeeffb..f07cf9c59 100644
+--- a/core/src/main/java/org/apache/oozie/util/ParamChecker.java
++++ b/core/src/main/java/org/apache/oozie/util/ParamChecker.java
+@@ -22,7 +22,7 @@ import java.util.Date;
+ import java.util.List;
+ import java.util.TimeZone;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.quartz.CronExpression;
+ import java.text.ParseException;
+
+diff --git a/core/src/main/java/org/apache/oozie/util/XLogFilter.java b/core/src/main/java/org/apache/oozie/util/XLogFilter.java
+index 3b49f77e0..c16054395 100644
+--- a/core/src/main/java/org/apache/oozie/util/XLogFilter.java
++++ b/core/src/main/java/org/apache/oozie/util/XLogFilter.java
+@@ -28,7 +28,7 @@ import java.util.Map;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.service.ConfigurationService;
+ import com.google.common.annotations.VisibleForTesting;
+
+diff --git a/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java b/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
+index 1fe59e3d2..255365154 100644
+--- a/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
++++ b/core/src/main/java/org/apache/oozie/util/XLogUserFilterParam.java
+@@ -26,7 +26,7 @@ import java.util.Date;
+ import java.util.HashSet;
+ import java.util.Map;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.oozie.ErrorCode;
+ import org.apache.oozie.client.rest.RestConstants;
+ import org.apache.oozie.command.CommandException;
+diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java
+index a74e5c759..4f961f452 100644
+--- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java
++++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java
+@@ -40,7 +40,7 @@ import javax.xml.validation.Schema;
+ import javax.xml.validation.Validator;
+
+ import org.apache.commons.codec.binary.Base64;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.io.Writable;
+ import org.apache.oozie.ErrorCode;
+@@ -550,4 +550,4 @@ public class LiteWorkflowAppParser {
+ }
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java b/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
+index c6c9c4920..e89d43f7b 100644
+--- a/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
++++ b/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
+@@ -18,7 +18,7 @@
+
+ package org.apache.oozie;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.oozie.client.CoordinatorAction;
+ import org.apache.oozie.client.CoordinatorJob;
+diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java b/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java
+index 2af6db601..b9d598076 100644
+--- a/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java
++++ b/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java
+@@ -20,7 +20,7 @@ package org.apache.oozie.command.coord;
+
+ import java.util.Date;
+
+-import org.apache.commons.lang.time.DateUtils;
++import org.apache.commons.lang3.time.DateUtils;
+ import org.apache.oozie.CoordinatorJobBean;
+ import org.apache.oozie.client.CoordinatorAction;
+ import org.apache.oozie.client.CoordinatorJob;
+diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowLib.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowLib.java
+index a479de02c..4ea02eec5 100644
+--- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowLib.java
++++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowLib.java
+@@ -19,7 +19,7 @@
+ package org.apache.oozie.workflow.lite;
+
+
+-import org.apache.commons.lang.RandomStringUtils;
++import org.apache.commons.lang3.RandomStringUtils;
+ import org.apache.oozie.service.Services;
+ import org.apache.oozie.workflow.WorkflowException;
+ import org.apache.oozie.workflow.WorkflowInstance;
+diff --git a/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java b/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
+index a0b7d62c9..3949eb759 100644
+--- a/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
++++ b/hadooplibs/hadoop-utils-2/src/main/java/org/apache/oozie/action/hadoop/LauncherMainHadoopUtils.java
+@@ -25,7 +25,7 @@ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Set;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+ import org.apache.hadoop.yarn.api.protocolrecords.ApplicationsRequestScope;
+diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
+index 785ca5ea2..fffb6b9ce 100644
+--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
++++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
+@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.Path;
+ import org.apache.hadoop.util.Shell;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.mapred.JobConf;
+
+ public abstract class LauncherMain {
+diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
+index 87c4cc4cc..4d38da15d 100644
+--- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
++++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
+@@ -22,7 +22,7 @@ import org.apache.pig.Main;
+ import org.apache.pig.PigRunner;
+ import org.apache.pig.tools.pigstats.JobStats;
+ import org.apache.pig.tools.pigstats.PigStats;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.Path;
+
+diff --git a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
+index 0da74d4ac..0378f25a5 100644
+--- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
++++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
+@@ -35,7 +35,7 @@ import java.util.jar.Manifest;
+ import java.util.regex.Pattern;
+
+ import org.apache.commons.io.FileUtils;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.filecache.DistributedCache;
+ import org.apache.hadoop.fs.FileSystem;
diff --git a/bigtop-packages/src/common/oozie/patch5-OOZIE-2733.diff b/bigtop-packages/src/common/oozie/patch5-OOZIE-2733.diff
new file mode 100644
index 0000000..fd9962b
--- /dev/null
+++ b/bigtop-packages/src/common/oozie/patch5-OOZIE-2733.diff
@@ -0,0 +1,54 @@
+diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+index 31d4817cb..c2233d1d8 100644
+--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
++++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+@@ -45,13 +45,13 @@ import org.apache.hadoop.filecache.DistributedCache;
+ import org.apache.hadoop.fs.FileStatus;
+ import org.apache.hadoop.fs.FileSystem;
+ import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.AccessControlException;
+ import org.apache.oozie.hadoop.utils.HadoopShims;
+ import org.apache.hadoop.io.Text;
+ import org.apache.hadoop.mapred.JobClient;
+ import org.apache.hadoop.mapred.JobConf;
+ import org.apache.hadoop.mapred.JobID;
+ import org.apache.hadoop.mapred.RunningJob;
++import org.apache.hadoop.security.AccessControlException;
+ import org.apache.hadoop.mapreduce.security.token.delegation.DelegationTokenIdentifier;
+ import org.apache.hadoop.security.UserGroupInformation;
+ import org.apache.hadoop.security.token.Token;
+diff --git a/core/src/main/java/org/apache/oozie/service/AuthorizationService.java b/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
+index 4e4ab17fd..d5f789e1d 100644
+--- a/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
++++ b/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
+@@ -35,6 +35,7 @@ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.FileSystem;
+ import org.apache.hadoop.fs.Path;
+ import org.apache.oozie.BundleJobBean;
++import org.apache.hadoop.security.AccessControlException;
+ import org.apache.oozie.CoordinatorJobBean;
+ import org.apache.oozie.ErrorCode;
+ import org.apache.oozie.WorkflowJobBean;
+@@ -338,9 +339,8 @@ public class AuthorizationService implements Service {
+ }
+ fs.open(wfXml).close();
+ }
+- // TODO change this when stopping support of 0.18 to the new
+- // Exception
+- catch (org.apache.hadoop.fs.permission.AccessControlException ex) {
++ // // fs.permission.AccessControlException removed by HADOOP-11356
++ catch (AccessControlException ex) {
+ incrCounter(INSTR_FAILED_AUTH_COUNTER, 1);
+ throw new AuthorizationException(ErrorCode.E0507, appPath, ex.getMessage(), ex);
+ }
+@@ -394,9 +394,7 @@ public class AuthorizationService implements Service {
+ }
+ }
+ }
+- // TODO change this when stopping support of 0.18 to the new
+- // Exception
+- catch (org.apache.hadoop.fs.permission.AccessControlException ex) {
++ catch (AccessControlException ex) {
+ incrCounter(INSTR_FAILED_AUTH_COUNTER, 1);
+ throw new AuthorizationException(ErrorCode.E0507, appPath, ex.getMessage(), ex);
+ }