Skip to content

Commit 6f85070

Browse files
ShahzaibIbrahimShahzaibIbrahim
authored
Merge branch 'eclipse-platform:master' into master
2 parents ee5feb6 + 26c0bae commit 6f85070

File tree

533 files changed

+7483
-7788
lines changed

Some content is hidden

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

533 files changed

+7483
-7788
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pipeline {
3030
archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/.metadata/.*log', allowEmptyArchive: true
3131
junit '**/target/surefire-reports/TEST-*.xml'
3232
discoverGitReferenceBuild referenceJob: 'eclipse.platform/master'
33-
recordIssues tools: [eclipse(), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
33+
recordIssues tools: [eclipse(pattern: '**/target/compilelogs/*.xml'), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
3434
recordIssues tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: true]]
3535
}
3636
}

‎NOTICE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ The project maintains the following source code repositories:
3535
* http://git.eclipse.org/c/platform/eclipse.platform.resources.git
3636
* http://git.eclipse.org/c/platform/eclipse.platform.runtime.git
3737
* http://git.eclipse.org/c/platform/eclipse.platform.swt.git
38-
* http://git.eclipse.org/c/platform/eclipse.platform.swt.binaries.git
3938
* http://git.eclipse.org/c/platform/eclipse.platform.team.git
4039
* http://git.eclipse.org/c/platform/eclipse.platform.text.git
4140
* http://git.eclipse.org/c/platform/eclipse.platform.ua.git

‎ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support [Builder].launch

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
3-
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="after_clean,"/>
4-
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
5-
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
6-
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ant.launching/lib&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
7-
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
8-
<listEntry value="/org.eclipse.ant.launching/buildfiles/buildRemote.xml"/>
9-
</listAttribute>
10-
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
11-
<listEntry value="1"/>
12-
</listAttribute>
13-
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
14-
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
15-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
17-
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ant.launching"/>
18-
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
19-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ant.launching/buildfiles/buildRemote.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ant.launching/remote&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
20-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.launching/buildfiles/buildRemote.xml}"/>
21-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
22-
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
23-
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
24-
</launchConfiguration>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
3+
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="after_clean,"/>
4+
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
5+
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
6+
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ant.launching/lib&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
7+
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
8+
<listEntry value="/org.eclipse.ant.launching/buildfiles/buildRemote.xml"/>
9+
</listAttribute>
10+
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
11+
<listEntry value="1"/>
12+
</listAttribute>
13+
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
14+
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
15+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
17+
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ant.launching"/>
18+
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
19+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ant.launching/buildfiles/buildRemote.xml&quot; type=&quot;1&quot;/&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.ant.launching/remote&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
20+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.launching/buildfiles/buildRemote.xml}"/>
21+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
22+
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
23+
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
24+
</launchConfiguration>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.ui.ide;resolution:=optional,
1616
org.eclipse.core.resources,
1717
org.eclipse.ui,
1818
org.eclipse.ant.core,
19-
org.eclipse.core.runtime,
20-
org.eclipse.pde.core
19+
org.eclipse.core.runtime
20+
Import-Package: org.assertj.core.api
2121
Bundle-ActivationPolicy: lazy
2222
Bundle-RequiredExecutionEnvironment: JavaSE-17
2323
Eclipse-BundleShape: dir

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors:
1212
* IBM Corporation - initial API and implementation
1313
* Ericsson AB, Julian Enoch - Bug 465594
1414
*******************************************************************************/
1515
package org.eclipse.ant.tests.core.tests;
1616

17+
import static org.assertj.core.api.Assertions.assertThat;
1718
import static org.junit.Assert.assertFalse;
1819
import static org.junit.Assert.assertNotSame;
1920
import static org.junit.Assert.assertNull;
@@ -265,7 +266,7 @@ public void testGetTargets() throws CoreException {
265266
runner.setBuildFileLocation(buildFile.getLocation().toFile().toString());
266267
}
267268
TargetInfo[] infos = runner.getAvailableTargets();
268-
assertTrue("incorrect number of targets retrieved", infos != null && infos.length == 3); //$NON-NLS-1$
269+
assertThat(infos).as("number of retrieved targets").hasSize(3); //$NON-NLS-1$
269270
}
270271

271272
/**

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors:
1212
* IBM Corporation - initial API and implementation
1313
*******************************************************************************/
1414
package org.eclipse.ant.tests.core.tests;
1515

16+
import static org.assertj.core.api.Assertions.assertThat;
1617
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
1818
import static org.junit.Assert.assertNull;
1919
import static org.junit.Assert.assertThrows;
2020
import static org.junit.Assert.assertTrue;
@@ -35,7 +35,7 @@ public class TargetTests extends AbstractAntTest {
3535
@Test
3636
public void testDefaultTarget() throws CoreException {
3737
TargetInfo[] targets = getTargets("TestForEcho.xml"); //$NON-NLS-1$
38-
assertEquals("Should be two targets in TestForEcho.xml", 2, targets.length); //$NON-NLS-1$
38+
assertThat(targets).as("number of targets in TestForEcho.xml").hasSize(2); //$NON-NLS-1$
3939
assertTrue("Test for Echo should be the default target", targets[1].isDefault()); //$NON-NLS-1$
4040
}
4141

@@ -45,7 +45,7 @@ public void testDefaultTarget() throws CoreException {
4545
@Test
4646
public void testGetTargetsWithDataTypes() throws CoreException {
4747
TargetInfo[] targets = getTargets("Bug32551.xml"); //$NON-NLS-1$
48-
assertEquals("Should be one targets in Bug32551.xml", 1, targets.length); //$NON-NLS-1$
48+
assertThat(targets).as("number of targets in Bug32551.xml").hasSize(1); //$NON-NLS-1$
4949
}
5050

5151
/**
@@ -70,7 +70,7 @@ public void testGetTargetsWithAntHome() {
7070
@Test
7171
public void testTargetNames() throws CoreException {
7272
String[] targetNames = getTargetNames("TestForEcho.xml"); //$NON-NLS-1$
73-
assertEquals("Should be two targets in TestForEcho.xml", 2, targetNames.length); //$NON-NLS-1$
73+
assertThat(targetNames).as("number of targets in TestForEcho.xml").hasSize(2); //$NON-NLS-1$
7474
assertEquals("First name should be init", "init", targetNames[0]); //$NON-NLS-1$ //$NON-NLS-2$
7575
assertEquals("Second name should be Test for Echo", "Test for Echo", targetNames[1]); //$NON-NLS-1$ //$NON-NLS-2$
7676
}
@@ -81,7 +81,7 @@ public void testTargetNames() throws CoreException {
8181
@Test
8282
public void testTargetDescription() throws CoreException {
8383
String[] targetDescriptions = getTargetDescriptions("TestForEcho.xml"); //$NON-NLS-1$
84-
assertEquals("Should be two targets in TestForEcho.xml", 2, targetDescriptions.length); //$NON-NLS-1$
84+
assertThat(targetDescriptions).as("number of targets in TestForEcho.xml").hasSize(2); //$NON-NLS-1$
8585
assertNull("First description should be null", targetDescriptions[0]); //$NON-NLS-1$
8686
assertEquals("Second description should be Calls other targets", "Calls other echos", targetDescriptions[1]); //$NON-NLS-1$ //$NON-NLS-2$
8787
}
@@ -101,8 +101,7 @@ public void testTargetProject() throws CoreException {
101101
@Test
102102
public void testTargetDependencies() throws CoreException {
103103
String[] dependencies = getDependencies("TestForEcho.xml", "Test for Echo"); //$NON-NLS-1$ //$NON-NLS-2$
104-
assertNotNull("Dependencies should not be null", dependencies); //$NON-NLS-1$
105-
assertEquals("Should be one dependency in Test for Echo", 1, dependencies.length); //$NON-NLS-1$
104+
assertThat(dependencies).as("number of dependencies in Test for Echo").hasSize(1); //$NON-NLS-1$
106105
assertEquals("First dependency should be init", "init", dependencies[0]); //$NON-NLS-1$ //$NON-NLS-2$
107106
}
108107

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.ant.tests.ui.debug;
1515

16+
import static org.assertj.core.api.Assertions.assertThat;
1617
import static org.junit.Assert.assertEquals;
1718
import static org.junit.Assert.assertNotNull;
1819
import static org.junit.Assert.assertTrue;
@@ -67,7 +68,7 @@ private void systemProperties(boolean sepVM) throws Exception, CoreException {
6768

6869
AntStackFrame frame = (AntStackFrame) thread.getTopStackFrame();
6970
IVariable[] vars = frame.getVariables();
70-
assertTrue("Should be a bunch of properties", 0 < vars.length); //$NON-NLS-1$
71+
assertThat(vars).hasSizeGreaterThan(0);
7172
AntProperty property = frame.findProperty("ant.library.dir"); //$NON-NLS-1$
7273
assertNotNull(property);
7374

@@ -103,7 +104,7 @@ private void userProperties(boolean sepVM) throws Exception {
103104

104105
AntStackFrame frame = (AntStackFrame) thread.getTopStackFrame();
105106
IVariable[] vars = frame.getVariables();
106-
assertTrue("Should be a bunch of properties", 0 < vars.length); //$NON-NLS-1$
107+
assertThat(vars).hasSizeGreaterThan(0);
107108
AntProperty property = frame.findProperty("ant.home"); //$NON-NLS-1$
108109
assertNotNull(property);
109110

@@ -135,7 +136,7 @@ private void runtimeProperties(boolean sepVM) throws Exception, CoreException {
135136

136137
AntStackFrame frame = (AntStackFrame) thread.getTopStackFrame();
137138
IVariable[] vars = frame.getVariables();
138-
assertTrue("Should be a bunch of properties", 0 < vars.length); //$NON-NLS-1$
139+
assertThat(vars).hasSizeGreaterThan(0);
139140
AntProperty property = frame.findProperty("ant.home"); //$NON-NLS-1$
140141
assertNotNull(property);
141142

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.ant.tests.ui.debug;
1515

16-
import static org.junit.Assert.assertTrue;
16+
import static org.assertj.core.api.Assertions.assertThat;
1717

1818
import org.eclipse.ant.internal.launching.debug.model.AntThread;
1919
import org.eclipse.core.resources.IFile;
@@ -47,7 +47,7 @@ private void antCallStack(boolean sepVM) throws CoreException {
4747

4848
IStackFrame[] frames = thread.getStackFrames();
4949

50-
assertTrue(frames.length == 3);
50+
assertThat(frames).hasSize(3);
5151
IStackFrame frame = frames[0];
5252
frame.getName().equals(""); //$NON-NLS-1$
5353
}

0 commit comments

Comments
 (0)