From 062f64282a39e16ce8c0fcbdd1fbc08aba7e5ade Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 20 Sep 2022 04:19:13 -0400 Subject: [PATCH] GP-2324: Upgrading Jython to 2.7.3 --- Ghidra/Features/Python/Module.manifest | 4 ++-- Ghidra/Features/Python/build.gradle | 4 ++-- .../Python/src/main/java/ghidra/python/PythonUtils.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Ghidra/Features/Python/Module.manifest b/Ghidra/Features/Python/Module.manifest index 9fa665bcef..6165b32b7c 100644 --- a/Ghidra/Features/Python/Module.manifest +++ b/Ghidra/Features/Python/Module.manifest @@ -1,4 +1,4 @@ -DATA SEARCH IGNORE DIR: jython-2.7.2 +DATA SEARCH IGNORE DIR: jython-2.7.3 EXCLUDE FROM GHIDRA JAR: true -MODULE FILE LICENSE: lib/jython-standalone-2.7.2.jar Jython License +MODULE FILE LICENSE: lib/jython-standalone-2.7.3.jar Jython License diff --git a/Ghidra/Features/Python/build.gradle b/Ghidra/Features/Python/build.gradle index ab0e74d087..6987fa8f47 100644 --- a/Ghidra/Features/Python/build.gradle +++ b/Ghidra/Features/Python/build.gradle @@ -24,8 +24,8 @@ apply plugin: 'eclipse' eclipse.project.name = 'Features Python' -def JYTHON = "org.python:jython-standalone:2.7.2" -def JYTHON_DIR = "jython-2.7.2" +def JYTHON = "org.python:jython-standalone:2.7.3" +def JYTHON_DIR = "jython-2.7.3" configurations { jython diff --git a/Ghidra/Features/Python/src/main/java/ghidra/python/PythonUtils.java b/Ghidra/Features/Python/src/main/java/ghidra/python/PythonUtils.java index a1c5a565e1..60bb81b762 100644 --- a/Ghidra/Features/Python/src/main/java/ghidra/python/PythonUtils.java +++ b/Ghidra/Features/Python/src/main/java/ghidra/python/PythonUtils.java @@ -27,7 +27,7 @@ import utilities.util.FileUtilities; */ public class PythonUtils { - public static final String PYTHON_NAME = "jython-2.7.2"; + public static final String PYTHON_NAME = "jython-2.7.3"; public static final String PYTHON_CACHEDIR = "jython_cachedir"; public static final String PYTHON_SRC = "python-src";