Skip to content

Commit 6433a27

Browse files
basilevsbasilevs
committed
Merge branch 'issue/195/waitJob'
2 parents 312015e + 19f9144 commit 6433a27

17 files changed

Lines changed: 204 additions & 153 deletions

File tree

‎.github/workflows/verify.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
- name: VNC
104104
run: vncserver $DISPLAY -localhost=1 -noxstartup -PasswordFile /root/.vnc/passwd
105105
- name: Build
106-
run: ./build.sh -Decl-platform-repository=https://download.eclipse.org/releases/2025-12 -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress
106+
run: ./build.sh -Decl-platform-repository=https://download.eclipse.org/releases/2026-03 -Decl.executionEnvironment=JavaSE-21 -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress
107107
- name: Archive results
108108
if: always()
109109
uses: actions/upload-artifact@v4

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ OPTIONS="-Ddash.batch=200 -Dtycho.localArtifacts=ignore $@"
1515

1616
mvn clean verify -f releng/mirroring/pom.xml $OPTIONS || exit 100
1717

18-
./build_nodeps.sh $OPTIONS || exit $?
18+
./build_nodeps.sh $OPTIONS clean verify || exit $?
1919

2020
./build_runner.sh $OPTIONS || exit $?
2121

‎build_nodeps.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ export MAVEN_OPTS="-Xms512m -Xmx1024m"
1414
OPTIONS="-Dtycho.localArtifacts=ignore $@"
1515
set -x
1616

17-
mvn clean verify -f releng/core/pom.xml $OPTIONS || exit 101
18-
mvn clean verify -f releng/runtime/pom.xml -P runtime4x $OPTIONS || exit 103
19-
mvn clean verify -f releng/ide/pom.xml $OPTIONS || exit 105
17+
mvn -f releng/core/pom.xml $OPTIONS || exit 101
18+
mvn -f releng/runtime/pom.xml -P runtime4x $OPTIONS || exit 103
19+
mvn -f releng/ide/pom.xml $OPTIONS || exit 105
2020

21-
mvn clean verify -f releng/rap/pom.xml -P core $OPTIONS || exit 110
22-
mvn clean verify -f releng/rap/pom.xml -P ide $OPTIONS || exit 111
21+
mvn -f releng/rap/pom.xml -P core $OPTIONS || exit 110
22+
mvn -f releng/rap/pom.xml -P ide $OPTIONS || exit 111
2323

24-
mvn clean verify -f releng/rcptt/pom.xml $OPTIONS || exit 106
24+
mvn -f releng/rcptt/pom.xml $OPTIONS || exit 106

‎devenv/.project‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,48 @@
88
</buildSpec>
99
<natures>
1010
</natures>
11+
<linkedResources>
12+
<link>
13+
<name>scripts/build.cmd</name>
14+
<type>1</type>
15+
<locationURI>PARENT-1-PROJECT_LOC/build.cmd</locationURI>
16+
</link>
17+
<link>
18+
<name>scripts/build.sh</name>
19+
<type>1</type>
20+
<locationURI>PARENT-1-PROJECT_LOC/build.sh</locationURI>
21+
</link>
22+
<link>
23+
<name>scripts/build_dependencies.sh</name>
24+
<type>1</type>
25+
<locationURI>PARENT-1-PROJECT_LOC/build_dependencies.sh</locationURI>
26+
</link>
27+
<link>
28+
<name>scripts/build_module_rap.sh</name>
29+
<type>1</type>
30+
<locationURI>PARENT-1-PROJECT_LOC/build_module_rap.sh</locationURI>
31+
</link>
32+
<link>
33+
<name>scripts/build_nodeps.sh</name>
34+
<type>1</type>
35+
<locationURI>PARENT-1-PROJECT_LOC/build_nodeps.sh</locationURI>
36+
</link>
37+
<link>
38+
<name>scripts/build_repository.sh</name>
39+
<type>1</type>
40+
<locationURI>PARENT-1-PROJECT_LOC/build_repository.sh</locationURI>
41+
</link>
42+
<link>
43+
<name>scripts/build_runner.sh</name>
44+
<type>1</type>
45+
<locationURI>PARENT-1-PROJECT_LOC/build_runner.sh</locationURI>
46+
</link>
47+
<link>
48+
<name>scripts/clean-pom.xml</name>
49+
<type>1</type>
50+
<locationURI>PARENT-1-PROJECT_LOC/clean-pom.xml</locationURI>
51+
</link>
52+
</linkedResources>
1153
<filteredResources>
1254
<filter>
1355
<id>1737992165899</id>

‎releng/core/pom.xml‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,38 @@
77
https://www.eclipse.org/legal/epl-v20.html
88
99
Contributors:
10-
Xored Software Inc - initial API and implementation and/or initial documentation
10+
Xored Software Inc - initial API and implementation and/or initial
11+
documentation
1112
-->
1213

1314
<project
14-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
15-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
16-
<modelVersion>4.0.0</modelVersion>
17-
<artifactId>core</artifactId>
18-
<packaging>pom</packaging>
15+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
16+
xmlns="http://maven.apache.org/POM/4.0.0"
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
18+
<modelVersion>4.0.0</modelVersion>
19+
<artifactId>core</artifactId>
20+
<packaging>pom</packaging>
1921

20-
<parent>
21-
<groupId>org.eclipse.rcptt</groupId>
22-
<artifactId>ecl</artifactId>
23-
<version>2.9.0-SNAPSHOT</version>
24-
<relativePath>../ecl/pom.xml</relativePath>
25-
</parent>
26-
27-
<modules>
28-
<module>../ecl</module>
29-
<module>../../watson</module>
30-
<module>../../core</module>
31-
<module>../../tests</module>
32-
<module>../../repository/core</module>
33-
</modules>
22+
<parent>
23+
<groupId>org.eclipse.rcptt</groupId>
24+
<artifactId>ecl</artifactId>
25+
<version>2.9.0-SNAPSHOT</version>
26+
<relativePath>../ecl/pom.xml</relativePath>
27+
</parent>
3428

35-
<repositories>
36-
<repository>
37-
<id>ajdt43</id>
38-
<layout>p2</layout>
39-
<url>${ajdt43repository}</url>
40-
</repository>
41-
</repositories>
29+
<modules>
30+
<module>../ecl</module>
31+
<module>../../watson</module>
32+
<module>../../core</module>
33+
<module>../../tests</module>
34+
<module>../../repository/core</module>
35+
</modules>
36+
37+
<repositories>
38+
<repository>
39+
<id>ajdt43</id>
40+
<layout>p2</layout>
41+
<url>${ajdt43repository}</url>
42+
</repository>
43+
</repositories>
4244
</project>

‎releng/ecl/pom.xml‎

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,57 @@
77
https://www.eclipse.org/legal/epl-v20.html
88
99
Contributors:
10-
Xored Software Inc - initial API and implementation and/or initial documentation
10+
Xored Software Inc - initial API and implementation and/or initial
11+
documentation
1112
-->
1213

1314
<project
14-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
15-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
16-
<modelVersion>4.0.0</modelVersion>
17-
<artifactId>ecl</artifactId>
18-
<packaging>pom</packaging>
15+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
16+
xmlns="http://maven.apache.org/POM/4.0.0"
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
18+
<modelVersion>4.0.0</modelVersion>
19+
<artifactId>ecl</artifactId>
20+
<packaging>pom</packaging>
1921

20-
<parent>
21-
<groupId>org.eclipse.rcptt</groupId>
22-
<artifactId>rcptt.releng</artifactId>
23-
<version>2.9.0-SNAPSHOT</version>
24-
</parent>
25-
26-
<modules>
27-
<module>../../ecl/plugins</module>
28-
<module>../../ecl/features</module>
29-
<module>../../ecl/tests</module>
30-
<module>../../ecl/repository</module>
31-
</modules>
22+
<parent>
23+
<groupId>org.eclipse.rcptt</groupId>
24+
<artifactId>rcptt.releng</artifactId>
25+
<version>2.9.0-SNAPSHOT</version>
26+
</parent>
3227

33-
<repositories>
34-
<repository>
35-
<id>orbit</id>
36-
<layout>p2</layout>
37-
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository</url>
38-
</repository>
39-
<repository>
40-
<id>ecl-platform-repository</id>
41-
<layout>p2</layout>
42-
<url>${ecl-platform-repository}</url>
43-
</repository>
44-
</repositories>
28+
<modules>
29+
<module>../../ecl/plugins</module>
30+
<module>../../ecl/features</module>
31+
<module>../../ecl/tests</module>
32+
<module>../../ecl/repository</module>
33+
</modules>
34+
35+
<repositories>
36+
<repository>
37+
<id>orbit</id>
38+
<layout>p2</layout>
39+
<url>
40+
https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository</url>
41+
</repository>
42+
<repository>
43+
<id>ecl-platform-repository</id>
44+
<layout>p2</layout>
45+
<url>${ecl-platform-repository}</url>
46+
</repository>
47+
</repositories>
48+
49+
<build>
50+
<pluginManagement>
51+
<plugins>
52+
<plugin>
53+
<groupId>${tycho-groupid}</groupId>
54+
<artifactId>target-platform-configuration</artifactId>
55+
<configuration>
56+
<requireEagerResolve>true</requireEagerResolve> <!--aspectj-maven-plugin fails without prepared Target Platform-->
57+
<executionEnvironment>${ecl.executionEnvironment}</executionEnvironment>
58+
</configuration>
59+
</plugin>
60+
</plugins>
61+
</pluginManagement>
62+
</build>
4563
</project>

‎releng/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<signExcludeInnerJars>true</signExcludeInnerJars>
3333
<eclipse-pde-repository>https://download.eclipse.org/staging/2026-03</eclipse-pde-repository>
3434
<ecl-platform-repository>https://download.eclipse.org/releases/2021-12</ecl-platform-repository>
35+
<ecl.executionEnvironment>JavaSE-17</ecl.executionEnvironment> <!-- Should be compatible with ecl-platform-repository -->
3536
<aspectj_version>1.14.0</aspectj_version>
3637
<aspectj_dep>1.9.7</aspectj_dep>
3738
<ajJavaSource>1.8</ajJavaSource>

‎releng/runtime/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ documentation -->
8585
<artifactId>target-platform-configuration</artifactId>
8686
<configuration>
8787
<requireEagerResolve>true</requireEagerResolve> <!--aspectj-maven-plugin fails without prepared Target Platform-->
88-
<executionEnvironment>JavaSE-17</executionEnvironment>
8988
</configuration>
9089
</plugin>
9190
</plugins>

‎runtime/contexts/org.eclipse.rcptt.ctx.debug.impl/src/org/eclipse/rcptt/debug/runtime/DebugContextProcessor.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,8 @@ public void apply(final Context ctx, BooleanSupplier isCancelled) throws CoreExc
233233
return;
234234
}
235235
long stop = currentTimeMillis() + TeslaLimits.getContextRunnableTimeout();
236-
final UIJobCollector collector = new UIJobCollector();
237-
Job.getJobManager().addJobChangeListener(collector);
238-
try {
236+
237+
try (UIJobCollector collector = new UIJobCollector(Job.getJobManager())) {
239238
UIRunnable.exec(new UIRunnable<Object>() {
240239
@Override
241240
public Object run() throws CoreException {
@@ -279,8 +278,6 @@ public Object run() throws CoreException {
279278
helper.applyLaunches(context.getLaunches());
280279
} catch (InterruptedException e) {
281280
throw new CoreException(RcpttPlugin.createStatus("Launch context was interrupted", e));
282-
} finally {
283-
Job.getJobManager().removeJobChangeListener(collector);
284281
}
285282
}
286283

‎runtime/contexts/org.eclipse.rcptt.ctx.preferences.impl/src/org/eclipse/rcptt/ctx/preferences/impl/PreferencesContextProcessor.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ public class PreferencesContextProcessor implements IContextProcessor {
6060
@Override
6161
public void apply(final Context contextToApply, BooleanSupplier isCancelled) throws CoreException {
6262
long stop = currentTimeMillis() + TeslaLimits.getContextRunnableTimeout();
63-
final UIJobCollector collector = new UIJobCollector();
64-
Job.getJobManager().addJobChangeListener(collector);
6563
SWTUIPlayer.disableMessageDialogs();
66-
try {
64+
try (final UIJobCollector collector = new UIJobCollector(Job.getJobManager())) {
6765
UIRunnable.exec(new UIRunnable<Object>() {
6866
@Override
6967
public Object run() throws CoreException {
@@ -88,7 +86,6 @@ public Object run() throws CoreException {
8886
throw ee;
8987
} finally {
9088
SWTUIPlayer.enableMessageDialogs();
91-
Job.getJobManager().removeJobChangeListener(collector);
9289
}
9390
}
9491

0 commit comments

Comments
 (0)