You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by di...@apache.org on 2022/02/08 17:57:30 UTC
[oozie] branch master updated: OOZIE-3655 upgrade jdom to jdom2 2.0.6.1 (pj.fanning via dionusos)
This is an automated email from the ASF dual-hosted git repository.
dionusos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new cb3e55d OOZIE-3655 upgrade jdom to jdom2 2.0.6.1 (pj.fanning via dionusos)
cb3e55d is described below
commit cb3e55d4cb2245d7ccb949f2a9f654da906f8c28
Author: Denes Bodo <di...@apache.org>
AuthorDate: Tue Feb 8 18:51:30 2022 +0100
OOZIE-3655 upgrade jdom to jdom2 2.0.6.1 (pj.fanning via dionusos)
---
core/pom.xml | 2 +-
core/src/main/java/org/apache/oozie/DagELFunctions.java | 2 +-
core/src/main/java/org/apache/oozie/SLAEventBean.java | 2 +-
.../oozie/action/control/ControlNodeActionExecutor.java | 6 +++---
.../oozie/action/decision/DecisionActionExecutor.java | 6 +++---
.../apache/oozie/action/email/EmailActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/DistcpActionExecutor.java | 2 +-
.../org/apache/oozie/action/hadoop/FsActionExecutor.java | 2 +-
.../apache/oozie/action/hadoop/GitActionExecutor.java | 6 +++---
.../apache/oozie/action/hadoop/Hive2ActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/HiveActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/JavaActionExecutor.java | 8 ++++----
.../oozie/action/hadoop/MapReduceActionExecutor.java | 6 +++---
.../apache/oozie/action/hadoop/PigActionExecutor.java | 6 +++---
.../action/hadoop/ScriptLanguageActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/ShellActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/SparkActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/SqoopActionExecutor.java | 4 ++--
.../oozie/action/oozie/SubWorkflowActionExecutor.java | 4 ++--
.../org/apache/oozie/action/ssh/SshActionExecutor.java | 6 +++---
.../apache/oozie/command/bundle/BundleStartXCommand.java | 6 +++---
.../oozie/command/bundle/BundleSubmitXCommand.java | 6 +++---
.../command/coord/CoordActionInputCheckXCommand.java | 2 +-
.../oozie/command/coord/CoordActionReadyXCommand.java | 2 +-
.../oozie/command/coord/CoordActionStartXCommand.java | 4 ++--
.../apache/oozie/command/coord/CoordCommandUtils.java | 6 +++---
.../coord/CoordMaterializeTransitionXCommand.java | 4 ++--
.../apache/oozie/command/coord/CoordRerunXCommand.java | 4 ++--
.../oozie/command/coord/CoordSLAAlertsXCommand.java | 4 ++--
.../oozie/command/coord/CoordSLAChangeXCommand.java | 2 +-
.../apache/oozie/command/coord/CoordSubmitXCommand.java | 8 ++++----
.../apache/oozie/command/coord/CoordUpdateXCommand.java | 2 +-
.../org/apache/oozie/command/wf/ActionStartXCommand.java | 2 +-
.../java/org/apache/oozie/command/wf/ReRunXCommand.java | 4 ++--
.../java/org/apache/oozie/command/wf/SignalXCommand.java | 2 +-
.../org/apache/oozie/command/wf/SubmitHiveXCommand.java | 2 +-
.../org/apache/oozie/command/wf/SubmitHttpXCommand.java | 4 ++--
.../org/apache/oozie/command/wf/SubmitMRXCommand.java | 4 ++--
.../oozie/command/wf/SubmitScriptLanguageXCommand.java | 4 ++--
.../org/apache/oozie/command/wf/SubmitSqoopXCommand.java | 4 ++--
.../java/org/apache/oozie/command/wf/SubmitXCommand.java | 4 ++--
.../java/org/apache/oozie/coord/CoordELEvaluator.java | 2 +-
.../java/org/apache/oozie/coord/CoordELFunctions.java | 2 +-
.../src/main/java/org/apache/oozie/coord/CoordUtils.java | 4 ++--
.../input/dependency/AbstractCoordInputDependency.java | 4 ++--
.../coord/input/dependency/CoordInputDependency.java | 4 ++--
.../coord/input/dependency/CoordOldInputDependency.java | 4 ++--
.../coord/input/dependency/CoordPullInputDependency.java | 2 +-
.../input/logic/CoordInputLogicEvaluatorPhaseTwo.java | 4 ++--
.../coord/input/logic/CoordInputLogicEvaluatorUtil.java | 4 ++--
.../apache/oozie/coord/input/logic/InputLogicParser.java | 4 ++--
.../apache/oozie/service/LiteWorkflowStoreService.java | 4 ++--
.../java/org/apache/oozie/service/RecoveryService.java | 4 ++--
.../java/org/apache/oozie/service/ShareLibService.java | 2 +-
.../main/java/org/apache/oozie/servlet/SLAServlet.java | 2 +-
.../main/java/org/apache/oozie/sla/SLAOperations.java | 2 +-
.../java/org/apache/oozie/util/ParameterVerifier.java | 4 ++--
core/src/main/java/org/apache/oozie/util/XmlUtils.java | 16 ++++++++--------
.../java/org/apache/oozie/util/db/SLADbOperations.java | 2 +-
.../java/org/apache/oozie/util/db/SLADbXOperations.java | 2 +-
.../oozie/workflow/lite/LauncherConfigHandler.java | 4 ++--
.../oozie/workflow/lite/LiteWorkflowAppParser.java | 6 +++---
.../oozie/workflow/lite/LiteWorkflowValidator.java | 4 ++--
.../java/org/apache/oozie/ForTestingActionExecutor.java | 6 +++---
.../src/test/java/org/apache/oozie/TestSLAEventBean.java | 2 +-
.../oozie/action/email/TestEmailActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/TestFsActionExecutor.java | 2 +-
.../oozie/action/hadoop/TestJavaActionExecutor.java | 2 +-
.../action/hadoop/TestJavaActionExecutorLibAddition.java | 2 +-
.../action/hadoop/TestScriptLanguageActionExecutor.java | 4 ++--
.../apache/oozie/action/hadoop/TestSharelibConfigs.java | 2 +-
.../oozie/action/hadoop/TestShellActionExecutor.java | 2 +-
.../action/oozie/TestSubWorkflowActionExecutor.java | 2 +-
.../command/coord/TestCoordActionInputCheckXCommand.java | 2 +-
.../oozie/command/coord/TestCoordCommandUtils.java | 4 ++--
.../coord/TestCoordMaterializeTransitionXCommand.java | 2 +-
.../coord/TestCoordPushDependencyCheckXCommand.java | 2 +-
.../oozie/command/coord/TestCoordRerunXCommand.java | 4 ++--
.../oozie/command/coord/TestCoordSubmitXCommand.java | 4 ++--
.../oozie/command/coord/TestCoordUpdateXCommand.java | 4 ++--
.../apache/oozie/command/wf/TestActionStartXCommand.java | 4 ++--
.../apache/oozie/command/wf/TestSubmitHiveXCommand.java | 2 +-
.../apache/oozie/command/wf/TestSubmitMRXCommand.java | 4 ++--
.../apache/oozie/command/wf/TestSubmitPigXCommand.java | 2 +-
.../apache/oozie/command/wf/TestSubmitSqoopXCommand.java | 2 +-
.../org/apache/oozie/command/wf/TestSubmitXCommand.java | 2 +-
.../org/apache/oozie/coord/TestCoordELEvaluator.java | 2 +-
.../input/dependency/TestCoordOldInputDependency.java | 2 +-
.../oozie/coord/input/logic/TestCoordInputLogicPush.java | 4 ++--
.../coord/input/logic/TestCoordinatorInputLogic.java | 2 +-
.../oozie/coord/input/logic/TestInputLogicParser.java | 4 ++--
.../org/apache/oozie/service/TestShareLibService.java | 2 +-
.../test/java/org/apache/oozie/sla/TestSLAService.java | 2 +-
.../test/java/org/apache/oozie/test/XDataTestCase.java | 4 ++--
.../org/apache/oozie/util/TestELConstantsFunctions.java | 2 +-
.../test/java/org/apache/oozie/util/TestXmlUtils.java | 2 +-
.../org/apache/oozie/util/db/TestSLADbOperations.java | 2 +-
.../org/apache/oozie/util/db/TestSLADbXOperations.java | 2 +-
.../oozie/workflow/lite/TestLiteWorkflowAppParser.java | 4 ++--
pom.xml | 4 ++--
release-log.txt | 1 +
.../oozie/action/hadoop/TestGitActionExecutor.java | 2 +-
.../oozie/action/hadoop/TestHiveActionExecutor.java | 2 +-
.../oozie/action/hadoop/TestHive2ActionExecutor.java | 4 ++--
.../oozie/action/hadoop/TestPigActionExecutor.java | 2 +-
.../oozie/action/hadoop/TestSparkActionExecutor.java | 2 +-
.../oozie/action/hadoop/TestMapReduceActionExecutor.java | 2 +-
107 files changed, 186 insertions(+), 185 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index b827f33..af60423 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
+ <artifactId>jdom2</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/core/src/main/java/org/apache/oozie/DagELFunctions.java b/core/src/main/java/org/apache/oozie/DagELFunctions.java
index 8593d99..f6437c4 100644
--- a/core/src/main/java/org/apache/oozie/DagELFunctions.java
+++ b/core/src/main/java/org/apache/oozie/DagELFunctions.java
@@ -29,7 +29,7 @@ import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
import java.io.IOException;
import java.io.StringReader;
import java.util.Properties;
diff --git a/core/src/main/java/org/apache/oozie/SLAEventBean.java b/core/src/main/java/org/apache/oozie/SLAEventBean.java
index a560a43..9a85821 100644
--- a/core/src/main/java/org/apache/oozie/SLAEventBean.java
+++ b/core/src/main/java/org/apache/oozie/SLAEventBean.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.io.Writable;
import org.apache.oozie.client.rest.JsonSLAEvent;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XLog;
-import org.jdom.Element;
+import org.jdom2.Element;
@Deprecated
@Entity
diff --git a/core/src/main/java/org/apache/oozie/action/control/ControlNodeActionExecutor.java b/core/src/main/java/org/apache/oozie/action/control/ControlNodeActionExecutor.java
index c96142f..85002e9 100644
--- a/core/src/main/java/org/apache/oozie/action/control/ControlNodeActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/control/ControlNodeActionExecutor.java
@@ -25,9 +25,9 @@ import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.lite.ControlNodeHandler;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import java.util.List;
diff --git a/core/src/main/java/org/apache/oozie/action/decision/DecisionActionExecutor.java b/core/src/main/java/org/apache/oozie/action/decision/DecisionActionExecutor.java
index 472e376..da7b7b7 100644
--- a/core/src/main/java/org/apache/oozie/action/decision/DecisionActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/decision/DecisionActionExecutor.java
@@ -23,9 +23,9 @@ import org.apache.oozie.action.ActionExecutor;
import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import java.util.List;
diff --git a/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java b/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java
index e5b5c7b..f28dd34 100644
--- a/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java
@@ -58,8 +58,8 @@ import org.apache.oozie.service.Services;
import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
/**
* Email action executor. It takes to, cc, bcc addresses along with a subject and body and sends
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/DistcpActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/DistcpActionExecutor.java
index 7b925af..374bd9c 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/DistcpActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/DistcpActionExecutor.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.util.XLog;
-import org.jdom.Element;
+import org.jdom2.Element;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
index f68d3a3..11d9fb9 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
@@ -53,7 +53,7 @@ import org.apache.oozie.service.URIHandlerService;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
/**
* File system action executor. <p> This executes the file system mkdir, move and delete commands
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java
index 1c6c6a6..d121df4 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/GitActionExecutor.java
@@ -41,9 +41,9 @@ import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.action.ActionExecutorException.ErrorType;
import org.apache.oozie.service.HadoopAccessorException;
import org.apache.oozie.util.XLog;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
public class GitActionExecutor extends JavaActionExecutor {
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/Hive2ActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/Hive2ActionExecutor.java
index b30a5ef..b005b46 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/Hive2ActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/Hive2ActionExecutor.java
@@ -21,8 +21,8 @@ package org.apache.oozie.action.hadoop;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.oozie.action.ActionExecutorException;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
index fe51b5c..12f60e9 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
@@ -24,8 +24,8 @@ import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.client.XOozieClient;
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.service.HadoopAccessorService;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import java.util.ArrayList;
import java.util.List;
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 f4f1902..9fc1af9 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
@@ -88,9 +88,9 @@ import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import java.io.File;
import java.io.FileNotFoundException;
@@ -1898,7 +1898,7 @@ public class JavaActionExecutor extends ActionExecutor {
* @param action the Workflow action
* @param context executor context
* @throws org.apache.oozie.service.HadoopAccessorException if FS is not accessible
- * @throws org.jdom.JDOMException if XML parsing error occurs
+ * @throws org.jdom2.JDOMException if XML parsing error occurs
* @throws java.io.IOException if IO error occurs
* @throws java.net.URISyntaxException if processed uri is not a proper URI
*
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
index b8d3b09..13cffb4 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
@@ -53,9 +53,9 @@ import org.apache.oozie.service.HadoopAccessorException;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import static org.apache.oozie.action.hadoop.LauncherMain.CHILD_MAPREDUCE_JOB_TAGS;
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java
index 5798eb7..c1cf69b 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/PigActionExecutor.java
@@ -28,9 +28,9 @@ import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.client.XOozieClient;
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.service.HadoopAccessorService;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import org.json.simple.parser.JSONParser;
public class PigActionExecutor extends ScriptLanguageActionExecutor {
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ScriptLanguageActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/ScriptLanguageActionExecutor.java
index 196f0b7..0235f18 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/ScriptLanguageActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/ScriptLanguageActionExecutor.java
@@ -24,8 +24,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.util.XLog;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
index cea6fa0..d3be890 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
@@ -28,8 +28,8 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.yarn.util.Apps;
import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.service.ConfigurationService;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class ShellActionExecutor extends JavaActionExecutor {
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java
index 17b35e7..886b2cc 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java
@@ -26,8 +26,8 @@ import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.SparkConfigurationService;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import java.io.IOException;
import java.io.StringWriter;
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
index 8522238..bd1ee3c 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
@@ -37,8 +37,8 @@ import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class SqoopActionExecutor extends JavaActionExecutor {
diff --git a/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java b/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java
index 8a2fd71..47755de 100644
--- a/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java
@@ -44,8 +44,8 @@ import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class SubWorkflowActionExecutor extends ActionExecutor {
public static final String ACTION_TYPE = "sub-workflow";
diff --git a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
index 4e418cb..c21513f 100644
--- a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
@@ -43,9 +43,9 @@ import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
index 5401746..16b2386 100644
--- a/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
@@ -50,9 +50,9 @@ import org.apache.oozie.util.LogUtils;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
/**
* The command to start Bundle job
diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
index fee4fa3..32517c6 100644
--- a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
@@ -67,9 +67,9 @@ import org.apache.oozie.util.ParameterVerifier;
import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import org.xml.sax.SAXException;
/**
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
index b19dd50..249d124 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
@@ -56,7 +56,7 @@ import org.apache.oozie.util.StatusUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
/**
* The command to check if an action's data input paths exist in the file system.
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
index a63784d..bdf4757 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
@@ -45,7 +45,7 @@ import org.apache.oozie.service.Services;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.LogUtils;
import org.apache.oozie.util.XLog;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
public class CoordActionReadyXCommand extends CoordinatorXCommand<Void> {
private final String jobId;
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
index 9b434b7..99ab7eb 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
@@ -51,8 +51,8 @@ import org.apache.oozie.executor.jpa.CoordActionQueryExecutor.CoordActionQuery;
import org.apache.oozie.executor.jpa.JPAExecutorException;
import org.apache.oozie.executor.jpa.WorkflowJobQueryExecutor;
import org.apache.oozie.executor.jpa.WorkflowJobQueryExecutor.WorkflowJobQuery;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import java.io.IOException;
import java.io.StringReader;
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 0007334..c7cad5f 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
@@ -60,9 +60,9 @@ import org.apache.oozie.util.Pair;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import org.quartz.CronExpression;
import org.apache.commons.lang3.StringUtils;
import org.apache.oozie.CoordinatorJobBean;
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 4faa0da..fd178dd 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
@@ -56,8 +56,8 @@ import org.apache.oozie.util.StatusUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.util.db.SLADbOperations;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import java.io.IOException;
import java.io.StringReader;
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
index 4b20ebf..2797644 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
@@ -70,8 +70,8 @@ import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.util.db.SLADbOperations;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
/**
* Rerun coordinator actions by a list of dates or ids. User can specify if refresh or noCleanup.
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 c189a3c..471321f 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
@@ -38,8 +38,8 @@ import org.apache.oozie.executor.jpa.JPAExecutorException;
import org.apache.oozie.sla.SLAOperations;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public abstract class CoordSLAAlertsXCommand extends SLAAlertsXCommand {
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordSLAChangeXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordSLAChangeXCommand.java
index 4d24388..af8791d 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordSLAChangeXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordSLAChangeXCommand.java
@@ -39,7 +39,7 @@ import org.apache.oozie.sla.service.SLAService;
import org.apache.oozie.util.ELEvaluator;
import org.apache.oozie.util.Pair;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
public class CoordSLAChangeXCommand extends CoordSLAAlertsXCommand {
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
index 36c138d..22d2f77 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
@@ -86,10 +86,10 @@ import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.StringUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Attribute;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import org.xml.sax.SAXException;
/**
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 d7a2e95..c46226c 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
@@ -45,7 +45,7 @@ import org.eclipse.jgit.diff.EditList;
import org.eclipse.jgit.diff.HistogramDiff;
import org.eclipse.jgit.diff.RawText;
import org.eclipse.jgit.diff.RawTextComparator;
-import org.jdom.Element;
+import org.jdom2.Element;
/**
* This class provides the functionalities to update coordinator job XML and properties. It uses CoordSubmitXCommand
diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
index 7a9e9fe..387cbbe 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
@@ -211,7 +211,7 @@ public class ActionStartXCommand extends ActionXCommand<org.apache.oozie.command
LOG.warn("ELException in ActionStartXCommand ", ex.getMessage(), ex);
handleError(context, wfJob, wfAction);
}
- catch (org.jdom.JDOMException je) {
+ catch (org.jdom2.JDOMException je) {
caught = true;
context.setErrorInfo("ParsingError", je.getMessage());
LOG.warn("JDOMException in ActionStartXCommand ", je.getMessage(), je);
diff --git a/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
index a8a082b..3a67c25 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
@@ -77,8 +77,8 @@ import org.apache.oozie.workflow.WorkflowException;
import org.apache.oozie.workflow.WorkflowInstance;
import org.apache.oozie.workflow.WorkflowLib;
import org.apache.oozie.workflow.lite.NodeHandler;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
/**
* This is a RerunXCommand which is used for rerunn.
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
index 9a16b85..22c791b 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
@@ -68,7 +68,7 @@ import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.util.db.SLADbXOperations;
-import org.jdom.Element;
+import org.jdom2.Element;
import java.io.StringReader;
import java.util.ArrayList;
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java
index e00c522..02e6341 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitHiveXCommand.java
@@ -20,7 +20,7 @@ package org.apache.oozie.command.wf;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.client.XOozieClient;
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
public class SubmitHiveXCommand extends SubmitScriptLanguageXCommand {
public SubmitHiveXCommand(Configuration conf) {
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
index 5e39e03..5327026 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
@@ -42,8 +42,8 @@ import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.WorkflowJob;
import org.apache.oozie.client.XOozieClient;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import com.google.common.collect.ImmutableSet;
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
index 05e7595..05ba779 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
@@ -20,8 +20,8 @@ package org.apache.oozie.command.wf;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.service.WorkflowAppService;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import org.apache.oozie.client.XOozieClient;
import org.apache.oozie.command.CommandException;
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java
index fab4398..aea0a11 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitScriptLanguageXCommand.java
@@ -22,8 +22,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.action.hadoop.ActionUtils;
import org.apache.oozie.client.XOozieClient;
import org.apache.oozie.command.CommandException;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitSqoopXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitSqoopXCommand.java
index c5574c5..de8ad11 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitSqoopXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitSqoopXCommand.java
@@ -23,8 +23,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.client.XOozieClient;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.action.hadoop.ActionUtils;
-import org.jdom.Namespace;
-import org.jdom.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Element;
public class SubmitSqoopXCommand extends SubmitHttpXCommand {
public SubmitSqoopXCommand(Configuration conf) {
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
index c63a24e..afdaa07 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
@@ -59,8 +59,8 @@ import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.WorkflowJob;
import org.apache.oozie.client.SLAEvent.SlaAppType;
import org.apache.oozie.client.rest.JsonBean;
-import org.jdom.Element;
-import org.jdom.filter.ElementFilter;
+import org.jdom2.Element;
+import org.jdom2.filter.ElementFilter;
import java.util.ArrayList;
import java.util.Date;
diff --git a/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java b/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
index c869b87..6618a68 100644
--- a/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
+++ b/core/src/main/java/org/apache/oozie/coord/CoordELEvaluator.java
@@ -35,7 +35,7 @@ import org.apache.oozie.service.Services;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.ELEvaluator;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
/**
* This class provide different evaluators required at different stages
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 9de76dc..0165946 100644
--- a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
+++ b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
@@ -35,7 +35,7 @@ import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.ELEvaluator;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
import java.net.URI;
import java.text.DateFormat;
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 8c15099..5c08210 100644
--- a/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
+++ b/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
@@ -56,8 +56,8 @@ import org.apache.oozie.util.Pair;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import com.google.common.annotations.VisibleForTesting;
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 013417e..ab46f6b 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
@@ -40,8 +40,8 @@ import org.apache.oozie.coord.input.logic.CoordInputLogicEvaluatorUtil;
import org.apache.oozie.dependency.ActionDependency;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.WritableUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public abstract class AbstractCoordInputDependency implements Writable, CoordInputDependency {
protected boolean isDependencyMet = false;
diff --git a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependency.java b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependency.java
index 08f3269..94608d2 100644
--- a/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependency.java
+++ b/core/src/main/java/org/apache/oozie/coord/input/dependency/CoordInputDependency.java
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.dependency.ActionDependency;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public interface CoordInputDependency {
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 318d2ab..9e7544d 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
@@ -56,8 +56,8 @@ import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
/**
* Old approach where dependencies are stored as String.
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 b396d4f..05729de 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
@@ -36,7 +36,7 @@ import org.apache.oozie.command.coord.CoordCommandUtils;
import org.apache.oozie.coord.CoordELFunctions;
import org.apache.oozie.dependency.ActionDependency;
import org.apache.oozie.util.WritableUtils;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
public class CoordPullInputDependency extends AbstractCoordInputDependency {
private Map<String, CoordUnResolvedInputDependency> unResolvedList = new HashMap<String, CoordUnResolvedInputDependency>();
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 2f62668..ce3b6f4 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
@@ -35,8 +35,8 @@ import org.apache.oozie.coord.input.logic.CoordInputLogicEvaluatorResult.STATUS;
import org.apache.oozie.dependency.DependencyChecker;
import org.apache.oozie.util.ELEvaluator;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public class CoordInputLogicEvaluatorPhaseTwo extends CoordInputLogicEvaluatorPhaseOne {
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 8552e24..1fae87c 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
@@ -36,8 +36,8 @@ import org.apache.oozie.util.ELEvaluator;
import org.apache.oozie.util.LogUtils;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public class CoordInputLogicEvaluatorUtil {
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 b014cf3..2da1af2 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
@@ -21,8 +21,8 @@ package org.apache.oozie.coord.input.logic;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
/**
* Parses xml into jexl expression
diff --git a/core/src/main/java/org/apache/oozie/service/LiteWorkflowStoreService.java b/core/src/main/java/org/apache/oozie/service/LiteWorkflowStoreService.java
index 636fd5c..78af4df 100644
--- a/core/src/main/java/org/apache/oozie/service/LiteWorkflowStoreService.java
+++ b/core/src/main/java/org/apache/oozie/service/LiteWorkflowStoreService.java
@@ -44,8 +44,8 @@ import org.apache.oozie.workflow.lite.NodeHandler;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.lite.StartNodeDef;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/core/src/main/java/org/apache/oozie/service/RecoveryService.java b/core/src/main/java/org/apache/oozie/service/RecoveryService.java
index 64a67d6..b6581b2 100644
--- a/core/src/main/java/org/apache/oozie/service/RecoveryService.java
+++ b/core/src/main/java/org/apache/oozie/service/RecoveryService.java
@@ -69,8 +69,8 @@ import org.apache.oozie.util.XCallable;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Attribute;
-import org.jdom.Element;
+import org.jdom2.Attribute;
+import org.jdom2.Element;
/**
* The Recovery Service checks for pending actions and premater coordinator jobs older than a configured age and then
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 b5e29d3..687a157 100644
--- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
@@ -64,7 +64,7 @@ import org.apache.oozie.util.Instrumentation;
import org.apache.oozie.util.FSUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
import static org.apache.oozie.util.FSUtils.isLocalFile;
diff --git a/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java b/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java
index 8fad98b..b1edf7b 100644
--- a/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java
@@ -40,7 +40,7 @@ import org.apache.oozie.command.CommandException;
import org.apache.oozie.command.coord.SLAEventsXCommand;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
@SuppressWarnings("deprecation")
public class SLAServlet extends JsonRestServlet {
diff --git a/core/src/main/java/org/apache/oozie/sla/SLAOperations.java b/core/src/main/java/org/apache/oozie/sla/SLAOperations.java
index 8342189..5382a00 100644
--- a/core/src/main/java/org/apache/oozie/sla/SLAOperations.java
+++ b/core/src/main/java/org/apache/oozie/sla/SLAOperations.java
@@ -35,7 +35,7 @@ import org.apache.oozie.sla.service.SLAService;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
public class SLAOperations {
diff --git a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
index 5ea3cf4..c05dc34 100644
--- a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
+++ b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java
@@ -23,8 +23,8 @@ import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.oozie.ErrorCode;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import org.apache.hadoop.conf.Configuration;
diff --git a/core/src/main/java/org/apache/oozie/util/XmlUtils.java b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
index 081d709..eed64e3 100644
--- a/core/src/main/java/org/apache/oozie/util/XmlUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
@@ -50,14 +50,14 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.service.SchemaService;
import org.apache.oozie.service.SchemaService.SchemaName;
import org.apache.oozie.service.Services;
-import org.jdom.Comment;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Comment;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import org.xml.sax.SAXException;
/**
diff --git a/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java b/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java
index d11f7dc..9f29786 100644
--- a/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java
+++ b/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java
@@ -30,7 +30,7 @@ import org.apache.oozie.store.Store;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
@Deprecated
public class SLADbOperations {
diff --git a/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java b/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java
index c0a573a..1e39a61 100644
--- a/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java
+++ b/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java
@@ -27,7 +27,7 @@ import org.apache.oozie.client.SLAEvent.Status;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.service.Services;
import org.apache.oozie.util.DateUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
@Deprecated
public class SLADbXOperations {
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LauncherConfigHandler.java b/core/src/main/java/org/apache/oozie/workflow/lite/LauncherConfigHandler.java
index a6b8585..6e4fb60 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/LauncherConfigHandler.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/LauncherConfigHandler.java
@@ -20,8 +20,8 @@ package org.apache.oozie.workflow.lite;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.action.hadoop.JavaActionExecutor;
import org.apache.oozie.action.hadoop.LauncherAM;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
class LauncherConfigHandler {
private static final String LAUNCHER_MEMORY_MB = "memory.mb";
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 7fe6590..8def157 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
@@ -37,9 +37,9 @@ import org.apache.oozie.util.WritableUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.WorkflowException;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import org.xml.sax.SAXException;
import javax.xml.transform.stream.StreamSource;
diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
index e6102d8..e469103 100644
--- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
+++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowValidator.java
@@ -37,8 +37,8 @@ import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.WorkflowException;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public class LiteWorkflowValidator {
private static XLog LOG = XLog.getLog(LiteWorkflowValidator.class);
diff --git a/core/src/test/java/org/apache/oozie/ForTestingActionExecutor.java b/core/src/test/java/org/apache/oozie/ForTestingActionExecutor.java
index c9d0c98..2479d55 100644
--- a/core/src/test/java/org/apache/oozie/ForTestingActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/ForTestingActionExecutor.java
@@ -22,9 +22,9 @@ import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.action.ActionExecutor;
import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
public class ForTestingActionExecutor extends ActionExecutor {
public final static String TEST_ERROR = "TEST_ERROR";
diff --git a/core/src/test/java/org/apache/oozie/TestSLAEventBean.java b/core/src/test/java/org/apache/oozie/TestSLAEventBean.java
index 7a27118..48fe1ce 100644
--- a/core/src/test/java/org/apache/oozie/TestSLAEventBean.java
+++ b/core/src/test/java/org/apache/oozie/TestSLAEventBean.java
@@ -22,7 +22,7 @@ import java.util.Date;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java b/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java
index c27dc80..cace617 100644
--- a/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java
@@ -50,8 +50,8 @@ import org.apache.oozie.service.Services;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import com.icegreen.greenmail.util.GreenMail;
import com.icegreen.greenmail.util.GreenMailUtil;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestFsActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestFsActionExecutor.java
index e64abfe..500ddee 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestFsActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestFsActionExecutor.java
@@ -38,7 +38,7 @@ import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.test.XTestCase;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.URI;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
index 4c3cbf3..909cb1e 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
@@ -39,7 +39,7 @@ import java.util.Set;
import java.net.URI;
import java.security.PrivilegedExceptionAction;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutorLibAddition.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutorLibAddition.java
index ed2e20c..244ae66 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutorLibAddition.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutorLibAddition.java
@@ -43,7 +43,7 @@ import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import static org.apache.oozie.action.hadoop.JavaActionExecutor.ACTION_SHARELIB_FOR;
import static org.apache.oozie.action.hadoop.JavaActionExecutor.SHARELIB_EXCLUDE_SUFFIX;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java
index b877093..1e1271e 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java
@@ -25,8 +25,8 @@ import org.apache.hadoop.fs.Path;
import org.apache.oozie.action.ActionExecutor;
import org.apache.oozie.service.ServiceException;
import org.apache.oozie.service.Services;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestSharelibConfigs.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestSharelibConfigs.java
index bda5ea7..62be913 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestSharelibConfigs.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestSharelibConfigs.java
@@ -25,7 +25,7 @@ import org.apache.oozie.test.MiniOozieTestCase;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Before;
import java.io.ByteArrayInputStream;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
index e2427db..2eedb5f 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
@@ -36,7 +36,7 @@ import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Assert;
public class TestShellActionExecutor extends ActionExecutorTestCase {
diff --git a/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java b/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
index 2215749..3960b26 100644
--- a/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
@@ -38,7 +38,7 @@ import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.service.XLogService;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import java.io.IOException;
import java.io.OutputStreamWriter;
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
index 45d3809..a94997e 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
@@ -55,7 +55,7 @@ import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Test;
public class TestCoordActionInputCheckXCommand extends XDataTestCase {
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java
index 6f0373d..ae13881 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java
@@ -43,8 +43,8 @@ import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
index 15e9355..fcb4756 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
@@ -55,7 +55,7 @@ import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
@SuppressWarnings("deprecation")
public class TestCoordMaterializeTransitionXCommand extends XDataTestCase {
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java
index 86f63b7..d8ebc1e 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java
@@ -45,7 +45,7 @@ import org.apache.oozie.service.Services;
import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.HCatURI;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
index 7f20f19..e6a2389 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
@@ -67,8 +67,8 @@ import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.util.XConfiguration;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public class TestCoordRerunXCommand extends XDataTestCase {
private Services services;
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
index 06f05cd..d5a04e3 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
@@ -54,8 +54,8 @@ import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.JobUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class TestCoordSubmitXCommand extends XDataTestCase {
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java
index 0bf5bad..7b7f293 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java
@@ -53,8 +53,8 @@ import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class TestCoordUpdateXCommand extends XDataTestCase {
private Services services;
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
index 611b1dd..ffc7de0 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
@@ -61,8 +61,8 @@ import org.apache.oozie.workflow.WorkflowInstance;
import org.apache.oozie.workflow.lite.EndNodeDef;
import org.apache.oozie.workflow.lite.LiteWorkflowApp;
import org.apache.oozie.workflow.lite.StartNodeDef;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class TestActionStartXCommand extends XDataTestCase {
private Services services;
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitHiveXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitHiveXCommand.java
index 98c94a7..dadfb49 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitHiveXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitHiveXCommand.java
@@ -27,7 +27,7 @@ import org.apache.oozie.test.XFsTestCase;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.service.XLogService;
-import org.jdom.Element;
+import org.jdom2.Element;
public class TestSubmitHiveXCommand extends XFsTestCase {
@Override
protected void setUp() throws Exception {
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitMRXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitMRXCommand.java
index 388ff94..245908f 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitMRXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitMRXCommand.java
@@ -28,8 +28,8 @@ import org.apache.oozie.test.XFsTestCase;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.service.XLogService;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitPigXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitPigXCommand.java
index c3cd1aa..e0f5fc3 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitPigXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitPigXCommand.java
@@ -27,7 +27,7 @@ import org.apache.oozie.test.XFsTestCase;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.service.XLogService;
-import org.jdom.Element;
+import org.jdom2.Element;
public class TestSubmitPigXCommand extends XFsTestCase {
@Override
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitSqoopXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitSqoopXCommand.java
index f2f248a..e09e896 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitSqoopXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitSqoopXCommand.java
@@ -27,7 +27,7 @@ import org.apache.oozie.test.XFsTestCase;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.service.XLogService;
-import org.jdom.Element;
+import org.jdom2.Element;
public class TestSubmitSqoopXCommand extends XFsTestCase {
@Override
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
index c27ce23..aec6328 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
@@ -49,7 +49,7 @@ import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.service.XLogService;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
public class TestSubmitXCommand extends XDataTestCase {
@Override
diff --git a/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java b/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
index 5e9a121..4db963e 100644
--- a/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
+++ b/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
@@ -28,7 +28,7 @@ import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.ELEvaluator;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
public class TestCoordELEvaluator extends XTestCase {
diff --git a/core/src/test/java/org/apache/oozie/coord/input/dependency/TestCoordOldInputDependency.java b/core/src/test/java/org/apache/oozie/coord/input/dependency/TestCoordOldInputDependency.java
index c6bd3c0..ede67b8 100644
--- a/core/src/test/java/org/apache/oozie/coord/input/dependency/TestCoordOldInputDependency.java
+++ b/core/src/test/java/org/apache/oozie/coord/input/dependency/TestCoordOldInputDependency.java
@@ -23,7 +23,7 @@ import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.service.Services;
import org.apache.oozie.test.XHCatTestCase;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
import java.io.IOException;
diff --git a/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordInputLogicPush.java b/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordInputLogicPush.java
index d69804a..968e560 100644
--- a/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordInputLogicPush.java
+++ b/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordInputLogicPush.java
@@ -57,8 +57,8 @@ import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
public class TestCoordInputLogicPush extends XHCatTestCase {
diff --git a/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordinatorInputLogic.java b/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordinatorInputLogic.java
index 4e2d535..0db033c 100644
--- a/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordinatorInputLogic.java
+++ b/core/src/test/java/org/apache/oozie/coord/input/logic/TestCoordinatorInputLogic.java
@@ -57,7 +57,7 @@ import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/oozie/coord/input/logic/TestInputLogicParser.java b/core/src/test/java/org/apache/oozie/coord/input/logic/TestInputLogicParser.java
index e2ad1b5..4dab5a2 100644
--- a/core/src/test/java/org/apache/oozie/coord/input/logic/TestInputLogicParser.java
+++ b/core/src/test/java/org/apache/oozie/coord/input/logic/TestInputLogicParser.java
@@ -23,8 +23,8 @@ package org.apache.oozie.coord.input.logic;
import org.apache.oozie.coord.input.logic.InputLogicParser;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/oozie/service/TestShareLibService.java b/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
index 24766ce..92a4fe5 100644
--- a/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
@@ -65,7 +65,7 @@ import org.apache.oozie.util.FSUtils;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/oozie/sla/TestSLAService.java b/core/src/test/java/org/apache/oozie/sla/TestSLAService.java
index 1e19923..9dd99b9 100644
--- a/core/src/test/java/org/apache/oozie/sla/TestSLAService.java
+++ b/core/src/test/java/org/apache/oozie/sla/TestSLAService.java
@@ -47,7 +47,7 @@ import org.apache.oozie.sla.service.SLAService;
import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.WorkflowInstance;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/oozie/test/XDataTestCase.java b/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
index fb1d507..ed4f969 100644
--- a/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
@@ -103,8 +103,8 @@ import org.apache.oozie.workflow.lite.EndNodeDef;
import org.apache.oozie.workflow.lite.LiteWorkflowApp;
import org.apache.oozie.workflow.lite.LiteWorkflowInstance;
import org.apache.oozie.workflow.lite.StartNodeDef;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
import com.google.common.annotations.VisibleForTesting;
diff --git a/core/src/test/java/org/apache/oozie/util/TestELConstantsFunctions.java b/core/src/test/java/org/apache/oozie/util/TestELConstantsFunctions.java
index 811281a..8e23aab 100644
--- a/core/src/test/java/org/apache/oozie/util/TestELConstantsFunctions.java
+++ b/core/src/test/java/org/apache/oozie/util/TestELConstantsFunctions.java
@@ -19,7 +19,7 @@
package org.apache.oozie.util;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
diff --git a/core/src/test/java/org/apache/oozie/util/TestXmlUtils.java b/core/src/test/java/org/apache/oozie/util/TestXmlUtils.java
index 133789c..62f43d0 100644
--- a/core/src/test/java/org/apache/oozie/util/TestXmlUtils.java
+++ b/core/src/test/java/org/apache/oozie/util/TestXmlUtils.java
@@ -19,7 +19,7 @@
package org.apache.oozie.util;
import org.junit.Test;
-import org.jdom.input.JDOMParseException;
+import org.jdom2.input.JDOMParseException;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
diff --git a/core/src/test/java/org/apache/oozie/util/db/TestSLADbOperations.java b/core/src/test/java/org/apache/oozie/util/db/TestSLADbOperations.java
index 295aa82..195a0f3 100644
--- a/core/src/test/java/org/apache/oozie/util/db/TestSLADbOperations.java
+++ b/core/src/test/java/org/apache/oozie/util/db/TestSLADbOperations.java
@@ -24,7 +24,7 @@ import org.apache.oozie.client.SLAEvent;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/oozie/util/db/TestSLADbXOperations.java b/core/src/test/java/org/apache/oozie/util/db/TestSLADbXOperations.java
index 2876958..d916cb1 100644
--- a/core/src/test/java/org/apache/oozie/util/db/TestSLADbXOperations.java
+++ b/core/src/test/java/org/apache/oozie/util/db/TestSLADbXOperations.java
@@ -24,7 +24,7 @@ import org.apache.oozie.client.SLAEvent;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
index 157d406..3aeb6c0 100644
--- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
+++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
@@ -42,8 +42,8 @@ import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.WorkflowException;
import org.apache.oozie.workflow.lite.TestLiteWorkflowLib.TestActionNodeHandler;
import org.apache.oozie.workflow.lite.TestLiteWorkflowLib.TestDecisionNodeHandler;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import org.junit.Assert;
public class TestLiteWorkflowAppParser extends XTestCase {
diff --git a/pom.xml b/pom.xml
index aac0381..12d6560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1347,8 +1347,8 @@
<dependency>
<groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.6.1</version>
</dependency>
<dependency>
diff --git a/release-log.txt b/release-log.txt
index e1edc8a..3bbfc69 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.3.0 release (trunk - unreleased)
+OOZIE-3655 upgrade jdom to jdom2 2.0.6.1 (pj.fanning via dionusos)
OOZIE-3653 Upgrade commons-io to 2.11.0 (groot via dionusos)
OOZIE-3657 Upgrade Jetty to 9.4.44.v20210927 (pj.fanning via asalamon74)
OOZIE-3650 Upgrade jackson version to 2.6.7 (pj.fanning via asalamon74)
diff --git a/sharelib/git/src/test/java/org/apache/oozie/action/hadoop/TestGitActionExecutor.java b/sharelib/git/src/test/java/org/apache/oozie/action/hadoop/TestGitActionExecutor.java
index 433f7e2..a90f095 100644
--- a/sharelib/git/src/test/java/org/apache/oozie/action/hadoop/TestGitActionExecutor.java
+++ b/sharelib/git/src/test/java/org/apache/oozie/action/hadoop/TestGitActionExecutor.java
@@ -30,7 +30,7 @@ import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.junit.Assert;
public class TestGitActionExecutor extends ActionExecutorTestCase {
diff --git a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
index 4c55e11..fc4a778 100644
--- a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
+++ b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
@@ -35,7 +35,7 @@ import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.XConfiguration;
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
public class TestHiveActionExecutor extends ActionExecutorTestCase {
diff --git a/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java b/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
index 2e3ead1..c02e597 100644
--- a/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
+++ b/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
@@ -35,8 +35,8 @@ import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
public class TestHive2ActionExecutor extends ActionExecutorTestCase {
diff --git a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
index d8fa8d8..37aad22 100644
--- a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
+++ b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
@@ -45,7 +45,7 @@ import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import org.json.simple.JSONValue;
import org.json.simple.parser.JSONParser;
diff --git a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
index 7a87b1c..dc591c0 100644
--- a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
+++ b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
@@ -37,7 +37,7 @@ import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
index 00f1c3d..a2e9266 100644
--- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
+++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
@@ -82,7 +82,7 @@ import org.apache.oozie.util.PropertiesUtils;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
+import org.jdom2.Element;
public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
private static final XLog LOG = XLog.getLog(TestMapReduceActionExecutor.class);