From 88374f992b5f02fb589d8b0ddb85344146d60c4a Mon Sep 17 00:00:00 2001 From: Laszlo Bodor Date: Fri, 24 Feb 2023 13:41:19 +0100 Subject: [PATCH] Revert "Upgrade jettison to 1.5.3 to fix CVE-2022-45685, CVE-2022-45693 (#271) (Bilwa S T reviewed by Laszlo Bodor)" - missing JIRA This reverts commit fa51a590ca6cdbb007cf4f500f9598a279eb6387. --- pom.xml | 2 +- .../main/java/org/apache/tez/dag/history/utils/DAGUtils.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 589c4ac83c..5a1aba89a6 100644 --- a/pom.xml +++ b/pom.xml @@ -739,7 +739,7 @@ org.codehaus.jettison jettison - 1.5.3 + 1.5.1 com.google.code.findbugs 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 4c45e74101..77e7179c29 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,8 +111,7 @@ public static JSONObject generateSimpleJSONPlan(DAGPlan dagPlan) throws JSONExce return dagJson; } - public static JSONObject convertDataEventDependencyInfoToJSON(List info) - throws JSONException { + public static JSONObject convertDataEventDependencyInfoToJSON(List info) { return new JSONObject(convertDataEventDependecyInfoToATS(info)); } @@ -437,7 +436,7 @@ public static Map convertVertexStatsToATSMap( } public static JSONObject convertServicePluginToJSON( - ServicePluginInfo servicePluginInfo) throws JSONException { + ServicePluginInfo servicePluginInfo) { JSONObject jsonObject = new JSONObject(convertServicePluginToATSMap(servicePluginInfo)); return jsonObject; }