Change id of feature to avoid collision with plugin

MoreUnit · Dec 4, 2023 · c23c744 · c23c744
1 parent 9c3d949
commit c23c744
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 6 deletions.
diff --git a/org.moreunit.feature/.settings/org.eclipse.m2e.core.prefs b/org.moreunit.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.moreunit.feature/feature.xml b/org.moreunit.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.moreunit"
+      id="org.moreunit.feature"
       label="MoreUnit For Java"
       version="3.3.2.qualifier"
       provider-name="MoreUnit.org"

diff --git a/org.moreunit.feature/pom.xml b/org.moreunit.feature/pom.xml
@@ -9,7 +9,7 @@
 		<version>3.3.2-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.moreunit</artifactId>
+	<artifactId>org.moreunit.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 
 	<name>org.moreunit.feature</name>

diff --git a/org.moreunit.light.feature/.settings/org.eclipse.m2e.core.prefs b/org.moreunit.light.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.moreunit.light.feature/feature.xml b/org.moreunit.light.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.moreunit.light"
+      id="org.moreunit.light.feature"
       label="MoreUnit Light"
       version="3.3.2.qualifier"
       provider-name="MoreUnit.org"

diff --git a/org.moreunit.light.feature/pom.xml b/org.moreunit.light.feature/pom.xml
@@ -9,7 +9,7 @@
 		<version>3.3.2-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.moreunit.light</artifactId>
+	<artifactId>org.moreunit.light.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 
 	<name>org.moreunit.light.feature</name>

diff --git a/org.moreunit.mock.feature/.project b/org.moreunit.mock.feature/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.moreunit.mock.feature/.settings/org.eclipse.m2e.core.prefs b/org.moreunit.mock.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.moreunit.mock.feature/feature.xml b/org.moreunit.mock.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.moreunit.mock"
+      id="org.moreunit.mock.feature"
       label="MoreUnit For Java: Mock Support"
       version="3.3.2.qualifier"
       provider-name="MoreUnit.org"

diff --git a/org.moreunit.mock.feature/pom.xml b/org.moreunit.mock.feature/pom.xml
@@ -9,7 +9,7 @@
 		<version>3.3.2-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>org.moreunit.mock</artifactId>
+	<artifactId>org.moreunit.mock.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 
 	<name>org.moreunit.mock.feature</name>