Eclipse 4.21 JDT Patch for Groovy-Eclipse

https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=R4_21 #1276
groovy · Sep 15, 2021 · 926e328 · 926e328
1 parent cbfdfe9
commit 926e328
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/docs/Manual-Setup.md b/docs/Manual-Setup.md
@@ -4,7 +4,7 @@ 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/2021-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/2021-09/r/eclipse-ide-eclipse-committers) for your operating system.
 
 ### Install Groovy-Eclipse
 
@@ -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 `2021-06 - https://download.eclipse.org/releases/2021-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 `2021-09 - https://download.eclipse.org/releases/2021-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
@@ -126,15 +126,15 @@
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2021-09) (scope.product.version.name=latest))">
+      filter="(| (scope.product.version.name=2021-09) (scope.product.version.name=latest) (scope.product.version.name=latest.released))">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
         url="https://dist.springsource.org/snapshot/GRECLIPSE/e4.21"/>
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2021-06) (scope.product.version.name=latest.released))">
+      filter="(scope.product.version.name=2021-06)">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
@@ -292,8 +292,6 @@
             url="https://download.eclipse.org/releases/2021-09"/>
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.21"/>
-        <repository
-            url="https://download.eclipse.org/eclipse/updates/4.21-I-builds/I20210906-0500"/>
       </repositoryList>
       <repositoryList
           name="2021-06">

diff --git a/pom.xml b/pom.xml
@@ -123,11 +123,6 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/eclipse/updates/4.21</url>
 				</repository>
-				<repository>
-					<id>2021-09-M3</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/eclipse/updates/4.21-I-builds/I20210906-0500</url>
-				</repository>
 			</repositories>
 			<modules>
 				<module>jdt-patch/e421/org.eclipse.jdt.core</module>