Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.12
maven-version: 3.9.13
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v5
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
*.xtendbin
/*/xtend-gen/*
!/*/xtend-gen/.gitignore
.tycho-consumer-pom.xml
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.check.ui.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.extension.ExtendWith;

import com.avaloq.tools.ddk.check.ui.test.internal.CheckWizardUiTestInjectorProvider;
Expand All @@ -58,6 +60,12 @@
@ExtendWith(InjectionExtension.class)
@SuppressWarnings("nls")
@TestInstance(Lifecycle.PER_CLASS)
// On macOS, SWT Cocoa's modal event loop inside WizardDialog.open() blocks
// Display.sleep() on NSRunLoop.runMode(distantFuture). SWTBot's syncExec-based
// polling cannot reliably wake this up in a background test process without OS
// focus. This is consistent with Eclipse Foundation practice: SWTBot wizard tests
// are run on Linux CI (with xvfb), not on macOS.
@DisabledOnOs(OS.MAC)
public class CheckCatalogWizardTest {

/** This is the name of the catalog wizard. It's the name SWTBot uses to look up the wizard. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.extension.ExtendWith;

import com.avaloq.tools.ddk.check.ui.test.internal.CheckWizardUiTestInjectorProvider;
Expand All @@ -35,6 +37,12 @@
@InjectWith(CheckWizardUiTestInjectorProvider.class)
@ExtendWith(InjectionExtension.class)
@SuppressWarnings("nls")
// On macOS, SWT Cocoa's modal event loop inside WizardDialog.open() blocks
// Display.sleep() on NSRunLoop.runMode(distantFuture). SWTBot's syncExec-based
// polling cannot reliably wake this up in a background test process without OS
// focus. This is consistent with Eclipse Foundation practice: SWTBot wizard tests
// are run on Linux CI (with xvfb), not on macOS.
@DisabledOnOs(OS.MAC)
public class CheckProjectWizardTest {

/** This is the name of the project wizard. It's the name SWTBot uses to look up the wizard. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.checkcfg.ui.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xms40m -Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.test.ui.test/AllTests.launch
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.test.ui.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.xtext.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms256m&#13;&#10;-Xmx1536m&#13;&#10;-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread&#13;&#10;-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms256m&#13;&#10;-Xmx1536m&#13;&#10;-ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.xtext.ui.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.avaloq.test.sorter=alphanumeric&#13;&#10;-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread&#13;&#10;-Dcom.avaloq.test.sorter=alphanumeric&#13;&#10;-ea"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Expand Down
2 changes: 1 addition & 1 deletion ddk-configuration/launches/devkit-run.launch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog -clean -debug &quot;${workspace_loc:ddk-configuration/logging/debug.options}&quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms1g&#13;&#10;-Xmx3g"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread&#13;&#10;-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms1g&#13;&#10;-Xmx3g"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
<setAttribute key="selected_target_bundles">
Expand Down
27 changes: 15 additions & 12 deletions ddk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<test.testClass>com.avaloq.tools.ddk.xtext.AllTests</test.testClass>

<!-- maven enforced version -->
<maven-enforcer-rule.version>3.9.12</maven-enforcer-rule.version>
<maven-enforcer-rule.version>3.9.13</maven-enforcer-rule.version>

<!-- maven plugin versions -->
<checkstyle.plugin.version>3.6.0</checkstyle.plugin.version>
Expand Down Expand Up @@ -374,6 +374,9 @@
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>.gitignore</exclude>
</excludes>
</fileset>
</filesets>
</configuration>
Expand All @@ -397,30 +400,30 @@
<profile>
<activation>
<os>
<name>sunos</name>
<name>linux</name>
<arch>amd64</arch>
<family>unix</family>
</os>
</activation>
<id>solaris</id>
<id>64bit_linux</id>
<properties>
<osgi.os>solaris</osgi.os>
<osgi.os>linux</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.arch>x86</osgi.arch>
<osgi.arch>x86_64</osgi.arch>
</properties>
</profile>
<profile>
<id>macosx</id>
<activation>
<os>
<name>linux</name>
<arch>amd64</arch>
<family>unix</family>
<family>mac</family>
</os>
</activation>
<id>64bit_linux</id>
<properties>
<osgi.os>linux</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.arch>x86_64</osgi.arch>
<osgi.os>macosx</osgi.os>
<osgi.ws>cocoa</osgi.ws>
<osgi.arch>aarch64</osgi.arch>
<test.javaOptions>${runtime.javaOptions} -XstartOnFirstThread</test.javaOptions>
</properties>
</profile>
</profiles>
Expand Down