Skip to content

Commit 5806660

Browse files
committed
Merge branch 'GP-2398_ryanmkurtz_PR-4496_ekilmer_fix-ghidradev-plugin-build'
2 parents 100760f + 4534e30 commit 5806660

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ <h2><a name="ChangeHistory"></a>Change History</h2>
5656
<p><u><b>3.0.0</b>:</u>
5757
<ul>
5858
<li>
59-
GhidraDev now requires Eclipse 2020-09 4.17 or later.
59+
GhidraDev now requires Eclipse 2021-12 4.22 or later.
60+
</li>
61+
<li>
62+
GhidraDev now requires JDK 17.
6063
</li>
6164
<li>
6265
Fixed an issue that could cause old extensions to incorrectly remain on the Ghidra project

GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ Bundle-Name: GhidraDev
55
Bundle-SymbolicName: ghidra.ghidradev;singleton:=true
66
Bundle-Version: 3.0.0.qualifier
77
Bundle-Activator: ghidradev.Activator
8-
Require-Bundle: org.eclipse.ant.core;bundle-version="3.5.800",
9-
org.eclipse.buildship.core;bundle-version="3.1.4",
10-
org.eclipse.core.expressions;bundle-version="3.7.0",
11-
org.eclipse.core.externaltools;bundle-version="1.1.700",
12-
org.eclipse.core.runtime;bundle-version="3.19.0",
13-
org.eclipse.debug.ui;bundle-version="3.14.600",
14-
org.eclipse.jdt.core;bundle-version="3.23.0",
15-
org.eclipse.jdt.core.manipulation;bundle-version="1.14.100",
16-
org.eclipse.jdt.debug.ui;bundle-version="3.12.0",
17-
org.eclipse.jdt.junit.core;bundle-version="3.10.800",
18-
org.eclipse.jdt.launching;bundle-version="3.18.0",
19-
org.eclipse.jdt.ui;bundle-version="3.21.200",
20-
org.eclipse.ltk.core.refactoring;bundle-version="3.11.100",
21-
org.eclipse.ui;bundle-version="3.118.0",
22-
org.eclipse.ui.ide;bundle-version="3.17.200",
8+
Require-Bundle: org.eclipse.ant.core;bundle-version="3.6.200",
9+
org.eclipse.buildship.core;bundle-version="3.1.5",
10+
org.eclipse.core.expressions;bundle-version="3.8.100",
11+
org.eclipse.core.externaltools;bundle-version="1.2.100",
12+
org.eclipse.core.runtime;bundle-version="3.24.0",
13+
org.eclipse.debug.ui;bundle-version="3.15.200",
14+
org.eclipse.jdt.core;bundle-version="3.28.0",
15+
org.eclipse.jdt.core.manipulation;bundle-version="1.15.100",
16+
org.eclipse.jdt.debug.ui;bundle-version="3.12.500",
17+
org.eclipse.jdt.junit.core;bundle-version="3.11.100",
18+
org.eclipse.jdt.launching;bundle-version="3.19.400",
19+
org.eclipse.jdt.ui;bundle-version="3.25.0",
20+
org.eclipse.ltk.core.refactoring;bundle-version="3.12.100",
21+
org.eclipse.ui;bundle-version="3.200.0",
22+
org.eclipse.ui.ide;bundle-version="3.18.400",
2323
com.python.pydev.debug;bundle-version="6.3.1";resolution:=optional,
2424
org.python.pydev;bundle-version="6.3.1";resolution:=optional,
2525
org.python.pydev.core;bundle-version="6.3.1";resolution:=optional,
2626
org.python.pydev.ast;bundle-version="6.3.1";resolution:=optional,
2727
org.eclipse.cdt.core;bundle-version="5.9.1";resolution:=optional,
2828
org.eclipse.cdt.ui;bundle-version="5.9.0";resolution:=optional
29-
Bundle-RequiredExecutionEnvironment: JavaSE-11
29+
Bundle-RequiredExecutionEnvironment: JavaSE-17
3030
Bundle-Vendor: Ghidra
3131
Bundle-ActivationPolicy: lazy
3232
Bundle-ClassPath: .,

0 commit comments

Comments
 (0)