You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by se...@apache.org on 2021/03/24 14:19:20 UTC
[bigtop] branch master updated: BIGTOP-3528. Bump Oozie to 5.2.1
(#761)
This is an automated email from the ASF dual-hosted git repository.
sekikn 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 97ea120 BIGTOP-3528. Bump Oozie to 5.2.1 (#761)
97ea120 is described below
commit 97ea1206ab05436faaf1204b9cb9371a654a1a8d
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Mar 24 23:19:09 2021 +0900
BIGTOP-3528. Bump Oozie to 5.2.1 (#761)
---
.../src/common/oozie/catalina.properties | 81 ----
.../src/common/oozie/do-component-build | 2 +-
bigtop-packages/src/common/oozie/install_oozie.sh | 28 +-
...204-remove-h2-pig-classifier-in-Oozie-code.diff | 27 --
.../src/common/oozie/patch0-hadoop322-hive312.diff | 228 ++++++++++
.../common/oozie/patch1-BIGTOP-3099-log4j2.diff | 287 ------------
.../common/oozie/patch2-server-xml-tomcat85.diff | 17 -
.../common/oozie/patch3-OOZIE-3502-branch-4.3.diff | 34 --
.../src/common/oozie/patch4-OOZIE-3446.diff | 501 ---------------------
.../src/common/oozie/patch5-OOZIE-2733.diff | 54 ---
.../src/common/oozie/tomcat-deployment.sh | 37 --
bigtop-packages/src/deb/oozie/control | 2 +-
bigtop-packages/src/deb/oozie/oozie.postinst | 4 -
bigtop-packages/src/deb/oozie/rules | 5 +-
bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 20 +-
bigtop.bom | 2 +-
16 files changed, 240 insertions(+), 1089 deletions(-)
diff --git a/bigtop-packages/src/common/oozie/catalina.properties b/bigtop-packages/src/common/oozie/catalina.properties
deleted file mode 100755
index 48c498b..0000000
--- a/bigtop-packages/src/common/oozie/catalina.properties
+++ /dev/null
@@ -1,81 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-# "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class
-# repositories
-# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/oozie/*.jar,/usr/lib/hadoop/client/*.jar,/usr/lib/oozie/lib/*.jar
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-# "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class
-# repositories
-# "foo/bar.jar": Add bar.jar as a class repository
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-# "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class
-# repositories
-# "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-shared.loader=
-
-#
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index 828aa6c..7640a34 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -84,7 +84,7 @@ sed -i.bak "/http:\/\/repository.codehaus.org/a\\
export MAVEN_OPTS="-Xmx2g"
# Invoke Oozie build script
-${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} -DtargetJavaVersion=${JDK_VERSION} -DsourceJavaVersion=${JDK_VERSION} -DminJavaVersion=${JDK_VERSION} -DskipTests -Phadoop-2 -Pspark-2 -Puber -Dhadoop.version=${HADOOP_VERSION} -Dhadoop.auth.version=${HADOOP_VERSION} -Dhive.version=${HIVE_VERSION} -Dsqoop.version=${SQOOP_VERSION} -Dspark.version=${SPARK_VERSION} -Dspark.scala.binary.version=${SCALA_VERSION%.*} ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
+${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} -DtargetJavaVersion=${JDK_VERSION} -DsourceJavaVersion=${JDK_VERSION} -DminJavaVersion=${JDK_VERSION} -DskipTests -Phadoop-3 -Pspark-2 -Puber -Dhadoop.version=${HADOOP_VERSION} -Dhadoop.auth.version=${HADOOP_VERSION} -Dhive.version=${HIVE_VERSION} -Dsqoop.version=${SQOOP_VERSION} -Dspark.version=${SPARK_VERSION} -Dspark.scala.binary.version=${SCALA_VERSION%.*} -Djackson.version=2.9.10 ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/re [...]
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 8ca0a48..b826895 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -201,33 +201,11 @@ fi
cp -R ${BUILD_DIR}/oozie-sharelib*.tar.gz ${SERVER_LIB_DIR}/oozie-sharelib.tar.gz
ln -s -f /etc/oozie/conf/oozie-env.sh ${SERVER_LIB_DIR}/bin
-cp -R ${BUILD_DIR}/oozie-server/webapps ${SERVER_LIB_DIR}/webapps
-
-# Unpack oozie.war some place reasonable
-WEBAPP_DIR=${SERVER_LIB_DIR}/webapps/oozie
-mkdir ${WEBAPP_DIR}
-(cd ${WEBAPP_DIR} ; jar xf ${BUILD_DIR}/oozie.war)
-# OOZIE_HOME/lib
-mv -f ${WEBAPP_DIR}/WEB-INF/lib/* ${SERVER_LIB_DIR}/lib/
-touch ${SERVER_LIB_DIR}/webapps/oozie.war
-
-install -m 0755 ${EXTRA_DIR}/tomcat-deployment.sh ${SERVER_LIB_DIR}/tomcat-deployment.sh
-
-HTTP_DIRECTORY=${ETC_DIR}/tomcat-conf.http
-install -d -m 0755 ${HTTP_DIRECTORY}
-cp -R ${BUILD_DIR}/oozie-server/conf ${HTTP_DIRECTORY}/conf
-cp ${EXTRA_DIR}/context.xml ${HTTP_DIRECTORY}/conf/
-cp ${EXTRA_DIR}/catalina.properties ${HTTP_DIRECTORY}/conf/
-install -d -m 0755 ${HTTP_DIRECTORY}/WEB-INF
-mv ${SERVER_LIB_DIR}/webapps/oozie/WEB-INF/*.xml ${HTTP_DIRECTORY}/WEB-INF
-
-HTTPS_DIRECTORY=${ETC_DIR}/tomcat-conf.https
-cp -r ${HTTP_DIRECTORY} ${HTTPS_DIRECTORY}
-mv ${HTTPS_DIRECTORY}/conf/ssl/ssl-server.xml ${HTTPS_DIRECTORY}/conf/server.xml
-mv ${HTTPS_DIRECTORY}/conf/ssl/ssl-web.xml ${HTTPS_DIRECTORY}/WEB-INF/web.xml
-rm -r ${HTTP_DIRECTORY}/conf/ssl
+cp -R ${BUILD_DIR}/embedded-oozie-server/webapp ${SERVER_LIB_DIR}/webapp
+cp ${BUILD_DIR}/embedded-oozie-server/dependency/* ${SERVER_LIB_DIR}/lib/
cp -R ${BUILD_DIR}/libtools ${SERVER_LIB_DIR}/
+cp ${BUILD_DIR}/oozie-core/* ${SERVER_LIB_DIR}/lib/
# Provide a convenience symlink to be more consistent with tarball deployment
ln -s ${DATA_DIR#${SERVER_PREFIX}} ${SERVER_LIB_DIR}/libext
diff --git a/bigtop-packages/src/common/oozie/patch0-ADH-204-remove-h2-pig-classifier-in-Oozie-code.diff b/bigtop-packages/src/common/oozie/patch0-ADH-204-remove-h2-pig-classifier-in-Oozie-code.diff
deleted file mode 100644
index 5d9c0ec..0000000
--- a/bigtop-packages/src/common/oozie/patch0-ADH-204-remove-h2-pig-classifier-in-Oozie-code.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From a9591e083a6c5a63a38e46792fd65687764bdf64 Mon Sep 17 00:00:00 2001
-From: Anton Chevychalov <ca...@arenadata.io>
-Date: Fri, 29 Sep 2017 19:06:01 +0300
-Subject: [PATCH] ADH-204 remove h2 pig classifier in Oozie code
-
-There is a regression in Pig relase 0.17
-After PIG-4923 they drop h2 classifer.
-There is only one jar now and it suports Hadoop 2
----
- pom.xml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index 9daf6b1..5d92d77 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1902,7 +1902,6 @@
- <properties>
- <hadoop.version>2.4.0</hadoop.version>
- <hadoop.majorversion>2</hadoop.majorversion>
-- <pig.classifier>h2</pig.classifier>
- <sqoop.classifier>hadoop200</sqoop.classifier>
- <jackson.version>1.9.13</jackson.version>
- </properties>
---
-2.7.4
-
diff --git a/bigtop-packages/src/common/oozie/patch0-hadoop322-hive312.diff b/bigtop-packages/src/common/oozie/patch0-hadoop322-hive312.diff
new file mode 100644
index 0000000..ea1cc58
--- /dev/null
+++ b/bigtop-packages/src/common/oozie/patch0-hadoop322-hive312.diff
@@ -0,0 +1,228 @@
+diff --git a/core/pom.xml b/core/pom.xml
+index a60d5b909..83f19b138 100644
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -255,6 +255,12 @@
+ <scope>compile</scope>
+ </dependency>
+
++ <dependency>
++ <groupId>org.apache.logging.log4j</groupId>
++ <artifactId>log4j-1.2-api</artifactId>
++ <version>2.10.0</version>
++ </dependency>
++
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>apache-log4j-extras</artifactId>
+diff --git a/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java b/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
+index c60c811ac..3ce6a3629 100644
+--- a/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
++++ b/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
+@@ -47,7 +47,7 @@ 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.hive.metastore.security.DelegationTokenIdentifier;
+ import org.apache.hadoop.io.Text;
+ import org.apache.hadoop.security.token.Token;
+
+diff --git a/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java b/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
+index d7b637fec..7f70ad899 100644
+--- a/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
++++ b/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
+@@ -26,8 +26,10 @@ import java.net.URI;
+ import java.nio.charset.StandardCharsets;
+ import java.util.Date;
+
+-import org.apache.commons.httpclient.HttpClient;
+-import org.apache.commons.httpclient.methods.GetMethod;
++import org.apache.http.HttpResponse;
++import org.apache.http.client.HttpClient;
++import org.apache.http.client.methods.HttpGet;
++import org.apache.http.impl.client.DefaultHttpClient;
+ import org.apache.hadoop.fs.FileSystem;
+ import org.apache.hadoop.fs.Path;
+ import org.apache.oozie.client.rest.JsonTags;
+@@ -97,11 +99,12 @@ public class TestHAShareLibService extends ZKXTestCase {
+ dummyOozie_1 = new DummyZKOozie("9876", container.getServletURL("/other-oozie-server/*"));
+ String url = container.getServletURL("/v2/admin/*") + "update_sharelib?" + RestConstants.ALL_SERVER_REQUEST
+ + "=true";
+- HttpClient client = new HttpClient();
+- GetMethod method = new GetMethod(url);
+- int statusCode = client.executeMethod(method);
++ HttpClient client = new DefaultHttpClient();
++ HttpGet method = new HttpGet(url);
++ HttpResponse httpResponse = client.execute(method);
++ int statusCode = httpResponse.getStatusLine().getStatusCode();
+ assertEquals(HttpURLConnection.HTTP_OK, statusCode);
+- Reader reader = new InputStreamReader(method.getResponseBodyAsStream(), StandardCharsets.UTF_8);
++ Reader reader = new InputStreamReader(httpResponse.getEntity().getContent(), StandardCharsets.UTF_8);
+ JSONArray sharelib = (JSONArray) JSONValue.parse(reader);
+ assertEquals(2, sharelib.size());
+ // 1st server update is successful
+@@ -117,9 +120,10 @@ public class TestHAShareLibService extends ZKXTestCase {
+ // 3rd server not defined.should throw exception.
+ dummyOozie_2 = new DummyZKOozie("9873", container.getServletURL("/") + "not-defined/");
+
+- statusCode = client.executeMethod(method);
++ httpResponse = client.execute(method);
++ statusCode = httpResponse.getStatusLine().getStatusCode();
+ assertEquals(HttpURLConnection.HTTP_OK, statusCode);
+- reader = new InputStreamReader(method.getResponseBodyAsStream(),StandardCharsets.UTF_8);
++ reader = new InputStreamReader(httpResponse.getEntity().getContent(), StandardCharsets.UTF_8);
+ sharelib = (JSONArray) JSONValue.parse(reader);
+ assertEquals(3, sharelib.size());
+
+diff --git a/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java b/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java
+index 85b0e97be..32155860b 100644
+--- a/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java
++++ b/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java
+@@ -37,6 +37,7 @@ import org.apache.hadoop.fs.FileSystem;
+ import org.apache.hadoop.fs.Path;
+ import org.apache.hadoop.hive.conf.HiveConf;
+ import org.apache.hadoop.hive.metastore.HiveMetaStore;
++import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge;
+ import org.apache.hadoop.hive.shims.ShimLoader;
+ import org.apache.hive.hcatalog.api.HCatAddPartitionDesc;
+ import org.apache.hive.hcatalog.api.HCatClient;
+@@ -131,7 +132,7 @@ public class MiniHCatServer {
+ @Override
+ public void run() {
+ try {
+- HiveMetaStore.startMetaStore(msPort, ShimLoader.getHadoopThriftAuthBridge(), serverConf);
++ HiveMetaStore.startMetaStore(msPort, HadoopThriftAuthBridge.getBridge(), serverConf);
+ LOG.info("Started metastore server on port " + msPort);
+ }
+ catch (Throwable e) {
+diff --git a/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java b/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
+index 6d663c375..3be398fbe 100644
+--- a/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
++++ b/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
+@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.Path;
+ import org.apache.hadoop.hive.conf.HiveConf;
+ import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+ import org.apache.hadoop.hive.metastore.HiveMetaStore;
+-import org.apache.hadoop.hive.metastore.MetaStoreUtils;
++import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
+ import org.apache.hadoop.hive.shims.HadoopShims.MiniDFSShim;
+ import org.apache.hadoop.hive.shims.HadoopShims.MiniMrShim;
+ import org.apache.hadoop.hive.shims.ShimLoader;
+diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml
+index e506c8305..a71f08646 100644
+--- a/sharelib/spark/pom.xml
++++ b/sharelib/spark/pom.xml
+@@ -209,30 +209,6 @@
+ <version>${spark.version}</version>
+ <scope>compile</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.apache.spark</groupId>
+- <artifactId>spark-streaming-flume_${spark.scala.binary.version}</artifactId>
+- <version>${spark.version}</version>
+- <scope>compile</scope>
+- <exclusions>
+- <exclusion>
+- <groupId>org.mortbay.jetty</groupId>
+- <artifactId>jetty</artifactId>
+- </exclusion>
+- </exclusions>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.spark</groupId>
+- <artifactId>spark-streaming-kafka_${spark.scala.binary.version}</artifactId>
+- <version>${spark.streaming.kafka.version}</version>
+- <scope>compile</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.spark</groupId>
+- <artifactId>spark-bagel_${spark.scala.binary.version}</artifactId>
+- <version>${spark.bagel.version}</version>
+- <scope>compile</scope>
+- </dependency>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+diff --git a/tools/src/test/java/org/apache/hadoop/hdfs/protocol/SystemErasureCodingPolicies.java b/tools/src/test/java/org/apache/hadoop/hdfs/protocol/SystemErasureCodingPolicies.java
+index d5c5f9ee6..f493c7c19 100644
+--- a/tools/src/test/java/org/apache/hadoop/hdfs/protocol/SystemErasureCodingPolicies.java
++++ b/tools/src/test/java/org/apache/hadoop/hdfs/protocol/SystemErasureCodingPolicies.java
+@@ -18,32 +18,34 @@
+
+ package org.apache.hadoop.hdfs.protocol;
+
++import org.apache.hadoop.io.erasurecode.ErasureCodeConstants;
+
+ /**
+ * Mock class for testing, called from ECPolicyDisabler with reflection.
+ *
+ */
+ public class SystemErasureCodingPolicies {
+- private static ReplicationPolicy systemPolicy = ReplicationPolicy.DEFAULT;
++ private static ErasureCodingPolicy systemPolicy = ReplicationPolicy.DEFAULT;
+
+ public static class ReplicationPolicy {
+- public final static ReplicationPolicy DEFAULT = new ReplicationPolicy("DEFAULT");
+- public final static ReplicationPolicy OTHER = new ReplicationPolicy("OTHER");
+- private String name;
+- public ReplicationPolicy(String name) {
+- this.name = name;
+- }
+-
+- public String getName() {
+- return name;
+- }
++ private static final int DEFAULT_CELLSIZE = 1024 * 1024;
++ public static final ErasureCodingPolicy DEFAULT =
++ new ErasureCodingPolicy("default",
++ ErasureCodeConstants.REPLICATION_1_2_SCHEMA,
++ DEFAULT_CELLSIZE,
++ ErasureCodeConstants.REPLICATION_POLICY_ID);
++ public static final ErasureCodingPolicy OTHER =
++ new ErasureCodingPolicy("other",
++ ErasureCodeConstants.REPLICATION_1_2_SCHEMA,
++ DEFAULT_CELLSIZE,
++ ErasureCodeConstants.REPLICATION_POLICY_ID);
+ }
+
+- public static ReplicationPolicy getReplicationPolicy() {
++ public static ErasureCodingPolicy getReplicationPolicy() {
+ return systemPolicy;
+ }
+
+- public static void setSystemPolicy(ReplicationPolicy systemPolicy) {
++ public static void setSystemPolicy(ErasureCodingPolicy systemPolicy) {
+ SystemErasureCodingPolicies.systemPolicy = systemPolicy;
+ }
+ }
+diff --git a/tools/src/test/java/org/apache/oozie/tools/TestECPolicyDisabler.java b/tools/src/test/java/org/apache/oozie/tools/TestECPolicyDisabler.java
+index c2ba314c8..e63b15e22 100644
+--- a/tools/src/test/java/org/apache/oozie/tools/TestECPolicyDisabler.java
++++ b/tools/src/test/java/org/apache/oozie/tools/TestECPolicyDisabler.java
+@@ -30,6 +30,7 @@ import static org.mockito.Mockito.when;
+ import org.apache.hadoop.fs.FileSystem;
+ import org.apache.hadoop.fs.Path;
+ import org.apache.hadoop.hdfs.DistributedFileSystem;
++import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
+ import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies;
+ import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies.ReplicationPolicy;
+ import org.apache.hadoop.ipc.RemoteException;
+@@ -47,7 +48,7 @@ import org.mockito.Mockito;
+ public class TestECPolicyDisabler {
+
+ static abstract class MockDistributedFileSystem extends DistributedFileSystem {
+- public abstract SystemErasureCodingPolicies.ReplicationPolicy getErasureCodingPolicy(Path path);
++ public abstract ErasureCodingPolicy getErasureCodingPolicy(Path path);
+ public abstract void setErasureCodingPolicy(Path path, String policy);
+ }
+
+@@ -111,7 +112,7 @@ public class TestECPolicyDisabler {
+ MockDistributedFileSystem fs = mock(MockDistributedFileSystem.class);
+ when(fs.getErasureCodingPolicy(any())).thenReturn(ReplicationPolicy.OTHER);
+
+- ReplicationPolicy mockPolicy = mock(ReplicationPolicy.class);
++ ErasureCodingPolicy mockPolicy = mock(ErasureCodingPolicy.class);
+ SystemErasureCodingPolicies.setSystemPolicy(mockPolicy);
+ when(mockPolicy.getName()).thenThrow(createNoSuchMethodException());
+ ECPolicyDisabler.Result result = ECPolicyDisabler.check(fs, null);
diff --git a/bigtop-packages/src/common/oozie/patch1-BIGTOP-3099-log4j2.diff b/bigtop-packages/src/common/oozie/patch1-BIGTOP-3099-log4j2.diff
deleted file mode 100644
index f37a29c..0000000
--- a/bigtop-packages/src/common/oozie/patch1-BIGTOP-3099-log4j2.diff
+++ /dev/null
@@ -1,287 +0,0 @@
-From 55f14ed095900fa7cd3bbfe3b32b8d84d750925d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=92?=
- =?UTF-8?q?=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=92=D0=BB=D0=B0=D0=B4=D0=B8?=
- =?UTF-8?q?=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B8=D1=87?=
- <vi...@gmail.com>
-Date: Fri, 5 Oct 2018 16:19:43 +0300
-Subject: [PATCH] Build oozie
-
----
- examples/pom.xml | 10 ++---
- examples/src/main/apps/custom-main/workflow.xml | 28 -------------
- examples/src/main/apps/pig/id.pig | 20 ---------
- examples/src/main/apps/pig/job.properties | 26 ------------
- examples/src/main/apps/pig/workflow.xml | 48 ----------------------
- .../java/org/apache/oozie/example/DemoPigMain.java | 24 -----------
- pom.xml | 10 +++++
- sharelib/pom.xml | 2 +-
- webapp/pom.xml | 4 +-
- 9 files changed, 18 insertions(+), 154 deletions(-)
- delete mode 100644 examples/src/main/apps/pig/id.pig
- delete mode 100644 examples/src/main/apps/pig/job.properties
- delete mode 100644 examples/src/main/apps/pig/workflow.xml
- delete mode 100644 examples/src/main/java/org/apache/oozie/example/DemoPigMain.java
-
-diff --git a/examples/pom.xml b/examples/pom.xml
-index 3e36ec1..e11df02 100644
---- a/examples/pom.xml
-+++ b/examples/pom.xml
-@@ -68,11 +68,11 @@
- <scope>provided</scope>
- </dependency>
-
-- <dependency>
-- <groupId>org.apache.oozie</groupId>
-- <artifactId>oozie-sharelib-pig</artifactId>
-- <scope>compile</scope>
-- </dependency>
-+ <!--<dependency>-->
-+ <!--<groupId>org.apache.oozie</groupId>-->
-+ <!--<artifactId>oozie-sharelib-pig</artifactId>-->
-+ <!--<scope>compile</scope>-->
-+ <!--</dependency>-->
-
- <dependency>
- <groupId>org.apache.oozie</groupId>
-diff --git a/examples/src/main/apps/custom-main/workflow.xml b/examples/src/main/apps/custom-main/workflow.xml
-index 828dfaa..47cc5de 100644
---- a/examples/src/main/apps/custom-main/workflow.xml
-+++ b/examples/src/main/apps/custom-main/workflow.xml
-@@ -70,34 +70,6 @@
- <error to="fail"/>
- </action>
-
-- <action name="pig-node">
-- <pig>
-- <job-tracker>${jobTracker}</job-tracker>
-- <name-node>${nameNode}</name-node>
-- <prepare>
-- <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/custom-main/pig-node"/>
-- </prepare>
-- <configuration>
-- <property>
-- <name>mapred.job.queue.name</name>
-- <value>${queueName}</value>
-- </property>
--
-- <!-- Using a custom PigMain class-->
-- <property>
-- <name>oozie.launcher.action.main.class</name>
-- <value>org.apache.oozie.example.DemoPigMain</value>
-- </property>
--
-- </configuration>
-- <script>id.pig</script>
-- <param>INPUT=/user/${wf:user()}/${examplesRoot}/output-data/custom-main/mr-node</param>
-- <param>OUTPUT=/user/${wf:user()}/${examplesRoot}/output-data/custom-main/pig-node</param>
-- </pig>
-- <ok to="end"/>
-- <error to="fail"/>
-- </action>
--
- <kill name="fail">
- <message>Demo workflow failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
- </kill>
-diff --git a/examples/src/main/apps/pig/id.pig b/examples/src/main/apps/pig/id.pig
-deleted file mode 100644
-index a8a3249..0000000
---- a/examples/src/main/apps/pig/id.pig
-+++ /dev/null
-@@ -1,20 +0,0 @@
----
---- Licensed to the Apache Software Foundation (ASF) under one
---- or more contributor license agreements. See the NOTICE file
---- distributed with this work for additional information
---- regarding copyright ownership. The ASF licenses this file
---- to you under the Apache License, Version 2.0 (the
---- "License"); you may not use this file except in compliance
---- with the License. You may obtain a copy of the License at
----
---- http://www.apache.org/licenses/LICENSE-2.0
----
---- Unless required by applicable law or agreed to in writing, software
---- distributed under the License is distributed on an "AS IS" BASIS,
---- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---- See the License for the specific language governing permissions and
---- limitations under the License.
----
--A = load '$INPUT' using PigStorage(':');
--B = foreach A generate $0 as id;
--store B into '$OUTPUT' USING PigStorage();
-diff --git a/examples/src/main/apps/pig/job.properties b/examples/src/main/apps/pig/job.properties
-deleted file mode 100644
-index 53e94ea..0000000
---- a/examples/src/main/apps/pig/job.properties
-+++ /dev/null
-@@ -1,26 +0,0 @@
--#
--# Licensed to the Apache Software Foundation (ASF) under one
--# or more contributor license agreements. See the NOTICE file
--# distributed with this work for additional information
--# regarding copyright ownership. The ASF licenses this file
--# to you under the Apache License, Version 2.0 (the
--# "License"); you may not use this file except in compliance
--# with the License. You may obtain a copy of the License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the License is distributed on an "AS IS" BASIS,
--# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--# See the License for the specific language governing permissions and
--# limitations under the License.
--#
--
--nameNode=hdfs://localhost:8020
--jobTracker=localhost:8021
--queueName=default
--examplesRoot=examples
--
--oozie.use.system.libpath=true
--
--oozie.wf.application.path=${nameNode}/user/${user.name}/${examplesRoot}/apps/pig
-diff --git a/examples/src/main/apps/pig/workflow.xml b/examples/src/main/apps/pig/workflow.xml
-deleted file mode 100644
-index 8da2b66..0000000
---- a/examples/src/main/apps/pig/workflow.xml
-+++ /dev/null
-@@ -1,48 +0,0 @@
--<!--
-- Licensed to the Apache Software Foundation (ASF) under one
-- or more contributor license agreements. See the NOTICE file
-- distributed with this work for additional information
-- regarding copyright ownership. The ASF licenses this file
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
---->
--<workflow-app xmlns="uri:oozie:workflow:0.2" name="pig-wf">
-- <start to="pig-node"/>
-- <action name="pig-node">
-- <pig>
-- <job-tracker>${jobTracker}</job-tracker>
-- <name-node>${nameNode}</name-node>
-- <prepare>
-- <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/pig"/>
-- </prepare>
-- <configuration>
-- <property>
-- <name>mapred.job.queue.name</name>
-- <value>${queueName}</value>
-- </property>
-- <property>
-- <name>mapred.compress.map.output</name>
-- <value>true</value>
-- </property>
-- </configuration>
-- <script>id.pig</script>
-- <param>INPUT=/user/${wf:user()}/${examplesRoot}/input-data/text</param>
-- <param>OUTPUT=/user/${wf:user()}/${examplesRoot}/output-data/pig</param>
-- </pig>
-- <ok to="end"/>
-- <error to="fail"/>
-- </action>
-- <kill name="fail">
-- <message>Pig failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
-- </kill>
-- <end name="end"/>
--</workflow-app>
-diff --git a/examples/src/main/java/org/apache/oozie/example/DemoPigMain.java b/examples/src/main/java/org/apache/oozie/example/DemoPigMain.java
-deleted file mode 100644
-index 65c4e9b..0000000
---- a/examples/src/main/java/org/apache/oozie/example/DemoPigMain.java
-+++ /dev/null
-@@ -1,24 +0,0 @@
--/**
-- * Licensed to the Apache Software Foundation (ASF) under one
-- * or more contributor license agreements. See the NOTICE file
-- * distributed with this work for additional information
-- * regarding copyright ownership. The ASF licenses this file
-- * to you under the Apache License, Version 2.0 (the
-- * "License"); you may not use this file except in compliance
-- * with the License. You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--package org.apache.oozie.example;
--
--import org.apache.oozie.action.hadoop.PigMain;
--
--public class DemoPigMain extends PigMain {
--}
-diff --git a/pom.xml b/pom.xml
-index 5d92d77..d8fa9ae 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -481,6 +481,10 @@
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-cli</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.apache.logging.log4j</groupId>
-+ <artifactId>log4j-1.2-api</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
-@@ -1403,6 +1407,12 @@
- <artifactId>hive-exec</artifactId>
- <version>${hive.version}</version>
- <classifier>${hive.classifier}</classifier>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.apache.logging.log4j</groupId>
-+ <artifactId>log4j-1.2-api</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
-
- <!-- examples -->
-diff --git a/sharelib/pom.xml b/sharelib/pom.xml
-index 9f8aff1..538641f 100644
---- a/sharelib/pom.xml
-+++ b/sharelib/pom.xml
-@@ -34,7 +34,7 @@
- <modules>
- <module>streaming</module>
- <module>hcatalog</module>
-- <module>pig</module>
-+ <!--<module>pig</module>-->
- <module>hive</module>
- <module>hive2</module>
- <module>sqoop</module>
-diff --git a/webapp/pom.xml b/webapp/pom.xml
-index dc2298c..4aea7f3 100644
---- a/webapp/pom.xml
-+++ b/webapp/pom.xml
-@@ -170,10 +170,10 @@
- </goals>
- <configuration>
- <artifactItems>
-- <artifactItem>
-+ <!--<artifactItem>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-sharelib-pig</artifactId>
-- </artifactItem>
-+ </artifactItem>-->
- <artifactItem>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-sharelib-hive</artifactId>
---
-1.9.1
-
diff --git a/bigtop-packages/src/common/oozie/patch2-server-xml-tomcat85.diff b/bigtop-packages/src/common/oozie/patch2-server-xml-tomcat85.diff
deleted file mode 100644
index 6cec0c1..0000000
--- a/bigtop-packages/src/common/oozie/patch2-server-xml-tomcat85.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/distro/src/main/tomcat/server.xml b/distro/src/main/tomcat/server.xml
-index e4fcfcc..2234aba 100644
---- a/distro/src/main/tomcat/server.xml
-+++ b/distro/src/main/tomcat/server.xml
-@@ -24,12 +24,9 @@
-
- <!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
-- <Listener className="org.apache.catalina.core.JasperListener" />
- <!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-
- <!-- Global JNDI resources
diff --git a/bigtop-packages/src/common/oozie/patch3-OOZIE-3502-branch-4.3.diff b/bigtop-packages/src/common/oozie/patch3-OOZIE-3502-branch-4.3.diff
deleted file mode 100644
index 157a7a7..0000000
--- a/bigtop-packages/src/common/oozie/patch3-OOZIE-3502-branch-4.3.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 9daf6b1..f6f6b8b 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -41,7 +41,7 @@
-
- <organization>
- <name>Apache Software Foundation</name>
-- <url>http://www.apache.org</url>
-+ <url>https://www.apache.org</url>
- </organization>
-
- <properties>
-@@ -136,7 +136,7 @@
- <repositories>
- <repository>
- <id>central</id>
-- <url>http://repo1.maven.org/maven2</url>
-+ <url>https://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
-@@ -150,9 +150,8 @@
- </snapshots>
- </repository>
- <repository>
-- <id>datanucleus</id>
-- <url>http://www.datanucleus.org/downloads/maven2</url>
-- <name>Datanucleus</name>
-+ <id>redhat</id>
-+ <url>https://maven.repository.redhat.com/ga/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
diff --git a/bigtop-packages/src/common/oozie/patch4-OOZIE-3446.diff b/bigtop-packages/src/common/oozie/patch4-OOZIE-3446.diff
deleted file mode 100644
index 8b17c06..0000000
--- a/bigtop-packages/src/common/oozie/patch4-OOZIE-3446.diff
+++ /dev/null
@@ -1,501 +0,0 @@
-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
deleted file mode 100644
index fd9962b..0000000
--- a/bigtop-packages/src/common/oozie/patch5-OOZIE-2733.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-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);
- }
diff --git a/bigtop-packages/src/common/oozie/tomcat-deployment.sh b/bigtop-packages/src/common/oozie/tomcat-deployment.sh
deleted file mode 100644
index c25bc72..0000000
--- a/bigtop-packages/src/common/oozie/tomcat-deployment.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script must be sourced so that it can set CATALINA_BASE for the parent process
-
-TOMCAT_CONF=${TOMCAT_CONF:-`readlink -e /etc/oozie/tomcat-conf`}
-TOMCAT_DEPLOYMENT=${TOMCAT_DEPLOYMENT:-/var/lib/oozie/tomcat-deployment}
-OOZIE_HOME=${OOZIE_HOME:-/usr/lib/oozie}
-
-rm -rf ${TOMCAT_DEPLOYMENT}
-mkdir ${TOMCAT_DEPLOYMENT}
-cp -r ${TOMCAT_CONF}/conf ${TOMCAT_DEPLOYMENT}
-cp -r ${OOZIE_HOME}/webapps ${TOMCAT_DEPLOYMENT}/webapps
-cp -r ${TOMCAT_CONF}/WEB-INF/* ${TOMCAT_DEPLOYMENT}/webapps/oozie/WEB-INF/
-
-if [ -n "${BIGTOP_CLASSPATH}" ] ; then
- sed -i -e "s#^\(common.loader=.*\)\$#\1,${BIGTOP_CLASSPATH/:/,}#" ${TOMCAT_DEPLOYMENT}/conf/catalina.properties
-fi
-
-chown -R oozie:oozie ${TOMCAT_DEPLOYMENT}
-
-export CATALINA_BASE=${TOMCAT_DEPLOYMENT}
-
diff --git a/bigtop-packages/src/deb/oozie/control b/bigtop-packages/src/deb/oozie/control
index 5a36dc4..ca65302 100644
--- a/bigtop-packages/src/deb/oozie/control
+++ b/bigtop-packages/src/deb/oozie/control
@@ -35,7 +35,7 @@ Description: Client for Oozie Workflow Engine
Package: oozie
Architecture: all
-Depends: oozie-client (= ${source:Version}), hadoop-client, bigtop-tomcat
+Depends: oozie-client (= ${source:Version}), hadoop-client
Description: Oozie is a system that runs workflows of Hadoop jobs.
Oozie is a system that runs workflows of Hadoop jobs.
Oozie workflows are actions arranged in a control dependency DAG (Direct
diff --git a/bigtop-packages/src/deb/oozie/oozie.postinst b/bigtop-packages/src/deb/oozie/oozie.postinst
index bd60245..406bbdf 100644
--- a/bigtop-packages/src/deb/oozie/oozie.postinst
+++ b/bigtop-packages/src/deb/oozie/oozie.postinst
@@ -40,10 +40,6 @@ case "$1" in
update-rc.d oozie defaults >/dev/null || exit 1
update-alternatives --install /etc/oozie/conf oozie-conf /etc/oozie/conf.dist 30
-
- conf_tomcat=/etc/oozie/tomcat-conf
- update-alternatives --install ${conf_tomcat} oozie-tomcat-conf ${conf_tomcat}.http 30
- update-alternatives --install ${conf_tomcat} oozie-tomcat-conf ${conf_tomcat}.https 20
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules
index a16f4b9..36f4af8 100755
--- a/bigtop-packages/src/deb/oozie/rules
+++ b/bigtop-packages/src/deb/oozie/rules
@@ -37,9 +37,8 @@ override_dh_auto_build:
override_dh_auto_install:
sh -x debian/install_oozie.sh --extra-dir=debian/ --build-dir=$(PWD) --server-dir=./debian/oozie --client-dir=./debian/oozie-client --docs-dir=./debian/oozie-client/usr/share/doc/oozie --initd-dir=./debian/oozie/etc/init.d --conf-dir=./debian/oozie/etc/oozie/conf.dist
- ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps/oozie/ext-2.2
- rm -rf debian/oozie/usr/lib/oozie/webapps/oozie/docs
- ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps/oozie/docs
+ rm -rf debian/oozie/usr/lib/oozie/webapp/docs
+ ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapp/docs
# Oozie server
rm -rf debian/oozie/usr/lib/oozie/lib/hadoop-*.jar
diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
index 53dd220..4e667f2 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -17,7 +17,6 @@
%define man_dir /usr/share/man
%define conf_oozie %{_sysconfdir}/%{name}/conf
%define conf_oozie_dist %{conf_oozie}.dist
-%define tomcat_conf_oozie %{_sysconfdir}/%{name}/tomcat-conf
%define data_oozie /var/lib/oozie
%define lib_hadoop /usr/lib/hadoop
@@ -61,17 +60,14 @@ Source2: install_oozie.sh
Source3: oozie.1
Source4: oozie-env.sh
Source5: oozie.init
-Source6: catalina.properties
-Source7: context.xml
Source8: hive.xml
-Source9: tomcat-deployment.sh
Source10: oozie-site.xml
Source11: bigtop.bom
#BIGTOP_PATCH_FILES
Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
-Requires: oozie-client = %{version}, hadoop-client, bigtop-tomcat
+Requires: oozie-client = %{version}, hadoop-client
BuildArch: noarch
%description
@@ -147,9 +143,8 @@ Requires: bigtop-utils >= 0.7
%__rm -rf $RPM_BUILD_ROOT
sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=$PWD --server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT --docs-dir=$RPM_BUILD_ROOT%{doc_oozie} --initd-dir=$RPM_BUILD_ROOT%{initd_dir} --conf-dir=$RPM_BUILD_ROOT%{conf_oozie_dist}
-%__ln_s -f %{data_oozie}/ext-2.2 $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/ext-2.2
-%__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
-%__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
+%__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/webapp/docs
+%__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapp/docs
# Oozie server
%__rm -rf $RPM_BUILD_ROOT/%{lib_oozie}/lib/hadoop-*.jar
@@ -178,18 +173,13 @@ getent passwd oozie >/dev/null || /usr/sbin/useradd --comment "Oozie User" --she
%post
%{alternatives_cmd} --install %{conf_oozie} %{name}-conf %{conf_oozie_dist} 30
-%{alternatives_cmd} --install %{tomcat_conf_oozie} %{name}-tomcat-conf %{tomcat_conf_oozie}.http 30
-%{alternatives_cmd} --install %{tomcat_conf_oozie} %{name}-tomcat-conf %{tomcat_conf_oozie}.https 20
/sbin/chkconfig --add oozie
%preun
if [ "$1" = 0 ]; then
- rm -r /etc/oozie/conf/tomcat-conf
/sbin/service oozie stop > /dev/null
/sbin/chkconfig --del oozie
- %{alternatives_cmd} --remove %{name}-tomcat-conf %{tomcat_conf_oozie}.http || :
- %{alternatives_cmd} --remove %{name}-tomcat-conf %{tomcat_conf_oozie}.https || :
%{alternatives_cmd} --remove %{name}-conf %{conf_oozie_dist} || :
fi
@@ -201,19 +191,17 @@ fi
%files
%defattr(-,root,root)
%config(noreplace) %{conf_oozie_dist}
-%config(noreplace) %{tomcat_conf_oozie}.*
%{usr_bin}/oozie-setup
%{lib_oozie}/bin/oozie-sys.sh
%{lib_oozie}/bin/oozie-env.sh
%{lib_oozie}/bin/oozied.sh
%{lib_oozie}/bin/ooziedb.sh
%{lib_oozie}/bin/oozie-setup.sh
-%{lib_oozie}/webapps
+%{lib_oozie}/webapp
%{lib_oozie}/libtools
%{lib_oozie}/lib
%{lib_oozie}/oozie-sharelib.tar.gz
%{lib_oozie}/libext
-%{lib_oozie}/tomcat-deployment.sh
%{initd_dir}/oozie
%defattr(-, oozie, oozie)
%dir %{_sysconfdir}/%{name}
diff --git a/bigtop.bom b/bigtop.bom
index ba33871..fe73c3b 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -197,7 +197,7 @@ bigtop {
'oozie' {
name = 'oozie'
relNotes = 'Apache Oozie'
- version { base = '4.3.0'; pkg = base; release = 1 }
+ version { base = '5.2.1'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = destination }
url { download_path = "/$name/${version.base}/"