From cdb3dc8410cf87fb74c2f0fc3d0374e626027285 Mon Sep 17 00:00:00 2001
From: "devaspati.krishnatri" <devaspati.krishnatri@cloudera.com>
Date: Tue, 14 Feb 2023 17:56:28 +0530
Subject: [PATCH] TEZ-4469:Upgrade jettison to 1.5.3 to fix CVE-2022-40150

---
 pom.xml                                                       | 2 +-
 .../main/java/org/apache/tez/dag/history/utils/DAGUtils.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5b7bd49970..54d2f275c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,7 +739,7 @@
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.3</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/utils/DAGUtils.java b/tez-dag/src/main/java/org/apache/tez/dag/history/utils/DAGUtils.java
index 77e7179c29..bbb5432f2c 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/utils/DAGUtils.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/utils/DAGUtils.java
@@ -111,7 +111,7 @@ public static JSONObject generateSimpleJSONPlan(DAGPlan dagPlan) throws JSONExce
     return dagJson;
   }
   
-  public static JSONObject convertDataEventDependencyInfoToJSON(List<DataEventDependencyInfo> info) {
+  public static JSONObject convertDataEventDependencyInfoToJSON(List<DataEventDependencyInfo> info) throws JSONException{
     return new JSONObject(convertDataEventDependecyInfoToATS(info));
   }
   
@@ -436,7 +436,7 @@ public static Map<String,Object> convertVertexStatsToATSMap(
   }
 
   public static JSONObject convertServicePluginToJSON(
-      ServicePluginInfo servicePluginInfo) {
+      ServicePluginInfo servicePluginInfo) throws JSONException{
     JSONObject jsonObject = new JSONObject(convertServicePluginToATSMap(servicePluginInfo));
     return jsonObject;
   }