Merge branch 'master' of https://github.com/eclipse-platform/eclipse.platform

Author: trancexpress

.github/workflows/checkDependencies.yml

@@ -0,0 +1,17 @@
+name: Check Bundle Dependencies Version Range
+concurrency: 
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+on:
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 0 * * *'
+
+jobs:
+  check-dependencies:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkDependencies.yml@master
+    with:
+      author: Eclipse Platform Bot <[email protected]>
+      bundle-folders: ant/*/ debug/*/ resources/bundles/*/ runtime/bundles/*/ team/bundles/*/ ua/*/ update/*/ platform/*/
+    secrets:
+      token: ${{ secrets.PLATFORM_BOT_PAT }}

.mvn/jvm.config

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

README.md

@@ -38,7 +38,7 @@ For additional documentation, please refer to the [docs directory](./docs) and [
 
 ## Issue Tracking
 
-This project uses Github to track ongoing development and issues. In case you have an issue, please read the information about Eclipse being a [community project](https://github.com/eclipse-platform#community) and bear in mind that this project is almost entirely developed by volunteers. So the contributors may not be able to look into every reported issue. You will also find the information about [how to find and report issues](https://github.com/eclipse-platform#reporting-issues) in repositories of the `eclipse-platform` organization there. Be sure to search for existing issues before you create another one.
+This project uses GitHub to track ongoing development and issues. In case you have an issue, please read the information about Eclipse being a [community project](https://github.com/eclipse-platform#community) and bear in mind that this project is almost entirely developed by volunteers. So the contributors may not be able to look into every reported issue. You will also find the information about [how to find and report issues](https://github.com/eclipse-platform#reporting-issues) in repositories of the `eclipse-platform` organization there. Be sure to search for existing issues before you create another one.
 
 In case you want to report an issue that is specific to this `eclipse.platform` repository, you can [find existing issues](https://github.com/eclipse-platform/eclipse.platform/issues) or [create new issues](https://github.com/eclipse-platform/eclipse.platform/issues/new) within this repository.
 

ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml

@@ -30,7 +30,7 @@
 		<property name="destdir" value="${temp.folder}/lib/remote.jar.bin"/>
 		<delete dir="${destdir}"/>
 		<mkdir dir="${destdir}"/>
-		<javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
+		<javac release="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
 				classpath="${basedir}/bin">
 			<src path="${basedir}/remote"/>
 			<compilerarg value="-Xlint"/>

ant/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -225,7 +225,7 @@ public Location getBreakpointLocation() {
 		if (considerTargetBreakpoints()) {
 			Target targetExecuting = getTargetExecuting();
 			if (targetExecuting != null) {
-				return getLocation(targetExecuting);
+				return targetExecuting.getLocation();
 			}
 		}
 		return null;
@@ -320,77 +320,15 @@ public void targetStarted(BuildEvent event) {
 		setConsiderTargetBreakpoints(true);
 	}
 
-	public int getLineNumber(Location location) {
-		try { // succeeds with Ant newer than 1.6
-			return location.getLineNumber();
-		}
-		catch (NoSuchMethodError e) {
-			// Ant before 1.6
-			String locationString = location.toString();
-			if (locationString.length() == 0) {
-				return 0;
-			}
-			// filename: lineNumber: ("c:\buildfile.xml: 12: ")
-			int lastIndex = locationString.lastIndexOf(':');
-			int index = locationString.lastIndexOf(':', lastIndex - 1);
-			if (index != -1) {
-				try {
-					return Integer.parseInt(locationString.substring(index + 1, lastIndex));
-				}
-				catch (NumberFormatException nfe) {
-					return 0;
-				}
-			}
-			return 0;
-		}
-	}
-
-	public static Location getLocation(Target target) {
-		try {// succeeds with Ant newer than 1.6.2
-			return target.getLocation();
-		}
-		catch (NoSuchMethodError e) {
-			return Location.UNKNOWN_LOCATION;
-		}
-	}
-
-	public String getFileName(Location location) {
-		try {// succeeds with Ant newer than 1.6
-			return location.getFileName();
-		}
-		catch (NoSuchMethodError e) {
-			// Ant before 1.6
-			String locationString = location.toString();
-			if (locationString.length() == 0) {
-				return null;
-			}
-			// filename: lineNumber: ("c:\buildfile.xml: 12: ")
-			int lastIndex = locationString.lastIndexOf(':');
-			int index = locationString.lastIndexOf(':', lastIndex - 1);
-			if (index == -1) {
-				index = lastIndex; // only the filename is known
-			}
-			if (index != -1) {
-				// bug 84403
-				// if (locationString.startsWith("file:")) {
-				// return FileUtils.newFileUtils().fromURI(locationString);
-				// }
-				// remove file:
-				return locationString.substring(5, index);
-			}
-			return null;
-		}
-	}
-
 	private void appendToStack(StringBuffer stackRepresentation, String targetName, String taskName, Location location) {
 		stackRepresentation.append(targetName);
 		stackRepresentation.append(DebugMessageIds.MESSAGE_DELIMITER);
 		stackRepresentation.append(taskName);
 		stackRepresentation.append(DebugMessageIds.MESSAGE_DELIMITER);
 
-		stackRepresentation.append(getFileName(location));
+		stackRepresentation.append(location.getFileName());
 		stackRepresentation.append(DebugMessageIds.MESSAGE_DELIMITER);
-		stackRepresentation.append(getLineNumber(location));
+		stackRepresentation.append(location.getLineNumber());
 		stackRepresentation.append(DebugMessageIds.MESSAGE_DELIMITER);
 	}
 
@@ -412,7 +350,7 @@ public void marshalStack(StringBuffer stackRepresentation) {
 		}
 
 		if (!isAfterTaskEvent()) {
-			appendToStack(stackRepresentation, targetExecuting.getName(), IAntCoreConstants.EMPTY_STRING, getLocation(targetExecuting));
+			appendToStack(stackRepresentation, targetExecuting.getName(), IAntCoreConstants.EMPTY_STRING, targetExecuting.getLocation());
 		}
 		for (int i = tasks.size() - 1; i >= 0; i--) {
 			Task task = tasks.get(i);
@@ -450,7 +388,7 @@ private void marshalTargetDependancyStack(StringBuffer stackRepresentation, Targ
 			for (int i = startIndex; i <= dependancyStackDepth; i++) {
 				stackTarget = buildSequence.get(i);
 				if (stackTarget.dependsOn(targetExecuting.getName())) {
-					appendToStack(stackRepresentation, stackTarget.getName(), IAntCoreConstants.EMPTY_STRING, getLocation(stackTarget));
+					appendToStack(stackRepresentation, stackTarget.getName(), IAntCoreConstants.EMPTY_STRING, stackTarget.getLocation());
 				}
 			}
 		}

ant/org.eclipse.ant.launching/lib/antdebug.jar

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 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
@@ -28,7 +28,6 @@
 import org.eclipse.ant.internal.launching.AntLaunch;
 import org.eclipse.ant.internal.launching.AntLaunching;
 import org.eclipse.ant.internal.launching.AntLaunchingUtil;
-import org.eclipse.ant.internal.launching.debug.AntDebugState;
 import org.eclipse.ant.internal.launching.launchConfigurations.AntProcess;
 import org.eclipse.ant.internal.launching.launchConfigurations.AntStreamMonitor;
 import org.eclipse.ant.internal.launching.launchConfigurations.AntStreamsProxy;
@@ -63,7 +62,7 @@ protected void logMessage(String message, BuildEvent event, int overridePriority
 
 		StringBuffer fullMessage = new StringBuffer();
 		if (!loggingToLogFile()) {
-			fullMessage.append(System.getProperty("line.separator")); //$NON-NLS-1$
+			fullMessage.append(System.lineSeparator());
 		}
 		if (event.getException() == null && event.getTask() != null && !fEmacsMode) {
 			adornMessage(event, fullMessage);
@@ -117,7 +116,7 @@ private void adornMessage(BuildEvent event, StringBuffer fullMessage) {
 			appendAndLink(fullMessage, location, label, offset, line);
 			line = r.readLine();
 			while (line != null) {
-				fullMessage.append(System.getProperty("line.separator")); //$NON-NLS-1$
+				fullMessage.append(System.lineSeparator());
 				fullMessage.append(column);
 				appendAndLink(fullMessage, location, label, offset, line);
 				line = r.readLine();
@@ -262,7 +261,7 @@ private String getTimeString(long milliseconds) {
 			result.append(RuntimeMessages.AntProcessBuildLogger__milliseconds_6);
 		}
 
-		result.append(System.getProperty("line.separator")); //$NON-NLS-1$
+		result.append(System.lineSeparator());
 		return result.toString();
 	}
 
@@ -282,12 +281,12 @@ public void targetStarted(BuildEvent event) {
 			return;
 		}
 		Target target = event.getTarget();
-		StringBuilder msg = new StringBuilder(System.getProperty("line.separator")); //$NON-NLS-1$
+		StringBuilder msg = new StringBuilder(System.lineSeparator());
 		String targetName = target.getName();
 		msg.append(targetName);
 		msg.append(':');
 		String message = msg.toString();
-		Location location = AntDebugState.getLocation(target);
+		Location location = target.getLocation();
 		if (location != null && location != Location.UNKNOWN_LOCATION) {
 			IRegion region = new Region(0, targetName.length());
 			AntProcess antProcess = getAntProcess(fProcessId);

ant/org.eclipse.ant.launching/lib/remote.jar

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2016 IBM Corporation and others.
+ * Copyright (c) 2004, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -219,8 +219,8 @@ private IBreakpoint breakpointAtLineNumber(Location location) {
 		if (fBreakpoints == null || location == null || location == Location.UNKNOWN_LOCATION) {
 			return null;
 		}
-		int lineNumber = fDebugState.getLineNumber(location);
-		File locationFile = new File(fDebugState.getFileName(location));
+		int lineNumber = location.getLineNumber();
+		File locationFile = new File(location.getFileName());
 		for (IBreakpoint bp : fBreakpoints) {
 			ILineBreakpoint breakpoint = (ILineBreakpoint) bp;
 			int breakpointLineNumber;

ant/org.eclipse.ant.launching/loggers/org/eclipse/ant/internal/launching/runtime/logger/AntProcessBuildLogger.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2023 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  * Portions Copyright  2000-2005 The Apache Software Foundation
  *
  * This program and the accompanying materials are made
@@ -328,7 +328,7 @@ private void printTargets(Project project) {
 	 */
 	private void printTargets(Project project, List<String> names, List<String> descriptions, String heading, int maxlen) {
 		// now, start printing the targets and their descriptions
-		String lSep = System.getProperty("line.separator"); //$NON-NLS-1$
+		String lSep = System.lineSeparator();
 
 		String spaces = "    "; //$NON-NLS-1$
 		while (spaces.length() < maxlen) {
@@ -1164,7 +1164,7 @@ private void printVersion() {
 	 * Logs a message with the client outlining the usage of <b>Ant</b>.
 	 */
 	private void printUsage() {
-		String lSep = System.getProperty("line.separator"); //$NON-NLS-1$
+		String lSep = System.lineSeparator();
 		StringBuilder msg = new StringBuilder();
 		msg.append("ant ["); //$NON-NLS-1$
 		msg.append(RemoteAntMessages.getString("InternalAntRunner.options_13")); //$NON-NLS-1$