Eclipse 4.18 JDT Patch for Groovy-Eclipse: JDT commit 92d33b4

#1161 #1162

docs/Manual-Setup.md

@@ -4,25 +4,25 @@ 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/2020-09/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/2020-12/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.17` 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.18` 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
 
-If you installed extran Groovy compiler versions, then you must activate Groovy 2.5 compiler for Groovy-Eclipse.  On the Eclipse menu bar, select *Window -> Preferences*.  In the *Preferences* window, go to *Groovy -> Compiler*. Click the *Switch to 2.5.14* button, and let Eclipse restart.
+If you installed extra Groovy compiler versions, then you must activate Groovy 2.5 compiler for Groovy-Eclipse.  On the Eclipse menu bar, select *Window -> Preferences*.  In the *Preferences* window, go to *Groovy -> Compiler*. Click the *Switch to 2.5.14* button, and let Eclipse restart.
 
 ### Install Execution Environment Descriptions
 
-On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2020-09 - https://download.eclipse.org/releases/2020-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.
+On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2020-12 - https://download.eclipse.org/releases/2020-12` 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)
 
 ### Setup Execution Environment Descriptions
 
-On the Eclipse menu bar, select *Window -> Preferences*.  In the *Preferences* window, go to *Java -> Installed JREs* and add JDK 8. Then go to *Java -> Installed JREs -> Execution Environments*, select JavaSE-1.8, and check the box next to JDK 8 in the list of compatible JREs.
+On the Eclipse menu bar, select *Window -> Preferences*.  In the *Preferences* window, go to *Java -> Installed JREs* and add JDK 8 and 11. Then go to *Java -> Installed JREs -> Execution Environments*, select JavaSE-1.8, and check the box next to JDK 8 in the list of compatible JREs.  Repeat for JDK 11.
 
 ![API Baseline](images/eclipse-execution-environment.png)
 

extras/groovy-eclipse-batch-builder/build.properties

@@ -1,16 +1,16 @@
 # version numbers
 version2.5=2.5.14-01
-version3.0=3.0.7-01
+version3.0=3.0.7-02
 
 # uncomment to do a particular build -- only one should be uncommented at a time
 #do-25-build=true
 do-30-build=true
 
 # location of the plugins directory for the eclipse install
-eclipse.install.plugins=C:/Users/Public/Eclipse-4.16/plugins
+eclipse.install.plugins=C:/Users/Public/Eclipse-4.18/plugins
 
 # location of the cloned groovy-eclipse git repository
 git.repo.loc=C:/Users/Name/workspace/groovy-eclipse
 
 # which JDT Core patch is active in your workspace?
-jdt.patch.target=e416
+jdt.patch.target=e418

extras/groovy-eclipse-compiler-tests/pom.xml

@@ -10,7 +10,7 @@
 		<!-- groovy version to use for tests: -->
 		<groovy.rt.version>3.0.7</groovy.rt.version>
 		<!-- groovy-batch version to use for tests: -->
-		<groovy.xx.version>3.0.7-01</groovy.xx.version>
+		<groovy.xx.version>3.0.7-02</groovy.xx.version>
 		<!-- maven-compiler version to use for tests: -->
 		<maven-compiler-plugin.version>3.6.2</maven-compiler-plugin.version>
 

extras/groovy-eclipse-compiler-tests/src/it/enable-preview/pom.xml

@@ -11,7 +11,7 @@
 
   <properties>
     <maven.compiler.fork>true</maven.compiler.fork>
-    <maven.compiler.release>14</maven.compiler.release>
+    <maven.compiler.release>15</maven.compiler.release>
     <project.build.sourceEncoding>US-ASCII</project.build.sourceEncoding>
   </properties>
 

groovy-eclipse.setup

@@ -69,7 +69,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2020-09"
+      defaultValue="2020-06"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -126,15 +126,15 @@
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2020-12) (scope.product.version.name=latest))">
+      filter="(| (scope.product.version.name=2020-12) (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.18"/>
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2020-09) (scope.product.version.name=latest.released))">
+      filter="(scope.product.version.name=2020-09)">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
@@ -291,7 +291,7 @@
         <repository
             url="https://download.eclipse.org/releases/2020-12"/>
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.18milestones"/>
+            url="https://download.eclipse.org/eclipse/updates/4.18"/>
       </repositoryList>
       <repositoryList
           name="2020-09">

pom.xml

@@ -118,7 +118,7 @@
 				<repository>
 					<id>eclipse</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/eclipse/updates/4.18milestones</url>
+					<url>https://download.eclipse.org/eclipse/updates/4.18</url>
 				</repository>
 			</repositories>
 			<modules>