Merge branch 'master' into copilot/fix-classcastexception-in-menu

Author: vogella

build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF

@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.ant,
  org.eclipse.debug.core,
  org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
- org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0"
+ org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0",
+ junit-jupiter-api;bundle-version="[5.14.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
  org.eclipse.equinox.internal.p2.artifact.repository,

ds/org.eclipse.pde.ds.tck/pom.xml

@@ -130,6 +130,7 @@
 								<properties>
 									<org.osgi.test.cases.component.annotations.bundle.symbolic.name>org.eclipse.pde.ds.tck</org.osgi.test.cases.component.annotations.bundle.symbolic.name>
 								</properties>
+								<skipTests>true</skipTests>
 							</configuration>
 						</execution>
 					</executions>

e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF

@@ -12,6 +12,9 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.110.0,4.0.0)",
  org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
- org.eclipse.ui.tests.harness;bundle-version="[1.8.100,2.0.0)"
+ org.eclipse.ui.tests.harness;bundle-version="[1.8.100,2.0.0)",
+ junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
+ junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
+ junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
-Import-Package: org.junit.jupiter.api;version="[5.8.1,6.0.0)"

e4tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF

@@ -13,6 +13,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.ui.tests.harness,
  org.eclipse.e4.tools.persistence,
  org.eclipse.e4.core.contexts,
- org.eclipse.e4.ui.workbench
-Bundle-ActivationPolicy: lazy
-Import-Package: org.junit.jupiter.api;version="[5.8.1,6.0.0)"
+ org.eclipse.e4.ui.workbench,
+ junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
+ junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
+ junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
+ junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)"
+Bundle-ActivationPolicy: lazy 

ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PDE JUnit Runtime Tests
 Bundle-SymbolicName: org.eclipse.pde.junit.runtime.tests;singleton:=true
-Bundle-Version: 3.8.100.qualifier
+Bundle-Version: 3.8.200.qualifier
 Automatic-Module-Name: org.eclipse.pde.junit.runtime.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: Eclipse.org
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.jdt.core;bundle-version="3.19.0",
  org.eclipse.debug.ui;bundle-version="3.14.200",
  org.eclipse.ui;bundle-version="3.114.0",
- org.eclipse.pde.ui.tests;bundle-version="3.11.500"
+ org.eclipse.pde.ui.tests;bundle-version="3.11.500",
+ junit-jupiter-api;bundle-version="[5.14.0,6.0.0)"
 Import-Package: org.assertj.core.api;version="3.14.0",
  org.junit,
  org.junit.rules,

ui/org.eclipse.pde.junit.runtime.tests/pom.xml

@@ -24,7 +24,7 @@
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.pde.junit.runtime.tests</artifactId>
-	<version>3.8.100-SNAPSHOT</version>
+	<version>3.8.200-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<plugins>

ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF

@@ -60,6 +60,8 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  org.hamcrest,
  org.junit,
  org.junit.jupiter.api.function;version="5.8.1",
+ org.junit.jupiter.migrationsupport;version="[5.13.0,6.0.0)",
+ org.junit.platform.suite.api;version="[1.13.0,2.0.0)",
  org.junit.rules,
  org.junit.runner,
  org.junit.runners,

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/AllPDECoreTests.java

@@ -1,11 +1,10 @@
 package org.eclipse.pde.core.tests.internal;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@SuiteClasses({ //
+@Suite
+@SelectClasses({ //
 	DependencyManagerTest.class, //
 	WorkspaceModelManagerTest.class, //
 	WorkspaceProductModelManagerTest.class, //

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java

@@ -37,12 +37,11 @@
 import org.eclipse.pde.ui.tests.views.log.AllLogViewTests;
 import org.eclipse.pde.ui.tests.wizards.AllNewProjectTests;
 import org.eclipse.ui.tests.smartimport.ProjectSmartImportTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@SuiteClasses({ //
+@Suite
+@SelectClasses({ //
 	AllTargetTests.class, //
 	AllNewProjectTests.class, //
 	AllPreferenceTests.class, //

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/launcher/AllLauncherTests.java

@@ -14,15 +14,11 @@
 package org.eclipse.pde.ui.tests.launcher;
 
 import org.eclipse.pde.ui.tests.launcher.product.ProductEditorLaunchingTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-/**
- * @since 3.5
- */
-@RunWith(Suite.class)
-@SuiteClasses({ //
+@Suite
+@SelectClasses({ //
 	FeatureBasedLaunchTest.class, //
 	PluginBasedLaunchTest.class, //
 	LaunchConfigurationHelperTestCase.class, //