Skip to content

Commit a18d507

Browse files
ShahzaibIbrahimShahzaibIbrahim
authored
Merge branch 'master' into master
2 parents 855224a + 1addf09 commit a18d507

File tree

1,243 files changed

+8983
-15394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,243 files changed

+8983
-15394
lines changed

‎.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<extension>
55
<groupId>org.eclipse.tycho</groupId>
66
<artifactId>tycho-build</artifactId>
7-
<version>4.0.3</version>
7+
<version>4.0.4</version>
88
</extension>
99
</extensions>

‎Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pipeline {
22
options {
3-
timeout(time: 40, unit: 'MINUTES')
3+
timeout(time: 60, unit: 'MINUTES')
44
buildDiscarder(logRotator(numToKeepStr:'5'))
55
disableConcurrentBuilds(abortPrevious: true)
66
}
@@ -19,9 +19,9 @@ pipeline {
1919
mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
2020
-Pbree-libs -Papi-check -Pjavadoc \
2121
-Dcompare-version-with-baselines.skip=false \
22-
-Dmaven.compiler.failOnWarning=true -Dproject.build.sourceEncoding=UTF-8 \
22+
-Dmaven.compiler.failOnWarning=true \
2323
-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \
24-
-DtrimStackTrace=false
24+
-DtrimStackTrace=false
2525
"""
2626
}
2727
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true
5-
Bundle-Version: 3.7.200.qualifier
5+
Bundle-Version: 3.7.300.qualifier
66
Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ public class AntCorePlugin extends Plugin {
165165
* </p>
166166
*
167167
* @since 3.1
168-
*
169168
*/
170169
public AntCorePlugin() {
171170
plugin = this;

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -673,10 +673,6 @@ private URL getClasspathEntryURL(Bundle bundle, String library) throws IOExcepti
673673
/**
674674
* Configures the given {@link AntObject} and returns if it should be retained
675675
*
676-
* @param element
677-
* @param antObject
678-
* @param objectName
679-
* @param errorMessage
680676
* @return <code>true</code> if the object configured and should be retained, <code>false</code> otherwise
681677
*/
682678
private boolean configureAntObject(IConfigurationElement element, AntObject antObject, String objectName, String errorMessage) {
@@ -974,11 +970,6 @@ private URL[] getLocationURLs(File location) throws MalformedURLException {
974970

975971
/**
976972
* Add the libraries contributed by the Ant plug-in, to the classpath.
977-
*
978-
* @param source
979-
* @param destination
980-
* @throws IOException
981-
* @throws MalformedURLException
982973
*/
983974
private void addLibraries(Bundle source, List<AntClasspathEntry> destination) throws IOException, MalformedURLException {
984975
ManifestElement[] libraries = null;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ public static File getFileRelativeToBaseDir(String fileName, String base, String
138138
* the names of the properties files to load from
139139
* @param base
140140
* the base directory name
141-
* @param buildFileLocation
142141
* @return a list of {@link Properties} objects for each filename
143-
* @throws IOException
144142
*/
145143
public static List<Properties> loadPropertyFiles(List<String> fileNames, String base, String buildFileLocation) throws IOException {
146144
ArrayList<Properties> allProperties = new ArrayList<>(fileNames.size());

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public final class AntBuildfileContentDescriber extends XMLContentDescriber impl
4646
* @param contents the contents to be evaluated
4747
*
4848
* @return one of the following:<ul> <li><code>VALID</code></li>, <li><code>INVALID</code></li>, <li><code>INDETERMINATE</code></li> </ul>
49-
*
50-
* @throws IOException
5149
*/
5250
private int checkCriteria(InputSource contents) throws IOException {
5351
AntHandler antHandler = new AntHandler();

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@ private void setProperties(Project project, boolean substituteVariables) {
285285

286286
/**
287287
* Sets the default <code>ant.file</code> and <code>ant.version</code> properties in the given {@link Project}
288-
*
289-
* @param project
290288
*/
291289
protected void setBuiltInProperties(Project project) {
292290
// note also see processAntHome for system properties that are set
@@ -847,9 +845,6 @@ protected void fireBuildStarted(Project project) {
847845

848846
/**
849847
* Sends the the event to the backing project that the build has completed
850-
*
851-
* @param project
852-
* @param error
853848
*/
854849
protected void fireBuildFinished(Project project, Throwable error) {
855850
if (usingXmlLogger()) {
@@ -1377,8 +1372,6 @@ private boolean processProperties(List<String> commands) {
13771372

13781373
/**
13791374
* Process properties specified using <code>-D</code>
1380-
*
1381-
* @param commands
13821375
*/
13831376
protected void processMinusDProperties(List<String> commands) {
13841377
if (!commands.isEmpty() && userProperties == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Localization: plugin
44
Bundle-Name: %pluginName
55
Bundle-SymbolicName: org.eclipse.ant.launching;singleton:=true
6-
Bundle-Version: 1.4.200.qualifier
6+
Bundle-Version: 1.4.300.qualifier
77
Bundle-Activator: org.eclipse.ant.internal.launching.AntLaunching
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
99
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@ public static IFile getFile(String fullPath) {
285285
*
286286
* Attempts to handle linked files; the first found linked file with the correct path is returned.
287287
*
288-
* @param path
289-
* @param buildFileParent
290288
* @return file or <code>null</code>
291289
* @see org.eclipse.core.resources.IWorkspaceRoot#findFilesForLocation(IPath)
292290
*/

‎ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntStackFrame.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public class AntStackFrame extends AntDebugElement implements IStackFrame {
3737
/**
3838
* Constructs a stack frame in the given thread with the given id.
3939
*
40-
* @param antThread
4140
* @param id
4241
* stack frame id (0 is the top of the stack)
4342
*/

‎ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntThread.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public synchronized IStackFrame[] getStackFrames() throws DebugException {
9292

9393
/**
9494
* Retrieves the current stack frames in the thread possibly waiting until the frames are populated
95-
*
9695
*/
9796
private void getStackFrames0() throws DebugException {
9897
synchronized (fFrames) {

‎ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntHomeClasspathEntry.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ public boolean equals(Object obj) {
159159
/**
160160
* Return whether s1 is equivalent to s2.
161161
*
162-
* @param s1
163-
* @param s2
164162
* @return whether s1 is equivalent to s2
165163
*/
166164
private boolean equalsOrNull(String s1, String s2) {

‎ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntStreamMonitor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public void removeListener(IStreamListener listener) {
4343

4444
/**
4545
* Appends the given message to this stream, and notifies listeners.
46-
*
47-
* @param message
4846
*/
4947
public void append(String message) {
5048
if (isBuffered()) {

‎ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntStreamsProxy.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
import org.eclipse.debug.core.model.IStreamMonitor;
1818
import org.eclipse.debug.core.model.IStreamsProxy;
1919

20-
/**
21-
*
22-
*/
2320
public class AntStreamsProxy implements IStreamsProxy {
2421

2522
private final AntStreamMonitor fErrorMonitor = new AntStreamMonitor();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ant.tests.core; singleton:=true
5-
Bundle-Version: 3.7.200.qualifier
5+
Bundle-Version: 3.7.300.qualifier
66
Bundle-ClassPath: anttestscore.jar
77
Bundle-Activator: org.eclipse.ant.tests.core.testplugin.AntTestPlugin
88
Bundle-Vendor: %providerName

‎ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public void setMessageOutputLevel(int level) {
4242
fMessageOutputLevel = level;
4343
}
4444

45+
@Override
4546
public int getMessageOutputLevel() {
4647
return fMessageOutputLevel;
4748
}

‎ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public void setUp() throws Exception {
6969
/**
7070
* Ensure the welcome screen is closed because in 4.x the debug perspective opens a giant fast-view causing issues
7171
*
72-
* @throws Exception
7372
* @since 3.8
7473
*/
7574
void assertWelcomeScreenClosed() throws Exception {
@@ -100,7 +99,6 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
10099
/**
101100
* Asserts that the test project has been created and all testing resources have been loaded each time the {@link #setUp()} method is called
102101
*
103-
* @throws Exception
104102
* @since 3.5
105103
*/
106104
protected void assertProject() throws Exception {

‎ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ public class FrameworkTests extends AbstractAntTest {
4444
/**
4545
* Ensures that the deprecated means of setting the class path still works correctly Do not fix deprecations unless the deprecated methods are
4646
* being removed.
47-
*
48-
* @throws MalformedURLException
49-
* @throws CoreException
5047
*/
5148
@SuppressWarnings("deprecation")
5249
@Test
@@ -141,8 +138,6 @@ public void testNoDefaultTarget() throws CoreException {
141138

142139
/**
143140
* Regression test for running a specific target from a script that has no default target. Associated with bug 294502.
144-
*
145-
* @throws CoreException
146141
*/
147142
@Test
148143
public void testSpecificTargetWithNoDefaultTarget() throws CoreException {
@@ -275,8 +270,6 @@ public void testGetTargets() throws CoreException {
275270

276271
/**
277272
* Tests bug 389564 for a class path entry as a url representing a remote file system location
278-
*
279-
* @throws MalformedURLException
280273
*/
281274
@Test
282275
public void testAntClasspathEntryFromUrl() throws MalformedURLException {

‎ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ public void testSpecifyBadTargetAsArg() throws CoreException {
313313
/**
314314
* Tests specifying both a non-existent target and an existent target in the
315315
* command line
316-
*
317316
*/
318317
@Test
319318
public void testSpecifyBothBadAndGoodTargetsAsArg() throws CoreException {

‎ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public class TaskTests extends AbstractAntTest {
3636

3737
/**
3838
* Testing the old deprecated API
39-
*
40-
* @throws CoreException
4139
*/
4240
@SuppressWarnings("deprecation")
4341
@Test

‎ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/AbstractAntDebugTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ protected IBreakpointManager getBreakpointManager() {
127127
/**
128128
* Returns the source folder with the given name in the given project.
129129
*
130-
* @param project
131130
* @param name
132131
* source folder name
133132
* @return package fragment root
@@ -358,7 +357,6 @@ protected AntDebugTarget debugLaunchAndTerminate(ILaunchConfiguration config, in
358357
* @param bp
359358
* the breakpoint that should cause a suspend event
360359
* @return thread in which the first suspend event occurred
361-
* @throws CoreException
362360
*/
363361
protected AntThread launchToLineBreakpoint(String buildFileName, ILineBreakpoint bp) throws CoreException {
364362
ILaunchConfiguration config = getLaunchConfiguration(buildFileName);
@@ -375,7 +373,6 @@ protected AntThread launchToLineBreakpoint(String buildFileName, ILineBreakpoint
375373
* @param bp
376374
* the breakpoint that should cause a suspend event
377375
* @return thread in which the first suspend event occurred
378-
* @throws CoreException
379376
*/
380377
protected AntThread launchToLineBreakpoint(ILaunchConfiguration config, ILineBreakpoint bp) throws CoreException {
381378
DebugEventWaiter waiter = new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, AntThread.class, DebugEvent.BREAKPOINT);
@@ -437,7 +434,6 @@ protected AntThread resume(AntThread thread, int timeout) throws Exception {
437434
* @param resumeThread
438435
* thread to resume
439436
* @return thread in which the first suspend event occurs
440-
* @throws CoreException
441437
*/
442438
protected AntThread resumeToLineBreakpoint(AntThread resumeThread, ILineBreakpoint bp) throws CoreException {
443439
DebugEventWaiter waiter = new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, AntThread.class, DebugEvent.BREAKPOINT);
@@ -520,7 +516,6 @@ protected IResource getBreakpointResource(String typeName) throws Exception {
520516
* line number
521517
* @param file
522518
* the build file
523-
* @throws CoreException
524519
*/
525520
protected AntLineBreakpoint createLineBreakpoint(int lineNumber, IFile file) throws CoreException {
526521
return new AntLineBreakpoint(file, lineNumber);
@@ -609,7 +604,6 @@ protected IBreakpoint getBreakpoint(IThread thread) {
609604
*
610605
* @param frame
611606
* stack frame to step in
612-
* @throws DebugException
613607
*/
614608
protected AntThread stepOver(AntStackFrame frame) throws DebugException {
615609
org.eclipse.ant.tests.ui.testplugin.DebugEventWaiter waiter = new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, AntThread.class, DebugEvent.STEP_END);
@@ -630,7 +624,6 @@ protected AntThread stepOver(AntStackFrame frame) throws DebugException {
630624
*
631625
* @param frame
632626
* stack frame to step in
633-
* @throws DebugException
634627
*/
635628
protected AntThread stepOverToHitBreakpoint(AntStackFrame frame) throws DebugException {
636629
org.eclipse.ant.tests.ui.testplugin.DebugEventWaiter waiter = new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, AntThread.class, DebugEvent.BREAKPOINT);

‎ant/org.eclipse.ant.tests.ui/Ant Debug Tests/org/eclipse/ant/tests/ui/debug/RunToLineTests.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor persp
7676

7777
/**
7878
* Test a run to line, with no extra breakpoints.
79-
*
80-
* @throws Exception
8179
*/
8280
@Test
8381
public void testRunToLine() throws Exception {
@@ -86,8 +84,6 @@ public void testRunToLine() throws Exception {
8684

8785
/**
8886
* Test a run to line, with no extra breakpoints in separate VM.
89-
*
90-
* @throws Exception
9187
*/
9288
@Test
9389
public void testRunToLineSepVM() throws Exception {
@@ -96,8 +92,6 @@ public void testRunToLineSepVM() throws Exception {
9692

9793
/**
9894
* Test a run to line, with an extra breakpoint, and preference to skip
99-
*
100-
* @throws Exception
10195
*/
10296
@Test
10397
public void testRunToLineSkipBreakpoint() throws Exception {
@@ -108,8 +102,6 @@ public void testRunToLineSkipBreakpoint() throws Exception {
108102
/**
109103
* Test a run to line, with an extra breakpoint, and preference to skip in a
110104
* separate VM
111-
*
112-
* @throws Exception
113105
*/
114106
@Test
115107
public void testRunToLineSkipBreakpointSepVM() throws Exception {
@@ -119,8 +111,6 @@ public void testRunToLineSkipBreakpointSepVM() throws Exception {
119111

120112
/**
121113
* Test a run to line, with an extra breakpoint, and preference to *not* skip
122-
*
123-
* @throws Exception
124114
*/
125115
@Test
126116
public void testRunToLineHitBreakpoint() throws Exception {
@@ -130,8 +120,6 @@ public void testRunToLineHitBreakpoint() throws Exception {
130120

131121
/**
132122
* Test a run to line, with an extra breakpoint, and preference to *not* skip
133-
*
134-
* @throws Exception
135123
*/
136124
@Test
137125
public void testRunToLineHitBreakpointSepVM() throws Exception {
@@ -149,7 +137,6 @@ public void testRunToLineHitBreakpointSepVM() throws Exception {
149137
* skip breakpoints is off).
150138
* @param skipBreakpoints preference value for "skip breakpoints during run
151139
* to line"
152-
* @throws Exception
153140
*/
154141
public void runToLine(final int lineNumber, int expectedLineNumber, boolean skipBreakpoints, boolean sepVM)
155142
throws Exception {

0 commit comments

Comments
 (0)