Merge branch 'master' into master

Author: ShahzaibIbrahim

.mvn/extensions.xml

@@ -4,6 +4,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.3</version>
+		<version>4.0.4</version>
 	</extension>
 </extensions>

Jenkinsfile

@@ -1,6 +1,6 @@
 pipeline {
 	options {
-		timeout(time: 40, unit: 'MINUTES')
+		timeout(time: 60, unit: 'MINUTES')
 		buildDiscarder(logRotator(numToKeepStr:'5'))
 		disableConcurrentBuilds(abortPrevious: true)
 	}
@@ -19,9 +19,9 @@ pipeline {
 					mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 						-Pbree-libs -Papi-check -Pjavadoc \
 						-Dcompare-version-with-baselines.skip=false \
-						-Dmaven.compiler.failOnWarning=true -Dproject.build.sourceEncoding=UTF-8 \
+						-Dmaven.compiler.failOnWarning=true \
 						-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \
-						-DtrimStackTrace=false 
+						-DtrimStackTrace=false
 					"""
 				}
 			}

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.200.qualifier
+Bundle-Version: 3.7.300.qualifier
 Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

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

@@ -165,7 +165,6 @@ public class AntCorePlugin extends Plugin {
 	 * </p>
 	 *
 	 * @since 3.1
-	 *
 	 */
 	public AntCorePlugin() {
 		plugin = this;

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

@@ -673,10 +673,6 @@ private URL getClasspathEntryURL(Bundle bundle, String library) throws IOExcepti
 	/**
 	 * Configures the given {@link AntObject} and returns if it should be retained
 	 *
-	 * @param element
-	 * @param antObject
-	 * @param objectName
-	 * @param errorMessage
 	 * @return <code>true</code> if the object configured and should be retained, <code>false</code> otherwise
 	 */
 	private boolean configureAntObject(IConfigurationElement element, AntObject antObject, String objectName, String errorMessage) {
@@ -974,11 +970,6 @@ private URL[] getLocationURLs(File location) throws MalformedURLException {
 
 	/**
 	 * Add the libraries contributed by the Ant plug-in, to the classpath.
-	 *
-	 * @param source
-	 * @param destination
-	 * @throws IOException
-	 * @throws MalformedURLException
 	 */
 	private void addLibraries(Bundle source, List<AntClasspathEntry> destination) throws IOException, MalformedURLException {
 		ManifestElement[] libraries = null;

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

@@ -138,9 +138,7 @@ public static File getFileRelativeToBaseDir(String fileName, String base, String
 	 *            the names of the properties files to load from
 	 * @param base
 	 *            the base directory name
-	 * @param buildFileLocation
 	 * @return a list of {@link Properties} objects for each filename
-	 * @throws IOException
 	 */
 	public static List<Properties> loadPropertyFiles(List<String> fileNames, String base, String buildFileLocation) throws IOException {
 		ArrayList<Properties> allProperties = new ArrayList<>(fileNames.size());

ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/contentDescriber/AntBuildfileContentDescriber.java

@@ -46,8 +46,6 @@ public final class AntBuildfileContentDescriber extends XMLContentDescriber impl
 	 * @param contents the contents to be evaluated
 	 *
 	 * @return one of the following:<ul> <li><code>VALID</code></li>, <li><code>INVALID</code></li>, <li><code>INDETERMINATE</code></li> </ul>
-	 *
-	 * @throws IOException
 	 */
 	private int checkCriteria(InputSource contents) throws IOException {
 		AntHandler antHandler = new AntHandler();

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

@@ -285,8 +285,6 @@ private void setProperties(Project project, boolean substituteVariables) {
 
 	/**
 	 * Sets the default <code>ant.file</code> and <code>ant.version</code> properties in the given {@link Project}
-	 *
-	 * @param project
 	 */
 	protected void setBuiltInProperties(Project project) {
 		// note also see processAntHome for system properties that are set
@@ -847,9 +845,6 @@ protected void fireBuildStarted(Project project) {
 
 	/**
 	 * Sends the the event to the backing project that the build has completed
-	 *
-	 * @param project
-	 * @param error
 	 */
 	protected void fireBuildFinished(Project project, Throwable error) {
 		if (usingXmlLogger()) {
@@ -1377,8 +1372,6 @@ private boolean processProperties(List<String> commands) {
 
 	/**
 	 * Process properties specified using <code>-D</code>
-	 *
-	 * @param commands
 	 */
 	protected void processMinusDProperties(List<String> commands) {
 		if (!commands.isEmpty() && userProperties == null) {

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

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ant.launching;singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.300.qualifier
 Bundle-Activator: org.eclipse.ant.internal.launching.AntLaunching
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",

ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunchingUtil.java

@@ -285,8 +285,6 @@ public static IFile getFile(String fullPath) {
 	 *
 	 * Attempts to handle linked files; the first found linked file with the correct path is returned.
 	 *
-	 * @param path
-	 * @param buildFileParent
 	 * @return file or <code>null</code>
 	 * @see org.eclipse.core.resources.IWorkspaceRoot#findFilesForLocation(IPath)
 	 */