Add o.e.e4.core.javax.tests as javax-using copy of o.e.e4.core.tests

and migrate o.e.e4.core.tests to use jakarta-annotations.

All test-cases besides the About-tests are copied from
org.eclipse.e4.core.tests
Consequently o.e.e4.core.javax.tests only differ in the fact that the
former uses javax-annotations, while the latter uses
jakarta-annotations.

When support for javax-annotations is removed from the E4-Injector,
o.e.e4.core.javax.tests can be deleted too.

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

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

@@ -0,0 +1 @@
+OSGI-INF/*.xml

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.e4.core.javax.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.core.runtime.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n

runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,66 @@
+cleanup.use_type_arguments=false
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_settings_version=14
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false

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

@@ -0,0 +1,7 @@
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error

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

@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: E4 Core Tests
+Bundle-SymbolicName: org.eclipse.e4.core.javax.tests
+Bundle-Version: 1.3.200.qualifier
+Bundle-Vendor: Eclipse.org
+Bundle-Activator: org.eclipse.e4.core.internal.tests.CoreTestsActivator
+Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
+ 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",
+ org.junit;bundle-version="4.12.0"
+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.osgi.service.component;version="1.3.0",
+ org.osgi.service.event;version="1.3.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.eclipse.e4.core.javax.tests
+Service-Component: OSGI-INF/*.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/OSGI-INF/l10n/bundle.properties

@@ -0,0 +1,11 @@
+message=BundleMessage
+message_one=BundleMessageUnderscore
+messageOne=BundleMessageCamelCase
+message.two=BundleMessageUnderscoreDot
+message.three=BundleMessageCamelCaseDot
+message.four=The idea is from {0}
+messageFive_Sub=BundleMessageCamelCaseAndUnderscoreOriginal
+message_six__sub=BundleMessageCamelCaseAndUnderscoreDeCamelCasified
+message.seven..sub=BundleMessageCamelCaseAndUnderscoreDeCamelCasifiedAndDeUnderscorified
+messageEight.Sub=BundleMessageCamelCaseAndUnderscoreDeUnderscorified
+message_nine._sub=BundleMessageCamelCaseAndUnderscoreDeUnderscorifiedAndDeCamelCasified

runtime/tests/org.eclipse.e4.core.javax.tests/OSGI-INF/l10n/bundle_de.properties

@@ -0,0 +1,10 @@
+message=BundleNachricht
+message_one=BundleNachrichtUnderscore
+messageOne=BundleNachrichtCamelCase
+message.two=BundleNachrichtUnderscoreDot
+message.four=Die Idee ist von {0}
+messageFive_Sub=BundleNachrichtCamelCaseAndUnderscoreOriginal
+message_six__sub=BundleNachrichtCamelCaseAndUnderscoreDeCamelCasified
+message.seven..sub=BundleNachrichtCamelCaseAndUnderscoreDeCamelCasifiedAndDeUnderscorified
+messageEight.Sub=BundleNachrichtCamelCaseAndUnderscoreDeUnderscorified
+message_nine._sub=BundleNachrichtCamelCaseAndUnderscoreDeUnderscorifiedAndDeCamelCasified

runtime/tests/org.eclipse.e4.core.javax.tests/OSGI-INF/l10n/bundle_de_ch_test.properties

@@ -0,0 +1,10 @@
+message=BundleNachrichtVariant
+message_one=BundleNachrichtUnderscoreVariant
+messageOne=BundleNachrichtCamelCaseVariant
+message.two=BundleNachrichtUnderscoreDotVariant
+message.four=Die Idee ist von {0} Variant
+messageFive_Sub=BundleNachrichtCamelCaseAndUnderscoreOriginalVariant
+message_six__sub=BundleNachrichtCamelCaseAndUnderscoreDeCamelCasifiedVariant
+message.seven..sub=BundleNachrichtCamelCaseAndUnderscoreDeCamelCasifiedAndDeUnderscorifiedVariant
+messageEight.Sub=BundleNachrichtCamelCaseAndUnderscoreDeUnderscorifiedVariant
+message_nine._sub=BundleNachrichtCamelCaseAndUnderscoreDeUnderscorifiedAndDeCamelCasifiedVariant

runtime/tests/org.eclipse.e4.core.javax.tests/README.md

@@ -0,0 +1,2 @@
+This is a copy of `org.eclipse.e4.core.tests`, that uses javax-annotations while the original uses jakarta-annotations.
+When support for javax-annotations is removed from the E4-Injector, this project can be deleted too.

runtime/tests/org.eclipse.e4.core.javax.tests/about.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>

runtime/tests/org.eclipse.e4.core.javax.tests/build.properties

@@ -0,0 +1,24 @@
+###############################################################################
+# Copyright (c) 2010, 2015 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474642
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               test.xml,\
+               OSGI-INF/,\
+               resources/,\
+               about.html
+src.includes = resources/,\
+               about.html

runtime/tests/org.eclipse.e4.core.javax.tests/pom.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2023, 2023 Hannes Wellmann and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+     Hannes Wellmann - initial implementation
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.platform</groupId>
+		<artifactId>eclipse.platform.runtime</artifactId>
+		<version>4.30.0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+	<artifactId>org.eclipse.e4.core.javax.tests</artifactId>
+	<version>1.3.200-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+	<properties>
+		<testClass>org.eclipse.e4.core.javax.tests.CoreTestSuite</testClass>
+	</properties>
+	<build>
+		<testSourceDirectory>src</testSourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- The tycho-ds-plugin generates component-xml files into
+					target/classes/OSGI-INF, but when this Plugin is exected in a tycho-surefire
+					runtime, the bundle-root is this project's root directory and the
+					Service-Component-Runtime only searches for component-xml files only in
+					<bundle-root>/OSGI-INF and does not consider the classpath-->
+					<execution>
+						<id>copy-ds-component-xml</id>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>
+										${project.build.outputDirectory}/OSGI-INF</directory>
+									<include>*.xml</include>
+								</resource>
+							</resources>
+							<outputDirectory>${project.basedir}/OSGI-INF</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

runtime/tests/org.eclipse.e4.core.javax.tests/resources/another.properties

@@ -0,0 +1,11 @@
+message=ResourcesMessage
+message_one=ResourcesMessageUnderscore
+messageOne=ResourcesMessageCamelCase
+message.two=ResourcesMessageUnderscoreDot
+message.three=ResourcesMessageCamelCaseDot
+message.four=The idea is from {0}
+messageFive_Sub=ResourcesMessageCamelCaseAndUnderscoreOriginal
+message_six__sub=ResourcesMessageCamelCaseAndUnderscoreDeCamelCasified
+message.seven..sub=ResourcesMessageCamelCaseAndUnderscoreDeCamelCasifiedAndDeUnderscorified
+messageEight.Sub=ResourcesMessageCamelCaseAndUnderscoreDeUnderscorified
+message_nine._sub=ResourcesMessageCamelCaseAndUnderscoreDeUnderscorifiedAndDeCamelCasified

runtime/tests/org.eclipse.e4.core.javax.tests/resources/another_de.properties

@@ -0,0 +1,10 @@
+message=ResourcesNachricht
+message_one=ResourcesNachrichtUnderscore
+messageOne=ResourcesNachrichtCamelCase
+message.two=ResourcesNachrichtUnderscoreDot
+message.four=Die Idee ist von {0}
+messageFive_Sub=ResourcesNachrichtCamelCaseAndUnderscoreOriginal
+message_six__sub=ResourcesNachrichtCamelCaseAndUnderscoreDeCamelCasified
+message.seven..sub=ResourcesNachrichtCamelCaseAndUnderscoreDeCamelCasifiedAndDeUnderscorified
+messageEight.Sub=ResourcesNachrichtCamelCaseAndUnderscoreDeUnderscorified
+message_nine._sub=ResourcesNachrichtCamelCaseAndUnderscoreDeUnderscorifiedAndDeCamelCasified