From 4534e302bdafb57b62ae4495e8bca9ede5201265 Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Wed, 3 Aug 2022 04:02:08 -0400
Subject: [PATCH] GP-2398: GhidraDev now requires Eclipse 4.22 (2021-12) or
 later

---
 .../GhidraDevPlugin/GhidraDev_README.html     |  5 +++-
 .../GhidraDevPlugin/META-INF/MANIFEST.MF      | 30 +++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
index 0ccba9ff87..5a67c0a909 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
@@ -56,7 +56,10 @@ change with future releases.</p>
 <p><u><b>3.0.0</b>:</u> 
 <ul>
   <li>
-    GhidraDev now requires Eclipse 2020-09 4.17 or later.
+    GhidraDev now requires Eclipse 2021-12 4.22 or later.
+  </li>
+  <li>
+    GhidraDev now requires JDK 17.
   </li>
   <li>
     Fixed an issue that could cause old extensions to incorrectly remain on the Ghidra project 
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF
index 662a3827a4..e8e4b40e14 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF
@@ -5,21 +5,21 @@ Bundle-Name: GhidraDev
 Bundle-SymbolicName: ghidra.ghidradev;singleton:=true
 Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: ghidradev.Activator
-Require-Bundle: org.eclipse.ant.core;bundle-version="3.5.800",
- org.eclipse.buildship.core;bundle-version="3.1.4",
- org.eclipse.core.expressions;bundle-version="3.7.0",
- org.eclipse.core.externaltools;bundle-version="1.1.700",
- org.eclipse.core.runtime;bundle-version="3.19.0",
- org.eclipse.debug.ui;bundle-version="3.14.600",
- org.eclipse.jdt.core;bundle-version="3.23.0",
- org.eclipse.jdt.core.manipulation;bundle-version="1.14.100",
- org.eclipse.jdt.debug.ui;bundle-version="3.12.0",
- org.eclipse.jdt.junit.core;bundle-version="3.10.800",
- org.eclipse.jdt.launching;bundle-version="3.18.0",
- org.eclipse.jdt.ui;bundle-version="3.21.200",
- org.eclipse.ltk.core.refactoring;bundle-version="3.11.100",
- org.eclipse.ui;bundle-version="3.118.0",
- org.eclipse.ui.ide;bundle-version="3.17.200",
+Require-Bundle: org.eclipse.ant.core;bundle-version="3.6.200",
+ org.eclipse.buildship.core;bundle-version="3.1.5",
+ org.eclipse.core.expressions;bundle-version="3.8.100",
+ org.eclipse.core.externaltools;bundle-version="1.2.100",
+ org.eclipse.core.runtime;bundle-version="3.24.0",
+ org.eclipse.debug.ui;bundle-version="3.15.200",
+ org.eclipse.jdt.core;bundle-version="3.28.0",
+ org.eclipse.jdt.core.manipulation;bundle-version="1.15.100",
+ org.eclipse.jdt.debug.ui;bundle-version="3.12.500",
+ org.eclipse.jdt.junit.core;bundle-version="3.11.100",
+ org.eclipse.jdt.launching;bundle-version="3.19.400",
+ org.eclipse.jdt.ui;bundle-version="3.25.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.12.100",
+ org.eclipse.ui;bundle-version="3.200.0",
+ org.eclipse.ui.ide;bundle-version="3.18.400",
  com.python.pydev.debug;bundle-version="6.3.1";resolution:=optional,
  org.python.pydev;bundle-version="6.3.1";resolution:=optional,
  org.python.pydev.core;bundle-version="6.3.1";resolution:=optional,