From b73cfcd30aa21f7bec031f0d64b4320f5cfd986d Mon Sep 17 00:00:00 2001
From: BilwaST <Bilwa@apache.org>
Date: Fri, 24 Feb 2023 18:09:19 +0530
Subject: [PATCH] TEZ-4469: Upgrade jettison to 1.5.3 to fix CVE-2022-45685,
 CVE-2022-45693 (#271) (Bilwa S T reviewed by Laszlo Bodor)

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

diff --git a/pom.xml b/pom.xml
index 5a1aba89a6..589c4ac83c 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..4c45e74101 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,8 @@ 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 +437,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;
   }