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
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
org.eclipse.xtext.xbase.testing,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine,
junit-platform-suite-api
Export-Package: com.avaloq.tools.ddk.check.core.test,
com.avaloq.tools.ddk.check.core.test.util,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
org.eclipse.xtext.xbase.lib,
junit-jupiter-api,
junit-jupiter-engine,
junit-platform-suite-api,
junit-vintage-engine
junit-platform-suite-api
Import-Package: org.hamcrest.core
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: com.avaloq.tools.ddk.check.test.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld,
org.eclipse.xtext.xbase.ui.testing,
junit-jupiter-api,
junit-jupiter-engine,
junit-platform-suite-api,
junit-vintage-engine
junit-platform-suite-api
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: com.avaloq.tools.ddk.sample.helloworld.test,
com.avaloq.tools.ddk.sample.helloworld.ui;x-internal=true
2 changes: 0 additions & 2 deletions com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.hamcrest.library,
org.junit,
org.mockito.mockito-core,
com.google.guava,
org.apache.commons.lang3,
Expand All @@ -21,7 +20,6 @@ Require-Bundle: org.eclipse.core.runtime,
Import-Package: org.apache.logging.log4j
Export-Package: com.avaloq.tools.ddk.test.core,
com.avaloq.tools.ddk.test.core.data,
com.avaloq.tools.ddk.test.core.junit.runners,
com.avaloq.tools.ddk.test.core.jupiter,
com.avaloq.tools.ddk.test.core.mock,
com.avaloq.tools.ddk.test.core.util
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.apache.logging.log4j.Logger;
import org.eclipse.core.runtime.Assert;

import com.avaloq.tools.ddk.test.core.jupiter.MultipleTestProblems;
import com.google.common.collect.Lists;


Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
org.eclipse.swt,
org.eclipse.swtbot.eclipse.core,
org.eclipse.swtbot.eclipse.finder;visibility:=reexport,
org.eclipse.swtbot.junit4_x,
org.eclipse.swtbot.swt.finder,
org.eclipse.ui;visibility:=reexport,
org.hamcrest.library,
org.junit,
junit-jupiter-api,
org.mockito.mockito-core,
com.google.guava,
org.apache.commons.lang3,
org.eclipse.emf.common,
com.avaloq.tools.ddk
Export-Package: com.avaloq.tools.ddk.test.ui,
com.avaloq.tools.ddk.test.ui.junit.runners,
com.avaloq.tools.ddk.test.ui.swtbot,
com.avaloq.tools.ddk.test.ui.swtbot.condition,
com.avaloq.tools.ddk.test.ui.swtbot.util
Expand Down
10 changes: 0 additions & 10 deletions com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
org.eclipse.xtext.ui,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib;visibility:=reexport,
org.junit,
org.mockito.mockito-core,
org.hamcrest.library,
com.avaloq.tools.ddk.check.runtime.core,
Expand All @@ -28,17 +27,8 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
junit-jupiter-api
Import-Package: org.apache.logging.log4j
Export-Package: com.avaloq.tools.ddk.xtext.test,
com.avaloq.tools.ddk.xtext.test.contentassist,
com.avaloq.tools.ddk.xtext.test.conversion,
com.avaloq.tools.ddk.xtext.test.formatting,
com.avaloq.tools.ddk.xtext.test.generator,
com.avaloq.tools.ddk.xtext.test.junit.runners,
com.avaloq.tools.ddk.xtext.test.jupiter,
com.avaloq.tools.ddk.xtext.test.jvmmodel,
com.avaloq.tools.ddk.xtext.test.linking,
com.avaloq.tools.ddk.xtext.test.model,
com.avaloq.tools.ddk.xtext.test.modelinference,
com.avaloq.tools.ddk.xtext.test.resource,
com.avaloq.tools.ddk.xtext.test.scoping,
com.avaloq.tools.ddk.xtext.test.validation
Automatic-Module-Name: com.avaloq.tools.ddk.xtext.test.core
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
org.eclipse.emf.ecore,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine,
junit-platform-suite-api,
junit-platform-suite-engine,
org.eclipse.xtext.testing,
org.opentest4j
Import-Package: com.avaloq.tools.ddk.check.runtime.test.core,
Expand Down
11 changes: 9 additions & 2 deletions com.avaloq.tools.ddk.xtext.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<configuration>
<trimStackTrace>false</trimStackTrace>
<skip>false</skip>
<providerHint>junit6</providerHint>
<testClass>${test.testClass}</testClass>
<failIfNoTests>false</failIfNoTests>
<useUIThread>false</useUIThread>
Expand Down Expand Up @@ -48,9 +49,15 @@
<id>org.eclipse.xtext.sdk</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!--
org.eclipse.pde feature group is replaced in ddk-target/ddk.target by an
explicit list of pde.core / pde.ui / pde.ua.core / pde.junit.runtime so we
avoid pulling jdt.junit5.runtime (which strict-pins JUnit 5.14.x and conflicts
with our JUnit 6 stack).
-->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.pde</id>
<type>eclipse-plugin</type>
<id>org.eclipse.pde.junit.runtime</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
Expand Down
57 changes: 32 additions & 25 deletions ddk-target/ddk.target
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="DDK Target" sequenceNumber="27">
<target name="DDK Target" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.2.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<!-- Curated bundle list instead of org.eclipse.pde.feature.group: that aggregator pulls
BOTH org.eclipse.jdt.junit5.runtime (which strict-pins JUnit 5.14.x) AND
org.eclipse.jdt.junit6.runtime (JUnit 6.x), producing the dual-version pollution
that crashed test discovery in PR #1292's silent-zero. The bundles below are the
minimum DDK actually uses (verified via static analysis of all MANIFEST.MFs and
src/ Java/Xtend imports); pde.junit.runtime + jdt.junit.runtime supply the OSGi-side
test launcher and depend only on the version-agnostic jdt.junit.runtime base. -->
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
<unit id="org.eclipse.pde.core" version="0.0.0"/>
<unit id="org.eclipse.pde.ui" version="0.0.0"/>
<unit id="org.eclipse.pde.ua.core" version="0.0.0"/>
<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit.runtime" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2026-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
Expand All @@ -35,34 +44,32 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.42.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.43.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4j/updates/releases/1.0.0/"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.17.7"/>
<unit id="org.objenesis" version="3.4.0"/>
<unit id="org.mockito.mockito-core" version="5.19.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.39.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.18.5"/>
<unit id="org.objenesis" version="3.5.0"/>
<unit id="org.mockito.mockito-core" version="5.21.0"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.text" version="1.14.0"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="org.apache.commons.lang3" version="3.18.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.1"/>
<unit id="org.apache.logging.log4j.api" version="2.25.1"/>
<unit id="org.apache.commons.text" version="1.15.0"/>
<unit id="org.apache.commons.lang3" version="3.20.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.3"/>
<unit id="org.apache.logging.log4j.api" version="2.25.3"/>
<unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
<unit id="junit-jupiter-api" version="5.13.4"/>
<unit id="junit-jupiter-engine" version="5.13.4"/>
<unit id="junit-jupiter-params" version="5.13.4"/>
<unit id="junit-vintage-engine" version="5.13.4"/>
<unit id="junit-platform-commons" version="1.13.4"/>
<unit id="junit-platform-engine" version="1.13.4"/>
<unit id="junit-platform-launcher" version="1.13.4"/>
<unit id="junit-platform-suite-api" version="1.13.4"/>
<unit id="junit-platform-suite-engine" version="1.13.4"/>
<unit id="junit-jupiter-api" version="6.0.3"/>
<unit id="junit-jupiter-engine" version="6.0.3"/>
<unit id="junit-jupiter-params" version="6.0.3"/>
<unit id="junit-platform-commons" version="6.0.3"/>
<unit id="junit-platform-engine" version="6.0.3"/>
<unit id="junit-platform-launcher" version="6.0.3"/>
<unit id="junit-platform-suite-api" version="6.0.3"/>
<unit id="junit-platform-suite-engine" version="6.0.3"/>
</location>
</locations>
</target>
Loading