Eclipse 4.34 JDT Patch for Groovy-Eclipse

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

for #1597 #1598

Site-org.codehaus.groovy.eclipse/pom.xml

@@ -86,11 +86,10 @@
 										<zip zipfile="${dist.full.path}" filesonly="true">
 											<zipfileset dir="${project.build.directory}/site" />
 										</zip>
-										<checksum file="${dist.full.path}" algorithm="MD5" fileext=".md5" />
 										<checksum file="${dist.full.path}" algorithm="SHA1" fileext=".sha1" />
 
-										<!-- ${project.build.directory} (usually <project>/Site-org.codehaus.groovy.eclipse/target) now contains -->
-										<!-- site/, size.zip, *-updatesize.zip, *-updatesize.zip.[md5|sha1] and composite[Artifacts|Content].xml -->
+										<!-- ${project.build.directory} (usually <project>/Site-org.codehaus.groovy.eclipse/target) files: -->
+										<!-- site/, size.zip, *-updatesize.zip, *-updatesize.zip.sha1 and composite[Artifacts|Content].xml -->
 									</target>
 								</configuration>
 								<goals>

base/org.eclipse.jdt.groovy.core/META-INF/MANIFEST.MF

@@ -15,7 +15,7 @@ Export-Package: org.codehaus.jdt.groovy.ast,
  org.eclipse.jdt.groovy.core.util,
  org.eclipse.jdt.groovy.search
 Import-Package: org.eclipse.jdt.launching
-Require-Bundle: org.codehaus.groovy;bundle-version="[2.5.22,6)";visibility:=reexport,
+Require-Bundle: org.codehaus.groovy;bundle-version="[3.0.23,6)";visibility:=reexport,
  org.eclipse.core.expressions;visibility:=reexport,
  org.eclipse.core.filesystem;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,

docs/Manual-Setup.md

@@ -4,19 +4,19 @@ 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://eclipse.org/downloads/packages/release/2024-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://eclipse.org/downloads/packages/release/2024-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://groovy.jfrog.io/artifactory/plugins-release/e4.33` 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://groovy.jfrog.io/artifactory/plugins-release/e4.34` 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 extra Groovy compiler versions, then you must activate Groovy 3.0 compiler for Groovy-Eclipse.  On the Eclipse menu bar, select *Window -> Preferences*.  In the *Preferences* window, go to *Groovy -> Compiler*. Click the *Switch to 3.0.23* button, and let Eclipse restart.
 
 ### Install Execution Environment Descriptions
 
-On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2024-09 - https://download.eclipse.org/releases/2024-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 `2024-12 - https://download.eclipse.org/releases/2024-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)
 

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

@@ -1,5 +1,5 @@
 # version numbers
-version3.0=3.0.23-02
+version3.0=3.0.23-03
 version4.0=4.0.24-03
 version5.0=5.0.0-01
 
@@ -9,10 +9,10 @@ version5.0=5.0.0-01
 do-50-build=true
 
 # location of the plugins directory for the eclipse install
-eclipse.install.plugins=C:/Users/Public/Eclipse-4.33/plugins
+eclipse.install.plugins=C:/Users/Public/Eclipse-4.34/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=e433
+jdt.patch.target=e434

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

@@ -31,8 +31,14 @@
         <copy file="${maven.dir}/pom.xml" tofile="${build.dir}/${maven.pom}"/>
         <replace file="${build.dir}/${maven.pom}" token="REPLACE_WITH_VERSION" value="${version}"/>
 
+        <taskdef name="jarjar" classname="com.eed3si9n.jarjar.JarJarTask">
+            <classpath>
+                <fileset dir="jarjar" includes="*.jar"/>
+            </classpath>
+        </taskdef>
+
         <!-- create main artifact from stage directory -->
-        <jar destfile="${build.dir}/${main.jar}">
+        <jarjar destfile="${build.dir}/${main.jar}">
             <fileset dir="${stage.dir}">
                 <exclude name="**/*.g"/>
                 <exclude name="**/*.g4"/>
@@ -49,20 +55,29 @@
                 <exclude name="module-info.class"/>
                 <exclude name="plugin.*"/>
                 <exclude name="systembundle.properties"/>
-                <exclude name="META-INF/*.properties"/>
                 <exclude name="META-INF/eclipse.inf"/>
                 <exclude name="META-INF/INDEX.LIST"/>
                 <exclude name="META-INF/maven/**"/>
+                <exclude name="META-INF/native-image/**"/>
+                <exclude name="META-INF/services/org.osgi.*"/>
+                <exclude name="META-INF/*.properties"/>
                 <exclude name="META-INF/*.RSA"/>
                 <exclude name="META-INF/*.SF"/>
+                <exclude name="OSGI-INF/**"/>
                 <exclude name="OSGI-OPT/**"/>
             </fileset>
             <manifest>
                 <attribute name="Implementation-Vendor" value="Pivotal Software, Inc."/>
                 <attribute name="Implementation-Version" value="${version} (${jdt.patch.target})"/>
                 <attribute name="Main-Class" value="org.eclipse.jdt.internal.compiler.batch.Main"/>
             </manifest>
-        </jar>
+            <rule pattern="org.eclipse.core.**" result="groovyjarjareclipse.core.@1"/>
+            <rule pattern="org.eclipse.equinox.**" result="groovyjarjareclipse.equinox.@1"/>
+            <rule pattern="org.eclipse.jface.**" result="groovyjarjareclipse.jface.@1"/>
+            <rule pattern="org.eclipse.osgi.**" result="groovyjarjareclipse.osgi.@1"/>
+            <rule pattern="org.eclipse.text.**" result="groovyjarjareclipse.text.@1"/>
+            <rule pattern="org.osgi.**" result="groovyjarjarosgi.@1"/>
+        </jarjar>
 
         <!-- create javadoc artifact -->
         <jar destfile="${build.dir}/${javadoc.jar}">
@@ -90,7 +105,7 @@
                 <include name="**/*.java"/>
             </fileset>
             <fileset dir="${stage.dir}">
-            	<exclude name="OSGI-OPT/**"/>
+                <exclude name="OSGI-OPT/**"/>
                 <include name="**/*.groovy"/>
                 <include name="**/*.java"/>
             </fileset>

extras/groovy-eclipse-compiler/.settings/org.eclipse.jdt.core.prefs

@@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

extras/org.codehaus.groovy.m2eclipse/META-INF/MANIFEST.MF

@@ -7,6 +7,6 @@ Bundle-Version: 5.6.0.qualifier
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
- org.eclipse.m2e.core;bundle-version="[1.9.1,3.0.0)",
- org.eclipse.m2e.jdt,
+ org.eclipse.m2e.core;bundle-version="[1.17.2,3.0.0)",
+ org.eclipse.m2e.jdt ;bundle-version="[1.17.1,3.0.0)",
  org.eclipse.m2e.maven.runtime

groovy-eclipse.setup

@@ -87,7 +87,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2024-09"
+      defaultValue="2024-12"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -144,15 +144,15 @@
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2024-12) (scope.product.version.name=latest))">
+      filter="(| (scope.product.version.name=2024-12) (scope.product.version.name=latest) (scope.product.version.name=latest.released))">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
         url="https://groovy.jfrog.io/artifactory/plugins-snapshot/e4.34"/>
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2024-09) (scope.product.version.name=latest.released))">
+      filter="(scope.product.version.name=2024-09)">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
@@ -310,8 +310,6 @@
             url="https://download.eclipse.org/releases/2024-12"/>
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.34"/>
-        <repository
-            url="https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800"/>
       </repositoryList>
       <repositoryList
           name="2024-09">

jdt-patch/e433/org.eclipse.jdt.core.tests.builder.mockcompiler/.gitignore

@@ -1 +1,2 @@
-/bin/
+/bin
+/target

pom.xml

@@ -24,7 +24,7 @@
 		<groovy-eclipse-compiler-version>3.9.0</groovy-eclipse-compiler-version>
 
 		<!-- This should align with the oldest supported Groovy version. -->
-		<groovy-eclipse-batch-version>3.0.23-02</groovy-eclipse-batch-version>
+		<groovy-eclipse-batch-version>3.0.23-03</groovy-eclipse-batch-version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -105,11 +105,6 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/eclipse/updates/4.34</url>
 				</repository>
-				<repository>
-					<id>milestone</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800</url>
-				</repository>
 			</repositories>
 			<modules>
 				<module>jdt-patch/e434/org.eclipse.jdt.core</module>
@@ -536,7 +531,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.1.1</version>
+				<version>3.1.3</version>
 				<!-- disable default behavior; see Site project -->
 				<configuration>
 					<skip>true</skip>
@@ -546,7 +541,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.1.2</version>
 				<!-- disable default behavior; tycho-surefire-plugin tests units -->
 				<configuration>
 					<skip>true</skip>
@@ -556,7 +551,7 @@
 			<!--plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-toolchains-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 				<configuration>
 					<toolchains>
 						<jdk>