diff --git a/com.avaloq.tools.ddk.check.core.test/.classpath b/com.avaloq.tools.ddk.check.core.test/.classpath
index bad5dd7a27..ea3640ba13 100644
--- a/com.avaloq.tools.ddk.check.core.test/.classpath
+++ b/com.avaloq.tools.ddk.check.core.test/.classpath
@@ -3,7 +3,6 @@
-
diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 0bd941889e..d5412a8e0d 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -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,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath b/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
index a0c3adab0f..ccaaf2210f 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
@@ -9,9 +9,6 @@
-
-
-
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 1154b3c5e0..1477542dc0 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -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,
diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
index c5372c62e6..dc244afce0 100644
--- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
@@ -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
diff --git a/com.avaloq.tools.ddk.test.ui.test/src/com/avaloq/tools/ddk/test/ui/test/AllTests.java b/com.avaloq.tools.ddk.test.ui.test/src/com/avaloq/tools/ddk/test/ui/test/AllTests.java
index 95b9d298b7..b3f79d268b 100644
--- a/com.avaloq.tools.ddk.test.ui.test/src/com/avaloq/tools/ddk/test/ui/test/AllTests.java
+++ b/com.avaloq.tools.ddk.test.ui.test/src/com/avaloq/tools/ddk/test/ui/test/AllTests.java
@@ -18,7 +18,7 @@
/**
- * Empty class serving only as holder for JUnit4 annotations.
+ * Empty class serving only as holder for JUnit annotations.
*/
@Suite
@SelectClasses({
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 9da8b65993..dc4365cafd 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ 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.junit5_x,
org.eclipse.swtbot.swt.finder,
org.eclipse.ui;visibility:=reexport,
org.hamcrest.library,
diff --git a/com.avaloq.tools.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/ExportTestSuite.java b/com.avaloq.tools.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/ExportTestSuite.java
index 6439fdfb32..55dc1eca71 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/ExportTestSuite.java
+++ b/com.avaloq.tools.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/ExportTestSuite.java
@@ -21,7 +21,7 @@
/**
- * Empty class serving only as holder for JUnit4 annotations.
+ * Empty class serving only as holder for JUnit annotations.
*/
@Suite
@SelectClasses({ExportFormattingTest.class, ExportValidationTest.class, ExportValidationOkTest.class, ExportScopingTest.class, ExportExportingTest.class})
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 2c06458a3e..ef98b20242 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
org.eclipse.emf.ecore,
junit-jupiter-api,
junit-jupiter-engine,
- junit-vintage-engine,
junit-platform-suite-api,
org.eclipse.xtext.testing,
org.opentest4j
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index b94f0de796..50f58bb3ea 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -17,6 +17,7 @@
tycho-surefire-plugin
${tycho.version}
+ junit5
false
false
${test.testClass}
@@ -49,8 +50,8 @@
0.0.0
- eclipse-feature
- org.eclipse.pde
+ eclipse-plugin
+ org.eclipse.pde.junit.runtime
0.0.0
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java
index c05b8c5869..1043771909 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java
@@ -29,7 +29,7 @@
/**
- * Empty class serving only as holder for JUnit4 annotations.
+ * Empty class serving only as holder for JUnit annotations.
*/
// CHECKSTYLE:OFF HideUtilityClassConstructor
diff --git a/ddk-configuration/launches/devkit-run.launch b/ddk-configuration/launches/devkit-run.launch
index 0229f0ddcc..5f6c29b6bf 100644
--- a/ddk-configuration/launches/devkit-run.launch
+++ b/ddk-configuration/launches/devkit-run.launch
@@ -223,7 +223,7 @@
-
+
@@ -269,7 +269,6 @@
-
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index a2ade38df0..c76e048d18 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -1,20 +1,24 @@
-
+
-
-
+
+
-
-
+
-
-
+
+
+
+
+
+
+
@@ -42,27 +46,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+