diff --git a/Ghidra/Features/Jython/Module.manifest b/Ghidra/Features/Jython/Module.manifest index 6165b32b7c..fcfc1ce135 100644 --- a/Ghidra/Features/Jython/Module.manifest +++ b/Ghidra/Features/Jython/Module.manifest @@ -1,4 +1,4 @@ -DATA SEARCH IGNORE DIR: jython-2.7.3 +DATA SEARCH IGNORE DIR: jython-2.7.4 EXCLUDE FROM GHIDRA JAR: true -MODULE FILE LICENSE: lib/jython-standalone-2.7.3.jar Jython License +MODULE FILE LICENSE: lib/jython-standalone-2.7.4.jar Jython License diff --git a/Ghidra/Features/Jython/build.gradle b/Ghidra/Features/Jython/build.gradle index b832d40f24..c4aa01b1d2 100644 --- a/Ghidra/Features/Jython/build.gradle +++ b/Ghidra/Features/Jython/build.gradle @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,8 +24,8 @@ apply plugin: 'eclipse' eclipse.project.name = 'Features Jython' -def JYTHON = "org.python:jython-standalone:2.7.3" -def JYTHON_DIR = "jython-2.7.3" +def JYTHON = "org.python:jython-standalone:2.7.4" +def JYTHON_DIR = "jython-2.7.4" configurations { jython diff --git a/Ghidra/Features/Jython/certification.manifest b/Ghidra/Features/Jython/certification.manifest index 7c7d60d6ba..de2c3849f3 100644 --- a/Ghidra/Features/Jython/certification.manifest +++ b/Ghidra/Features/Jython/certification.manifest @@ -6,4 +6,3 @@ README.md||GHIDRA||||END| data/jython.theme.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| src/main/help/help/topics/Jython/interpreter.html||GHIDRA||||END| -src/main/resources/images/python.png||GHIDRA||||END| diff --git a/Ghidra/Features/Jython/src/main/java/ghidra/jython/JythonUtils.java b/Ghidra/Features/Jython/src/main/java/ghidra/jython/JythonUtils.java index 32ab1e7998..362d97b2f2 100644 --- a/Ghidra/Features/Jython/src/main/java/ghidra/jython/JythonUtils.java +++ b/Ghidra/Features/Jython/src/main/java/ghidra/jython/JythonUtils.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,7 @@ import utilities.util.FileUtilities; */ public class JythonUtils { - public static final String JYTHON_NAME = "jython-2.7.3"; + public static final String JYTHON_NAME = "jython-2.7.4"; public static final String JYTHON_CACHEDIR = "jython_cachedir"; public static final String JYTHON_SRC = "jython-src";