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.
eclipse-m2e · Jul 30, 2023 · 16071f1 · 16071f1
1 parent 24628ed
commit 16071f1
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 46 deletions.
diff --git a/.github/workflows/licensecheck.yml b/.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 }}
diff --git a/m2e-maven-runtime/pom.xml b/m2e-maven-runtime/pom.xml
diff --git a/m2e-maven-runtime/.gitignore → org.eclipse.m2e.maven.runtime/.gitignore b/m2e-maven-runtime/.gitignore → org.eclipse.m2e.maven.runtime/.gitignore
diff --git a/m2e-maven-runtime/README.md → org.eclipse.m2e.maven.runtime/README.md b/m2e-maven-runtime/README.md → org.eclipse.m2e.maven.runtime/README.md
diff --git a/...n.runtime/eclipse-sign-jnilibs.properties → ...n.runtime/eclipse-sign-jnilibs.properties b/...n.runtime/eclipse-sign-jnilibs.properties → ...n.runtime/eclipse-sign-jnilibs.properties
diff --git a/...ime/org.eclipse.m2e.maven.runtime/pom.xml → org.eclipse.m2e.maven.runtime/pom.xml b/...ime/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>

diff --git a/...ven/listener/M2EMavenBuildDataBridge.java → ...ven/listener/M2EMavenBuildDataBridge.java b/...ven/listener/M2EMavenBuildDataBridge.java → ...ven/listener/M2EMavenBuildDataBridge.java
diff --git a/...e/slf4j2/provider/MavenSLF4JProvider.java → ...e/slf4j2/provider/MavenSLF4JProvider.java b/...e/slf4j2/provider/MavenSLF4JProvider.java → ...e/slf4j2/provider/MavenSLF4JProvider.java
diff --git a/...rvices/org.slf4j.spi.SLF4JServiceProvider → ...rvices/org.slf4j.spi.SLF4JServiceProvider b/...rvices/org.slf4j.spi.SLF4JServiceProvider → ...rvices/org.slf4j.spi.SLF4JServiceProvider
diff --git a/...ven.runtime/src/main/resources/about.html → ...ven.runtime/src/main/resources/about.html b/...ven.runtime/src/main/resources/about.html → ...ven.runtime/src/main/resources/about.html
diff --git a/...ain/resources/about_files/LICENSE-2.0.txt → ...ain/resources/about_files/LICENSE-2.0.txt b/...ain/resources/about_files/LICENSE-2.0.txt → ...ain/resources/about_files/LICENSE-2.0.txt
diff --git a/...rc/main/resources/simplelogger.properties → ...rc/main/resources/simplelogger.properties b/...rc/main/resources/simplelogger.properties → ...rc/main/resources/simplelogger.properties
diff --git a/pom.xml b/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>
 

diff --git a/setup/m2e.setup b/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">