Skip to content
Closed
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 @@ -13,7 +13,7 @@ jobs:
uses: pmd/pmd-github-action@v2.0.0
id: pmd
with:
version: '7.15.0'
version: '7.17.0'
rulesets: 'ddk-configuration/pmd/ruleset.xml'
analyzeModifiedFilesOnly: false
- name: Fail build if there are violations
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<useUIThread>false</useUIThread>
<useUIHarness>true</useUIHarness>
<forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
<argLine>-Dlogback.configurationFile="${runtime.logbackConfig}" ${test.javaOptions}</argLine>
<argLine>-Dlogback.configurationFile="${runtime.logbackConfig}" ${test.javaOptions} -XstartOnFirstThread</argLine>
<appArgLine>-pluginCustomization ${runtime.pluginCustomization}</appArgLine>
<product>${runtime.product}</product>
<application>org.eclipse.ui.ide.workbench</application>
Expand Down
72 changes: 55 additions & 17 deletions ddk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<target.platform>ddk</target.platform>
<workspace>${env.WORKSPACE}</workspace>

<!-- OSGI parameter -->
<osgi.os>win32</osgi.os>
<osgi.ws>win32</osgi.ws>
<!-- OSGI parameter - default to Linux for GitHub Actions -->
<osgi.os>linux</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.arch>x86_64</osgi.arch>

<!-- runtime parameter -->
Expand Down Expand Up @@ -382,46 +382,84 @@
</pluginManagement>
</build>
<profiles>
<!-- Platform-specific profiles for OSGI environment configuration -->

<!-- Linux x86_64 (default for GitHub Actions) -->
<profile>
<id>linux-x86_64</id>
<activation>
<activeByDefault>true</activeByDefault>
<os>
<name>linux</name>
<arch>amd64</arch>
<family>windows</family>
<family>unix</family>
</os>
</activation>
<id>64bit_windows</id>
<properties>
<osgi.os>linux</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.arch>x86_64</osgi.arch>
</properties>
</profile>

<!-- Linux aarch64 -->
<profile>
<id>linux-aarch64</id>
<properties>
<osgi.os>linux</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.arch>aarch64</osgi.arch>
</properties>
</profile>

<!-- Windows x86_64 -->
<profile>
<id>windows-x86_64</id>
<activation>
<os>
<name>sunos</name>
<family>unix</family>
<arch>amd64</arch>
<family>windows</family>
</os>
</activation>
<id>solaris</id>
<properties>
<osgi.os>solaris</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.arch>x86</osgi.arch>
<osgi.os>win32</osgi.os>
<osgi.ws>win32</osgi.ws>
<osgi.arch>x86_64</osgi.arch>
</properties>
</profile>

<!-- macOS x86_64 (Intel) -->
<profile>
<id>macos-x86_64</id>
<activation>
<os>
<name>linux</name>
<arch>amd64</arch>
<family>unix</family>
<name>mac os x</name>
<arch>x86_64</arch>
<family>mac</family>
</os>
</activation>
<id>64bit_linux</id>
<properties>
<osgi.os>linux</osgi.os>
<osgi.ws>gtk</osgi.ws>
<osgi.os>macosx</osgi.os>
<osgi.ws>cocoa</osgi.ws>
<osgi.arch>x86_64</osgi.arch>
</properties>
</profile>

<!-- macOS aarch64 (Apple Silicon) -->
<profile>
<id>macos-aarch64</id>
<activation>
<os>
<name>mac os x</name>
<arch>aarch64</arch>
<family>mac</family>
</os>
</activation>
<properties>
<osgi.os>macosx</osgi.os>
<osgi.ws>cocoa</osgi.ws>
<osgi.arch>aarch64</osgi.arch>
</properties>
</profile>
</profiles>
</project>
Loading