From db272b5b008ec545c23e2a2b04979c1c4e8f9518 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Sat, 27 Aug 2011 15:58:46 -0400
Subject: [PATCH] Get rid of more conflicts.

---
 cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml | 1 +
 dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml     | 1 +
 releng/org.eclipse.cdt-feature/pom.xml               | 1 +
 releng/org.eclipse.cdt.sdk-feature/pom.xml           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
index 9036e2c5a6b..f3266838a2b 100644
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
@@ -12,6 +12,7 @@
 	</parent>
 
 	<version>1.0.0-SNAPSHOT</version>
+	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.build.crossgcc</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
index 78790207f08..a64ad8a12d0 100644
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
@@ -12,6 +12,7 @@
 	</parent>
 
 	<version>2.1.0-SNAPSHOT</version>
+	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.examples.dsf</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt-feature/pom.xml b/releng/org.eclipse.cdt-feature/pom.xml
index 44b7d33a088..028f479703a 100644
--- a/releng/org.eclipse.cdt-feature/pom.xml
+++ b/releng/org.eclipse.cdt-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt.sdk-feature/pom.xml b/releng/org.eclipse.cdt.sdk-feature/pom.xml
index f22a2469a54..ac901feebff 100644
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/pom.xml
@@ -11,6 +11,7 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
+	<groupId>org.eclipse.cdt.features</groupId>
 	<artifactId>org.eclipse.cdt.sdk</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>