Reduce javax E4-Injector tests to the minimum and add Singleton test

Author: HannesWell

runtime/tests/org.eclipse.e4.core.javax.tests/.gitignore

@@ -20,11 +20,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>

runtime/tests/org.eclipse.e4.core.javax.tests/.project

@@ -4,54 +4,15 @@ Bundle-Name: E4 Core Tests
 Bundle-SymbolicName: org.eclipse.e4.core.javax.tests
 Bundle-Version: 1.3.300.qualifier
 Bundle-Vendor: Eclipse.org
-Bundle-Activator: org.eclipse.e4.core.internal.tests.CoreTestsActivator
-Require-Bundle: org.eclipse.equinox.preferences;bundle-version="3.3.0",
- org.eclipse.e4.core.di,
- org.eclipse.e4.core.di.extensions,
- org.eclipse.e4.core.di.extensions.supplier,
- org.eclipse.e4.core.contexts,
- org.eclipse.equinox.registry;bundle-version="3.5.0",
- org.eclipse.core.tests.harness;bundle-version="3.6.0",
- org.eclipse.e4.core.services;bundle-version="1.1.0"
+Require-Bundle: org.eclipse.e4.core.di,
+ org.eclipse.e4.core.contexts
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
  javax.inject;version="[1.0.0,2.0.0)",
- org.assertj.core.api,
- org.eclipse.osgi.service.datalocation,
- org.eclipse.osgi.service.debug,
  org.junit.jupiter.api;version="[5.12.0,6.0.0)",
- org.junit.jupiter.api.function;version="[5.12.0,6.0.0)",
- org.junit.platform.suite.api;version="[1.12.0,2.0.0)",
- org.osgi.framework;version="[1.10.0,2.0.0)",
- org.osgi.service.component;version="1.3.0",
- org.osgi.service.component.propertytypes;version="[1.4.0,2.0.0)",
- org.osgi.service.event;version="1.3.0",
- org.osgi.util.tracker;version="[1.5.0,2.0.0)"
-Export-Package: org.eclipse.e4.core.internal.tests;x-internal:=true,
- org.eclipse.e4.core.internal.tests.contexts;x-internal:=true,
- org.eclipse.e4.core.internal.tests.contexts.inject;x-internal:=true,
- org.eclipse.e4.core.internal.tests.contexts.performance;x-internal:=true,
- org.eclipse.e4.core.internal.tests.di;x-internal:=true,
- org.eclipse.e4.core.internal.tests.di.extensions;x-internal:=true,
- org.eclipse.e4.core.internal.tests.manual;x-internal:=true,
- org.eclipse.e4.core.internal.tests.nls;x-internal:=true,
+ org.junit.platform.suite.api;version="[1.12.0,2.0.0)"
+Export-Package: org.eclipse.e4.core.internal.tests.contexts.inject;x-internal:=true,
  org.eclipse.e4.core.javax.tests
-Service-Component: OSGI-INF/DisabledServiceA.xml,
- OSGI-INF/DisabledServiceB.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.AddContextFunction.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceA.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceB.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.contexts.inject.TestServiceController.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.ComponentEnabler.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.FilterServiceA.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.FilterServiceB.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.SampleServiceA.xml,
- OSGI-INF/org.eclipse.e4.core.internal.tests.di.extensions.SampleServiceB.xml
 Eclipse-BundleShape: dir
-Require-Capability: osgi.extender;
-  filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))",
- osgi.service;
-  filter:="(objectClass=org.osgi.service.event.EventAdmin)";
-  effective:="active"
 Automatic-Module-Name: org.eclipse.e4.core.javax.tests

runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.pde.ds.annotations.prefs

@@ -1,2 +1,2 @@
-This is a copy of `org.eclipse.e4.core.tests`, that uses javax annotations while the original uses jakarta annotations now.
+This is a reduced minimal copy of `org.eclipse.e4.core.tests`, that verifies javax annotations continue to work, not only the mainly used jakarta annotations.
 When support for javax annotations is removed from the E4-Injector, this project can be deleted entirely as well.

runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010, 2015 IBM Corporation and others.
+# Copyright (c) 2010, 2026 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -17,8 +17,8 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                test.xml,\
-               OSGI-INF/,\
-               resources/,\
-               about.html
-src.includes = resources/,\
                about.html
+src.includes = about.html
+
+# Maven/Tycho POM adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
+pom.model.property.testClass = org.eclipse.e4.core.javax.tests.CoreTestSuite