Move o.e.m2e.maven.runtime to m2e's git-repo root

and delete the now empty m2e-maven-runtime project.

Since o.e.m2e.maven.runtime is the only remaining module in
m2e-maven-runtime there is no need anymore to keep m2e-maven-runtime as
its parent project.

.github/workflows/licensecheck.yml

@@ -19,6 +19,6 @@ jobs:
     uses: eclipse/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
     with:
       projectId: technology.m2e
-      setupScript: 'cd m2e-maven-runtime && mvn generate-resources'
+      setupScript: 'cd org.eclipse.m2e.maven.runtime && mvn generate-resources'
     secrets:
       gitlabAPIToken: ${{ secrets.M2E_GITLAB_API_TOKEN }}

CONTRIBUTING.md

@@ -57,7 +57,7 @@ Step by Step guide:
     3. Click *Next* .
 7. Press *Finish* on the *Confirmation* page will start the installation process. 
 8. The installer will download the selected Eclipse version, starts Eclipse and will perform all the additional steps (cloning the git repos, etc...). When the downloaded Eclispe started, the progress bar in the status bar shows the progress of the overall setup.
-9. Once the *Executing startup task* job is finished you should have all the *m2-core*, *m2-core-tests* and *m2e-maven-runtime* projects imported into three working sets called *m2-core*, *m2-core-tests* and *m2e-maven-runtime*.
+9. Once the *Executing startup task* job is finished you should have all the *m2-core* and *m2-core-tests* projects imported into three working sets called *m2-core*  and *m2-core-tests*.
 10. Remaining errors are resolved after a restart of Eclipse.
 11. Happy coding!
 
@@ -70,10 +70,6 @@ Some tests are in a separate repository which is referenced as a Git submodule i
 * Use latest release of the Eclipse SDK or Eclipse IDE with the Plugin Development Environment installed.
 * Make sure m2e is installed in this IDE, including the "m2e PDE" feature,
 * _File > Open Projects from Filesystem..._ , select the path to m2e-core Git repo and the relevant children projects you want to import; approve m2e connectors installation if prompted
-* Depending on the task you're planning to work on, multiple workflows are available to configure the [target-platform](https://help.eclipse.org/2021-03/topic/org.eclipse.pde.doc.user/concepts/target.htm?cp=4_1_5)
-    * In many cases, this simplest workflow will be sufficient: Install latest m2e snapshot in your target-platform (can be your current IDE), or
-    * If you don't want to mix versions of m2e, open  __target-platform/dev-worksace.target__  and  _Set as Target-Platform_  from the editor, or
-    * In case you're working on the content of the `m2e-maven-runtime` folder, then run `mvn install -f m2e-maven-runtime/` after your changes to deploy them locally and then tweak the  _target-platform/dev-worksace.target_  to reference the versions of those artifacts you build locally and reload this target platform
 * Open the project modules you want to work on (right-click > Open project) and their dependencies; approve m2e connectors installation if prompted
 * Happy coding!
 

Jenkinsfile

@@ -58,7 +58,6 @@ pipeline {
 					archiveArtifacts artifacts: 'org.eclipse.m2e.repository/target/*.zip,\
 						*/target/work/data/.metadata/.log,\
 						m2e-core-tests/*/target/work/data/.metadata/.log,\
-						m2e-maven-runtime/target/*.properties,\
 						**/target/artifactcomparison/*'
 					archiveArtifacts (artifacts: '**/target/products/*.zip,**/target/products/*.tar.gz', onlyIfSuccessful: true)
 					junit '*/target/surefire-reports/TEST-*.xml,*/*/target/surefire-reports/TEST-*.xml'

org.eclipse.m2e.feature/forceQualifierUpdate.txt

@@ -1,3 +1,4 @@
 # To force a version qualifier update add the bug here
 Update build-qualifier because maven-runtime components currently use the committer's time-zone for their qualifier and don't align with the other projects that use UTC.
 Update build-qualifier because maven-runtime components now use again UTC+0-based qualifiers.
+Move o.e.m2e.maven.runtime to m2e's git-repo root 

m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml → org.eclipse.m2e.maven.runtime/pom.xml

@@ -14,12 +14,13 @@
 
 	<parent>
 		<groupId>org.eclipse.m2e</groupId>
-		<artifactId>m2e-maven-runtime</artifactId>
+		<artifactId>m2e-parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
+		<relativePath>../m2e-parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.9.100-SNAPSHOT</version>
+	<version>3.9.101-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>

pom.xml

@@ -40,7 +40,7 @@
 	<modules>
 		<module>target-platform</module>
 
-		<module>m2e-maven-runtime</module>
+		<module>org.eclipse.m2e.maven.runtime</module>
 
 		<module>org.eclipse.m2e.archetype.common</module>
 		<module>org.eclipse.m2e.model.edit</module>
@@ -104,7 +104,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.9.100-SNAPSHOT</version>
+			<version>3.9.101-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

setup/m2e.setup

@@ -152,8 +152,7 @@
     <sourceLocator
         rootFolder="${git.clone.m2e.core.location/m2e-parent}"/>
     <sourceLocator
-        rootFolder="${git.clone.m2e.core.location/m2e-maven-runtime}"
-        locateNestedProjects="true"/>
+        rootFolder="${git.clone.m2e.core.location/org.eclipse.m2e.maven.runtime}"/>
   </setupTask>
   <setupTask
       xsi:type="setup.workingsets:WorkingSetTask"
@@ -169,17 +168,9 @@
             includeNestedRepositories="true"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//'m2e.workingsets'/@workingSets[name='m2e-core-tests'] //'m2e.workingsets'/@workingSets[name='m2e-maven-runtime']"/>
+            excludedWorkingSet="//'m2e.workingsets'/@workingSets[name='m2e-core-tests']"/>
       </predicate>
     </workingSet>
-    <workingSet
-        name="m2e-maven-runtime"
-        id="m2e.maven.runtime">
-      <predicate
-          xsi:type="predicates:RepositoryPredicate"
-          project="org.eclipse.m2e.core"
-          relativePathPattern="m2e-maven-runtime/.*"/>
-    </workingSet>
     <workingSet
         name="m2e-core-tests"
         id="m2e.core.tests">

setup/m2eDevelopmentEnvironmentConfiguration.setup

@@ -27,7 +27,7 @@
       label="m2e Development Environment Workspace">
     <stream
         href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='m2e']/@streams[name='master']"/>
-    <description>The m2e development environment workspace includes m2e-core, m2e-maven-runtime and m2e-core-tests</description>
+    <description>The m2e development environment workspace includes m2e-core and m2e-core-tests</description>
   </workspace>
   <description>
     &lt;p>