From ba02fd3cdca2680c20ca7add14fbf384b55b2ce0 Mon Sep 17 00:00:00 2001
From: Eric Milles <eric.milles@thomsonreuters.com>
Date: Wed, 14 Sep 2022 13:34:35 -0500
Subject: [PATCH] Eclipse 4.25 JDT Patch for Groovy-Eclipse

https://github.com/eclipse-jdt/eclipse.jdt.core/releases/tag/R4_25

for #1377
---
 docs/Manual-Setup.md                                        | 6 +++---
 groovy-eclipse.setup                                        | 6 ++----
 .../e425/Feature-org.codehaus.groovy.jdt.patch/feature.xml  | 2 +-
 pom.xml                                                     | 5 -----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/docs/Manual-Setup.md b/docs/Manual-Setup.md
index 250df692c1..8733134c20 100644
--- a/docs/Manual-Setup.md
+++ b/docs/Manual-Setup.md
@@ -4,11 +4,11 @@ These are old instructions for setting up a Groovy-Eclipse development environme
 
 ### Get the Base Eclipse Package
 
-Groovy-Eclipse is intended to be developed using Eclipse. Download and install [the "Eclipse IDE for Eclipse Committers" package](https://www.eclipse.org/downloads/packages/release/2022-06/r/eclipse-ide-eclipse-committers) for your operating system.
+Groovy-Eclipse is intended to be developed using Eclipse. Download and install [the "Eclipse IDE for Eclipse Committers" package](https://www.eclipse.org/downloads/packages/release/2022-09/r/eclipse-ide-eclipse-committers) for your operating system.
 
 ### Install Groovy-Eclipse
 
-On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, paste the Groovy-Eclipse update site `https://dist.springsource.org/snapshot/GRECLIPSE/e4.24` into the *Work with:* field and press enter. Check the box next to "Main Package", then click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
+On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, paste the Groovy-Eclipse update site `https://dist.springsource.org/snapshot/GRECLIPSE/e4.25` into the *Work with:* field and press enter. Check the box next to "Main Package", then click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
 
 ### Setup Groovy Compiler
 
@@ -16,7 +16,7 @@ If you installed extra Groovy compiler versions, then you must activate Groovy 2
 
 ### Install Execution Environment Descriptions
 
-On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2022-06 - https://download.eclipse.org/releases/2022-06` from the *Work with:* field and enter "exeuction" in the filter. Check the boxes next to "API Tools Execution Environment Descriptions", and click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
+On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2022-09 - https://download.eclipse.org/releases/2022-09` from the *Work with:* field and enter "exeuction" in the filter. Check the boxes next to "API Tools Execution Environment Descriptions", and click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
 
 ![API Baseline](images/eclipse-api-tools-execution-environment.png)
 
diff --git a/groovy-eclipse.setup b/groovy-eclipse.setup
index 141e986787..a45f1253e5 100644
--- a/groovy-eclipse.setup
+++ b/groovy-eclipse.setup
@@ -132,7 +132,7 @@
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2022-09) (scope.product.version.name=latest))">
+      filter="(| (scope.product.version.name=2022-09) (scope.product.version.name=latest) (scope.product.version.name=latest.released))">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
@@ -140,7 +140,7 @@
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2022-06) (scope.product.version.name=latest.released))">
+      filter="(scope.product.version.name=2022-06)">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
@@ -298,8 +298,6 @@
             url="https://download.eclipse.org/releases/2022-09"/>
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.25"/>
-        <repository
-            url="https://download.eclipse.org/eclipse/updates/4.25-I-builds/I20220831-1800"/>
       </repositoryList>
       <repositoryList
           name="2022-06">
diff --git a/jdt-patch/e425/Feature-org.codehaus.groovy.jdt.patch/feature.xml b/jdt-patch/e425/Feature-org.codehaus.groovy.jdt.patch/feature.xml
index 9d6002130a..512e3a583a 100644
--- a/jdt-patch/e425/Feature-org.codehaus.groovy.jdt.patch/feature.xml
+++ b/jdt-patch/e425/Feature-org.codehaus.groovy.jdt.patch/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.18.1300.v20220706-1800" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.1300.v20220831-1800" patch="true"/>
    </requires>
 
    <plugin
diff --git a/pom.xml b/pom.xml
index 4927c31017..9c64c71a46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,11 +121,6 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/eclipse/updates/4.25</url>
 				</repository>
-				<repository>
-					<id>milestone</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/eclipse/updates/4.25-I-builds/I20220831-1800</url>
-				</repository>
 			</repositories>
 			<modules>
 				<module>jdt-patch/e425/org.eclipse.jdt.core</module>