diff --git a/.gitignore b/.gitignore
index 74484d40d3..4fdf5c5632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ bin/
.META-INF_*
pom.tycho
.tycho-consumer-pom.xml
+.flattened-pom.xml
apiAnalyzer-workspace/
\ No newline at end of file
diff --git a/.mvn/maven.config b/.mvn/maven.config
index 8b6bb37cc3..55539b0bd9 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,2 +1,3 @@
-Pbuild-individual-bundles
-Dtycho.surefire.deleteWorkDir=true
+-Dtycho.localArtifacts=ignore
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 41df5dfeac..c9b3ebafe2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -8,7 +8,7 @@
4.0.0
- org.eclipse.equinox.p2
+ org.eclipse.platform
rt.equinox.p2
${releaseVersion}${qualifier}
../../
@@ -39,7 +39,7 @@
- org.eclipse.equinox.p2
+ ${project.groupId}
org.eclipse.equinox.p2.reconciler
1.1.0-SNAPSHOT
pom
diff --git a/examples/pom.xml b/examples/pom.xml
index 5cdc27872f..e5110a62c8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- org.eclipse.equinox.p2
+ org.eclipse.platform
rt.equinox.p2
${releaseVersion}${qualifier}
../pom.xml
diff --git a/pom.xml b/pom.xml
index 030bb67d15..7cbc22851f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
../eclipse-platform-parent
- org.eclipse.equinox.p2
+ org.eclipse.platform
rt.equinox.p2
pom
${releaseVersion}${qualifier}
@@ -128,6 +128,18 @@
+
+ org.eclipse.tycho
+ tycho-packaging-plugin
+
+
+ default-update-consumer-pom
+
+ false
+
+
+
+