Merge branch 'master' into 1668

Author: ruspl-afed

.github/workflows/doCleanCode.yml

@@ -0,0 +1,19 @@
+name: Perform Code Clean
+concurrency: 
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 2 * * *'
+
+jobs:
+  clean-code:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/cleanCode.yml@master
+    with:
+      author: Eclipse Platform Bot <[email protected]>
+      do-quickfix: false
+      do-cleanups: true
+      bundle-folders: ant/*/ debug/*/ resources/bundles/*/ runtime/bundles/*/ team/bundles/*/ ua/*/ update/*/ platform/*/ terminal/bundles/*/
+    secrets:
+      token: ${{ secrets.PLATFORM_BOT_PAT }}

.mvn/jvm.config

@@ -1,2 +1 @@
 -XX:+PrintFlagsFinal
--Xmx1500m

Jenkinsfile

@@ -11,6 +11,9 @@ pipeline {
 		maven 'apache-maven-latest'
 		jdk 'temurin-jdk21-latest'
 	}
+	environment {
+		MAVEN_OPTS = '-Xmx1500m'
+	}
 	stages {
 		stage('Build') {
 			steps {
@@ -29,12 +32,16 @@ pipeline {
 			post {
 				always {
 					archiveArtifacts artifacts: '.*log,**/target/**/.*log', allowEmptyArchive: true
-					junit '**/target/surefire-reports/TEST-*.xml'
+					junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml'
 					discoverGitReferenceBuild referenceJob: 'eclipse.platform/master'
-					recordIssues(publishAllIssues:false, ignoreQualityGate:true,
-						tool: eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'),
-						qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]])
-					recordIssues publishAllIssues:false, tools: [mavenConsole(), javaDoc()]
+					recordIssues enabledForFailure: true, publishAllIssues:false, ignoreQualityGate:true,
+						tools: [
+							eclipse(name: 'Compiler', pattern: '**/target/compilelogs/*.xml'),
+							javaDoc(),
+							issues(name: 'API Tools', id: 'apitools', pattern: '**/target/apianalysis/*.xml')
+						],
+						qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
+					recordIssues enabledForFailure: true, publishAllIssues:false, tools: [mavenConsole()]
 				}
 			}
 		}

ant/org.eclipse.ant.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true
-Bundle-Version: 3.7.600.qualifier
+Bundle-Version: 3.7.700.qualifier
 Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -607,9 +607,7 @@ private void addURLToExtraClasspathEntries(URL url, IConfigurationElement elemen
 		if (eclipseRuntime != null) {
 			eclipseRuntimeRequired = Boolean.parseBoolean(eclipseRuntime);
 		}
-		Iterator<AntClasspathEntry> itr = extraClasspathURLs.iterator();
-		while (itr.hasNext()) {
-			IAntClasspathEntry entry = itr.next();
+		for (IAntClasspathEntry entry : extraClasspathURLs) {
 			if (entry.getEntryURL().equals(url)) {
 				return;
 			}
@@ -663,8 +661,9 @@ private URL getClasspathEntryURL(Bundle bundle, String library) throws IOExcepti
 			}
 		}
 
-		if (urlFile == null || !urlFile.exists())
+		if (urlFile == null || !urlFile.exists()) {
 			return null;
+		}
 
 		String path = urlFile.getAbsolutePath();
 		return new URL(IAntCoreConstants.FILE_PROTOCOL + (urlFile.isDirectory() ? path + "/" : path)); //$NON-NLS-1$
@@ -688,8 +687,7 @@ private boolean configureAntObject(IConfigurationElement element, AntObject antO
 
 		String library = element.getAttribute(AntCorePlugin.LIBRARY);
 		if (library == null) {
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_Library_not_specified_for___0__4, new String[] {
-					objectName }), null);
+			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_Library_not_specified_for___0__4, objectName), null);
 			AntCorePlugin.getPlugin().getLog().log(status);
 			return false;
 		}
@@ -707,8 +705,7 @@ private boolean configureAntObject(IConfigurationElement element, AntObject antO
 			}
 
 			// type specifies a library that does not exist
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(errorMessage, new String[] {
-					library, element.getContributor().getName() }), null);
+			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(errorMessage, library, element.getContributor().getName()), null);
 			AntCorePlugin.getPlugin().getLog().log(status);
 			return false;
 		}
@@ -719,8 +716,7 @@ private boolean configureAntObject(IConfigurationElement element, AntObject antO
 		}
 		catch (Exception e) {
 			// likely extra classpath entry library that does not exist
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_8, new String[] {
-					library, element.getContributor().getName() }), null);
+			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_8, library, element.getContributor().getName()), null);
 			AntCorePlugin.getPlugin().getLog().log(status);
 		}
 		return false;
@@ -743,8 +739,7 @@ protected void computeDefaultExtraClasspathEntries(List<IConfigurationElement> e
 					addPluginClassLoader(bundle);
 				} else {
 					// extra classpath entry that does not exist
-					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_6, new String[] {
-							library, element.getContributor().getName() }), null);
+					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_6, library, element.getContributor().getName()), null);
 					AntCorePlugin.getPlugin().getLog().log(status);
 					continue;
 				}
@@ -757,8 +752,7 @@ protected void computeDefaultExtraClasspathEntries(List<IConfigurationElement> e
 			}
 			catch (Exception e) {
 				// likely extra classpath entry that does not exist
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_6, new String[] {
-						library, element.getContributor().getName() }), null);
+				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, NLS.bind(InternalCoreAntMessages.AntCorePreferences_6, library, element.getContributor().getName()), null);
 				AntCorePlugin.getPlugin().getLog().log(status);
 				continue;
 			}
@@ -1068,11 +1062,9 @@ private void addEntryURLs(List<URL> result, IAntClasspathEntry[] entries) {
 
 	protected ClassLoader[] getPluginClassLoaders() {
 		if (orderedPluginClassLoaders == null) {
-			Iterator<WrappedClassLoader> classLoaders = pluginClassLoaders.iterator();
 			Map<String, WrappedClassLoader> idToLoader = new HashMap<>(pluginClassLoaders.size());
 			List<BundleRevision> bundles = new ArrayList<>(pluginClassLoaders.size());
-			while (classLoaders.hasNext()) {
-				WrappedClassLoader loader = classLoaders.next();
+			for (WrappedClassLoader loader : pluginClassLoaders) {
 				idToLoader.put(loader.bundle.getSymbolicName(), loader);
 				BundleRevision revision = loader.bundle.adapt(BundleRevision.class);
 				if (revision != null) {
@@ -1133,8 +1125,7 @@ private List<BundleRevision> computePrerequisiteOrder(List<BundleRevision> plugi
 					prereqs.add(new Relation(currentFrag, hostWires.get(0).getProvider()));
 				}
 			} else {
-				AntCorePlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, NLS.bind(InternalCoreAntMessages.AntCorePreferences_1, new String[] {
-						currentFrag.getSymbolicName() }), null));
+				AntCorePlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, NLS.bind(InternalCoreAntMessages.AntCorePreferences_1, currentFrag.getSymbolicName()), null));
 			}
 		}
 
@@ -1231,11 +1222,12 @@ private Map<BundleRevision, Integer> computeCounts(List<Relation> mappings) {
 			BundleRevision from = mapping.from;
 			Integer fromCount = counts.get(from);
 			BundleRevision to = mapping.to;
-			if (to == null)
+			if (to == null) {
 				counts.put(from, Integer.valueOf(0));
-			else {
-				if (counts.get(to) == null)
+			} else {
+				if (counts.get(to) == null) {
 					counts.put(to, Integer.valueOf(0));
+				}
 				fromCount = fromCount == null ? Integer.valueOf(1) : Integer.valueOf(fromCount.intValue() + 1);
 				counts.put(from, fromCount);
 			}
@@ -1287,9 +1279,7 @@ public List<Task> getTasks() {
 	public List<Task> getRemoteTasks() {
 		List<Task> result = new ArrayList<>(10);
 		if (defaultTasks != null && !defaultTasks.isEmpty()) {
-			Iterator<Task> iter = defaultTasks.iterator();
-			while (iter.hasNext()) {
-				Task task = iter.next();
+			for (Task task : defaultTasks) {
 				if (!task.isEclipseRuntimeRequired()) {
 					result.add(task);
 				}
@@ -1354,9 +1344,7 @@ public List<Property> getProperties() {
 	public List<Property> getRemoteAntProperties() {
 		List<Property> result = new ArrayList<>(10);
 		if (defaultProperties != null && !defaultProperties.isEmpty()) {
-			Iterator<Property> iter = defaultProperties.iterator();
-			while (iter.hasNext()) {
-				Property property = iter.next();
+			for (Property property : defaultProperties) {
 				if (!property.isEclipseRuntimeRequired()) {
 					result.add(property);
 				}
@@ -1525,9 +1513,7 @@ public List<Type> getTypes() {
 	public List<Type> getRemoteTypes() {
 		List<Type> result = new ArrayList<>(10);
 		if (defaultTypes != null && !defaultTypes.isEmpty()) {
-			Iterator<Type> iter = defaultTypes.iterator();
-			while (iter.hasNext()) {
-				Type type = iter.next();
+			for (Type type : defaultTypes) {
 				if (!type.isEclipseRuntimeRequired()) {
 					result.add(type);
 				}

ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java

@@ -140,8 +140,9 @@ private String[] getArray(String args) {
 					}
 					waitingForQuote = true;
 				} else {
-					if (!(token.equals(",") || token.equals(" "))) //$NON-NLS-1$ //$NON-NLS-2$
+					if (!(token.equals(",") || token.equals(" "))) { //$NON-NLS-1$ //$NON-NLS-2$
 						result.add(token);
+					}
 				}
 			}
 		}
@@ -281,7 +282,7 @@ private void basicConfigure(Class<?> classInternalAntRunner, Object runner) thro
 		setProperties(runner, classInternalAntRunner);
 
 		if (arguments != null && arguments.length > 0) {
-			Method setArguments = classInternalAntRunner.getMethod("setArguments", new Class[] { String[].class }); //$NON-NLS-1$
+			Method setArguments = classInternalAntRunner.getMethod("setArguments", String[].class); //$NON-NLS-1$
 			setArguments.invoke(runner, new Object[] { arguments });
 		}
 	}
@@ -302,8 +303,7 @@ private void basicConfigure(Class<?> classInternalAntRunner, Object runner) thro
 	 */
 	public void run(IProgressMonitor monitor) throws CoreException {
 		if (buildRunning) {
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, NLS.bind(InternalCoreAntMessages.AntRunner_Already_in_progess, new String[] {
-					buildFileLocation }), null);
+			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, NLS.bind(InternalCoreAntMessages.AntRunner_Already_in_progess, buildFileLocation), null);
 			throw new CoreException(status);
 		}
 		buildRunning = true;
@@ -319,7 +319,7 @@ public void run(IProgressMonitor monitor) throws CoreException {
 
 			// set the custom classpath
 			if (customClasspath != null) {
-				Method setCustomClasspath = classInternalAntRunner.getMethod("setCustomClasspath", new Class[] { URL[].class }); //$NON-NLS-1$
+				Method setCustomClasspath = classInternalAntRunner.getMethod("setCustomClasspath", URL[].class); //$NON-NLS-1$
 				setCustomClasspath.invoke(runner, new Object[] { customClasspath });
 			}
 
@@ -360,7 +360,7 @@ public void run(IProgressMonitor monitor) throws CoreException {
 
 			// set execution targets
 			if (targets != null) {
-				Method setExecutionTargets = classInternalAntRunner.getMethod("setExecutionTargets", new Class[] { String[].class }); //$NON-NLS-1$
+				Method setExecutionTargets = classInternalAntRunner.getMethod("setExecutionTargets", String[].class); //$NON-NLS-1$
 				setExecutionTargets.invoke(runner, new Object[] { targets });
 			}
 
@@ -400,7 +400,7 @@ private void setProperties(Object runner, Class<?> classInternalAntRunner) throw
 
 		// add property files
 		if (propertyFiles != null) {
-			Method addPropertyFiles = classInternalAntRunner.getMethod("addPropertyFiles", new Class[] { String[].class }); //$NON-NLS-1$
+			Method addPropertyFiles = classInternalAntRunner.getMethod("addPropertyFiles", String[].class); //$NON-NLS-1$
 			addPropertyFiles.invoke(runner, new Object[] { propertyFiles });
 		}
 	}
@@ -449,7 +449,7 @@ protected void problemLoadingClass(Throwable e) throws CoreException {
 		if (missingClassName != null) {
 			missingClassName = missingClassName.replace('/', '.');
 			message = InternalCoreAntMessages.AntRunner_Could_not_find_one_or_more_classes__Please_check_the_Ant_classpath__2;
-			message = NLS.bind(message, new String[] { missingClassName });
+			message = NLS.bind(message, missingClassName);
 		} else {
 			message = InternalCoreAntMessages.AntRunner_Could_not_find_one_or_more_classes__Please_check_the_Ant_classpath__1;
 		}

ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java

@@ -100,10 +100,9 @@ public boolean isDefault() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof TargetInfo)) {
+		if (!(obj instanceof TargetInfo other)) {
 			return false;
 		}
-		TargetInfo other = (TargetInfo) obj;
 		return getName().equals(other.getName());
 	}
 

ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClasspathEntry.java

@@ -80,8 +80,7 @@ public AntClasspathEntry(URL url) {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof IAntClasspathEntry) {
-			IAntClasspathEntry other = (IAntClasspathEntry) obj;
+		if (obj instanceof IAntClasspathEntry other) {
 			return entryString.equals(other.getLabel());
 		}
 		return false;

ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InputHandlerSetter.java

@@ -35,13 +35,11 @@ protected void setInputHandler(Project project, String inputHandlerClassname) {
 				handler = (InputHandler) (Class.forName(inputHandlerClassname).getConstructor().newInstance());
 			}
 			catch (ClassCastException e) {
-				String msg = MessageFormat.format(InternalAntMessages.InternalAntRunner_handler_does_not_implement_InputHandler5, new Object[] {
-						inputHandlerClassname });
+				String msg = MessageFormat.format(InternalAntMessages.InternalAntRunner_handler_does_not_implement_InputHandler5, inputHandlerClassname);
 				throw new BuildException(msg, e);
 			}
 			catch (Exception e) {
-				String msg = MessageFormat.format(InternalAntMessages.InternalAntRunner_Unable_to_instantiate_input_handler_class, new Object[] {
-						inputHandlerClassname, e.getClass().getName() });
+				String msg = MessageFormat.format(InternalAntMessages.InternalAntRunner_Unable_to_instantiate_input_handler_class, inputHandlerClassname, e.getClass().getName());
 				throw new BuildException(msg, e);
 			}
 		}