You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ab...@apache.org on 2023/02/24 12:42:14 UTC
[tez] branch master updated (fa51a590c -> b73cfcd30)
This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
from fa51a590c Upgrade jettison to 1.5.3 to fix CVE-2022-45685, CVE-2022-45693 (#271) (Bilwa S T reviewed by Laszlo Bodor)
new 88374f992 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
new b73cfcd30 TEZ-4469: Upgrade jettison to 1.5.3 to fix CVE-2022-45685, CVE-2022-45693 (#271) (Bilwa S T reviewed by Laszlo Bodor)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[tez] 01/02: 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
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
commit 88374f992b5f02fb589d8b0ddb85344146d60c4a
Author: Laszlo Bodor <bo...@gmail.com>
AuthorDate: Fri Feb 24 13:41:19 2023 +0100
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 +-
tez-dag/src/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 589c4ac83..5a1aba89a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,7 +739,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.5.3</version>
+ <version>1.5.1</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 4c45e7410..77e7179c2 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 final class DAGUtils {
return dagJson;
}
- public static JSONObject convertDataEventDependencyInfoToJSON(List<DataEventDependencyInfo> info)
- throws JSONException {
+ public static JSONObject convertDataEventDependencyInfoToJSON(List<DataEventDependencyInfo> info) {
return new JSONObject(convertDataEventDependecyInfoToATS(info));
}
@@ -437,7 +436,7 @@ public final class DAGUtils {
}
public static JSONObject convertServicePluginToJSON(
- ServicePluginInfo servicePluginInfo) throws JSONException {
+ ServicePluginInfo servicePluginInfo) {
JSONObject jsonObject = new JSONObject(convertServicePluginToATSMap(servicePluginInfo));
return jsonObject;
}
[tez] 02/02: TEZ-4469: Upgrade jettison to 1.5.3 to fix CVE-2022-45685, CVE-2022-45693 (#271) (Bilwa S T reviewed by Laszlo Bodor)
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
commit b73cfcd30aa21f7bec031f0d64b4320f5cfd986d
Author: BilwaST <Bi...@apache.org>
AuthorDate: Fri Feb 24 18:09:19 2023 +0530
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 +-
tez-dag/src/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 5a1aba89a..589c4ac83 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 77e7179c2..4c45e7410 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 final class DAGUtils {
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 final class DAGUtils {
}
public static JSONObject convertServicePluginToJSON(
- ServicePluginInfo servicePluginInfo) {
+ ServicePluginInfo servicePluginInfo) throws JSONException {
JSONObject jsonObject = new JSONObject(convertServicePluginToATSMap(servicePluginInfo));
return jsonObject;
}