Bug 515269 - Define parent pom for bundles and features

Factorize <build> and <profiles> sections that only apply to
eclipse-plugin and eclipse-feature packaging types. Also create an
intermediate parent for bundle-parent and feature-parent to group what
is common to both (e.g. jar signing).

Change-Id: Ie342053cb6975f227cb631dc405b25bc03c6cba6
Signed-off-by: Mikael Barbero <mikael@eclipse.org>

34 files changed, 403 insertions, 204 deletions

diff --git a/packages/org.eclipse.epp.package.android.feature/pom.xml b/packages/org.eclipse.epp.package.android.feature/pom.xml
index 45954176..14cd9666 100644
--- a/packages/org.eclipse.epp.package.android.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.android.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.android.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.android/pom.xml b/packages/org.eclipse.epp.package.android/pom.xml
index ceafab7f..07015402 100644
--- a/packages/org.eclipse.epp.package.android/pom.xml
+++ b/packages/org.eclipse.epp.package.android/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.android</artifactId>
diff --git a/packages/org.eclipse.epp.package.committers.feature/pom.xml b/packages/org.eclipse.epp.package.committers.feature/pom.xml
index 0a25787a..6d739877 100644
--- a/packages/org.eclipse.epp.package.committers.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.committers.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.committers/pom.xml b/packages/org.eclipse.epp.package.committers/pom.xml
index 5d985c65..f3cb9dbc 100644
--- a/packages/org.eclipse.epp.package.committers/pom.xml
+++ b/packages/org.eclipse.epp.package.committers/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.committers</artifactId>
diff --git a/packages/org.eclipse.epp.package.common.feature/pom.xml b/packages/org.eclipse.epp.package.common.feature/pom.xml
index 26934da9..5826016c 100644
--- a/packages/org.eclipse.epp.package.common.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.common.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.common.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.common/pom.xml b/packages/org.eclipse.epp.package.common/pom.xml
index 0838e69c..87471dfc 100644
--- a/packages/org.eclipse.epp.package.common/pom.xml
+++ b/packages/org.eclipse.epp.package.common/pom.xml
@@ -8,6 +8,7 @@
 
   Contributors:
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -17,9 +18,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.common</artifactId>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/pom.xml b/packages/org.eclipse.epp.package.cpp.feature/pom.xml
index a916ccd9..dbe0f1f5 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.cpp.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.cpp/pom.xml b/packages/org.eclipse.epp.package.cpp/pom.xml
index 84e5e866..c767c6ac 100644
--- a/packages/org.eclipse.epp.package.cpp/pom.xml
+++ b/packages/org.eclipse.epp.package.cpp/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.cpp</artifactId>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/pom.xml b/packages/org.eclipse.epp.package.dsl.feature/pom.xml
index 6ab4eb74..dae351ac 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.dsl.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.dsl/pom.xml b/packages/org.eclipse.epp.package.dsl/pom.xml
index 58ebad28..f5d1cc50 100644
--- a/packages/org.eclipse.epp.package.dsl/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.dsl</artifactId>
diff --git a/packages/org.eclipse.epp.package.java.feature/pom.xml b/packages/org.eclipse.epp.package.java.feature/pom.xml
index be711ef1..4f970642 100644
--- a/packages/org.eclipse.epp.package.java.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.java.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.java.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.java/pom.xml b/packages/org.eclipse.epp.package.java/pom.xml
index 9a8c99cf..bea2ce7d 100644
--- a/packages/org.eclipse.epp.package.java/pom.xml
+++ b/packages/org.eclipse.epp.package.java/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.java</artifactId>
diff --git a/packages/org.eclipse.epp.package.javascript.feature/pom.xml b/packages/org.eclipse.epp.package.javascript.feature/pom.xml
index b943fa1e..7f472bb9 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.javascript.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.javascript/pom.xml b/packages/org.eclipse.epp.package.javascript/pom.xml
index 490bc5b2..782b1978 100644
--- a/packages/org.eclipse.epp.package.javascript/pom.xml
+++ b/packages/org.eclipse.epp.package.javascript/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.javascript</artifactId>
diff --git a/packages/org.eclipse.epp.package.jee.feature/pom.xml b/packages/org.eclipse.epp.package.jee.feature/pom.xml
index 516dc75c..f21fdf51 100644
--- a/packages/org.eclipse.epp.package.jee.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.jee.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.jee/pom.xml b/packages/org.eclipse.epp.package.jee/pom.xml
index 6c28b251..8b29258e 100644
--- a/packages/org.eclipse.epp.package.jee/pom.xml
+++ b/packages/org.eclipse.epp.package.jee/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.jee</artifactId>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/pom.xml b/packages/org.eclipse.epp.package.modeling.feature/pom.xml
index 55363375..b2f65f6e 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.modeling.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.modeling/pom.xml b/packages/org.eclipse.epp.package.modeling/pom.xml
index d352a06b..5d46546e 100644
--- a/packages/org.eclipse.epp.package.modeling/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.modeling</artifactId>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/pom.xml b/packages/org.eclipse.epp.package.parallel.feature/pom.xml
index 87aa1a9f..4977ae70 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.parallel.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.parallel/pom.xml b/packages/org.eclipse.epp.package.parallel/pom.xml
index 222ff7e5..20315d97 100644
--- a/packages/org.eclipse.epp.package.parallel/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.parallel</artifactId>
diff --git a/packages/org.eclipse.epp.package.php.feature/pom.xml b/packages/org.eclipse.epp.package.php.feature/pom.xml
index d102d0e8..620f3a02 100644
--- a/packages/org.eclipse.epp.package.php.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.php.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.php.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.php/pom.xml b/packages/org.eclipse.epp.package.php/pom.xml
index 8b1492eb..48eb8d59 100644
--- a/packages/org.eclipse.epp.package.php/pom.xml
+++ b/packages/org.eclipse.epp.package.php/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.php</artifactId>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/pom.xml b/packages/org.eclipse.epp.package.rcp.feature/pom.xml
index a5287bfb..8f25275d 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.rcp.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.rcp/pom.xml b/packages/org.eclipse.epp.package.rcp/pom.xml
index 8ee6063c..c15657d7 100644
--- a/packages/org.eclipse.epp.package.rcp/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.rcp</artifactId>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/pom.xml b/packages/org.eclipse.epp.package.reporting.feature/pom.xml
index 53bf1704..c8e65fd7 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.reporting.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.reporting/pom.xml b/packages/org.eclipse.epp.package.reporting/pom.xml
index 0fddc5c9..595b7b61 100644
--- a/packages/org.eclipse.epp.package.reporting/pom.xml
+++ b/packages/org.eclipse.epp.package.reporting/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.reporting</artifactId>
diff --git a/packages/org.eclipse.epp.package.scout.feature/pom.xml b/packages/org.eclipse.epp.package.scout.feature/pom.xml
index 8e85f3f5..7b7e51ab 100644
--- a/packages/org.eclipse.epp.package.scout.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.scout.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.scout/pom.xml b/packages/org.eclipse.epp.package.scout/pom.xml
index 30ae6f13..21147bdb 100644
--- a/packages/org.eclipse.epp.package.scout/pom.xml
+++ b/packages/org.eclipse.epp.package.scout/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.scout</artifactId>
diff --git a/packages/org.eclipse.epp.package.testing.feature/pom.xml b/packages/org.eclipse.epp.package.testing.feature/pom.xml
index 07e47736..4809c72d 100644
--- a/packages/org.eclipse.epp.package.testing.feature/pom.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-feature-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.testing.feature</artifactId>
diff --git a/packages/org.eclipse.epp.package.testing/pom.xml b/packages/org.eclipse.epp.package.testing/pom.xml
index cd3827d9..8d9509d8 100644
--- a/packages/org.eclipse.epp.package.testing/pom.xml
+++ b/packages/org.eclipse.epp.package.testing/pom.xml
@@ -10,6 +10,7 @@
     Igor Fedorenko - initial implementation
     Thanh Ha (Eclipse Foundation) - initial implementation
     EclipseSource - ongoing development
+    Mikael Barbero (Eclipse Foundation) - clean-up and parent factorization
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -19,9 +20,9 @@
 
   <parent>
     <groupId>org.eclipse.epp</groupId>
-    <artifactId>org.eclipse.epp-parent</artifactId>
+    <artifactId>org.eclipse.epp-bundle-parent</artifactId>
     <version>4.7.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.epp.config/parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.epp.config/parent/bundle</relativePath>
   </parent>
 
   <artifactId>org.eclipse.epp.package.testing</artifactId>
diff --git a/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml
new file mode 100644
index 00000000..4798f76c
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2017 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+
+  Contributors:
+     Mikael Barbero (Eclipse Foundation) - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.epp</groupId>
+    <artifactId>org.eclipse.epp-parent</artifactId>
+    <version>4.7.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <name>Eclipse Packaging Project (EPP) Bundle and Feature parent</name>
+
+  <artifactId>org.eclipse.epp-bundle-feature-parent</artifactId>
+  <packaging>pom</packaging>
+
+  <profiles>
+
+    <profile>
+      <id>eclipse-sign-jar</id>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>eclipse-cbi</id>
+          <url>https://repo.eclipse.org/content/groups/cbi/</url>
+        </pluginRepository>
+      </pluginRepositories>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200a-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>pack200-normalize</id>
+                <goals>
+                  <goal>normalize</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-jarsigner-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign</id>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200b-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>pack200-pack</id>
+                <goals>
+                  <goal>pack</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <defaultP2Metadata>false</defaultP2Metadata>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
+  
+</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/parent/bundle/pom.xml b/releng/org.eclipse.epp.config/parent/bundle/pom.xml
new file mode 100644
index 00000000..c8ee0438
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/bundle/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2017 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+
+  Contributors:
+     Mikael Barbero (Eclipse Foundation) - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.epp</groupId>
+    <artifactId>org.eclipse.epp-bundle-feature-parent</artifactId>
+    <version>4.7.0-SNAPSHOT</version>
+    <relativePath>../bundle-feature</relativePath>
+  </parent>
+
+  <name>Eclipse Packaging Project (EPP) Bundle parent</name>
+
+  <artifactId>org.eclipse.epp-bundle-parent</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <!--plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+      </plugin-->
+    </plugins>
+  </build>
+
+  <profiles>
+
+    <profile>
+      <id>update-branding-plugins-about.mappings</id>
+      <activation>
+        <file>
+          <exists>${basedir}/about.mappings</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>process-about.mappings</id>
+                <phase>prepare-package</phase>
+                <configuration>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                  <overwrite>true</overwrite>
+                  <resources>
+                    <resource>
+                      <directory>${basedir}</directory>
+                      <includes>
+                        <include>about.mappings</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-packaging-plugin</artifactId>
+            <configuration>
+              <additionalFileSets>
+                <fileSet>
+                  <directory>${project.build.directory}</directory>
+                  <includes>
+                    <include>about.mappings</include>
+                  </includes>
+                </fileSet>
+              </additionalFileSets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
+  
+</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/parent/feature/pom.xml b/releng/org.eclipse.epp.config/parent/feature/pom.xml
new file mode 100644
index 00000000..3271d559
--- /dev/null
+++ b/releng/org.eclipse.epp.config/parent/feature/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2017 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+
+  Contributors:
+     Mikael Barbero (Eclipse Foundation) - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.epp</groupId>
+    <artifactId>org.eclipse.epp-bundle-feature-parent</artifactId>
+    <version>4.7.0-SNAPSHOT</version>
+    <relativePath>../bundle-feature</relativePath>
+  </parent>
+
+  <name>Eclipse Packaging Project (EPP) Feature parent</name>
+
+  <artifactId>org.eclipse.epp-feature-parent</artifactId>
+  <packaging>pom</packaging>
+  
+  <build>
+    <plugins>
+      <!--plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-source-feature-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <executions>
+          <execution>
+            <!- Don't attach (default) metadata before the source-feature execution. ->
+            <id>default-p2-metadata-default</id>
+            <configuration>
+              <attachP2Metadata>false</attachP2Metadata>
+            </configuration>
+          </execution>
+          <execution>
+            <id>attach-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin-->
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 48dbf364..494812e8 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -171,20 +171,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <executions>
-          <execution>
-            <id>plugin-source</id>
-            <goals>
-              <goal>plugin-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <version>1.8</version>
@@ -262,6 +248,63 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho.version}</version>
+          <configuration>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+            </archive>
+          </configuration>
+          <executions>
+            <execution>
+              <id>plugin-source</id>
+              <goals>
+                <goal>plugin-source</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-pack200a-plugin</artifactId>
+          <version>${tycho.extras.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-pack200b-plugin</artifactId>
+          <version>${tycho.extras.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-plugin</artifactId>
+          <version>${tycho.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.cbi.maven.plugins</groupId>
+          <artifactId>eclipse-jarsigner-plugin</artifactId>
+          <version>${cbi.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-source-feature-plugin</artifactId>
+          <version>${tycho.extras.version}</version>
+          <configuration>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+            </archive>
+          </configuration>
+          <executions>
+            <execution>
+              <id>source-feature</id>
+              <phase>package</phase>
+              <goals>
+                <goal>source-feature</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.eclipse.tycho.extras</groupId>
@@ -335,136 +378,6 @@
 
   <profiles>
 
-    <profile>
-      <id>eclipse-sign-jar</id>
-
-      <pluginRepositories>
-        <pluginRepository>
-          <id>eclipse-cbi</id>
-          <url>https://repo.eclipse.org/content/groups/cbi/</url>
-        </pluginRepository>
-      </pluginRepositories>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho.extras.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.eclipse.cbi.maven.plugins</groupId>
-            <artifactId>eclipse-jarsigner-plugin</artifactId>
-            <version>${cbi.version}</version>
-            <executions>
-              <execution>
-                <id>sign</id>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho.extras.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-p2-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>p2-metadata</id>
-                <goals>
-                  <goal>p2-metadata</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-            <configuration>
-              <defaultP2Metadata>false</defaultP2Metadata>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>update-branding-plugins-about.mappings</id>
-      <activation>
-        <file>
-          <exists>${basedir}/about.mappings</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven.resources.version}</version>
-            <executions>
-              <execution>
-                <id>process-about.mappings</id>
-                <phase>prepare-package</phase>
-                <configuration>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                  <overwrite>true</overwrite>
-                  <resources>
-                    <resource>
-                      <directory>${basedir}</directory>
-                      <includes>
-                        <include>about.mappings</include>
-                      </includes>
-                      <filtering>true</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-packaging-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <configuration>
-              <additionalFileSets>
-                <fileSet>
-                  <directory>${project.build.directory}</directory>
-                  <includes>
-                    <include>about.mappings</include>
-                  </includes>
-                </fileSet>
-              </additionalFileSets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <!--
        This profile needs to stay disabled for release builds, but may serve as a testing
        facility when carrying out tests with various p2 repositories. One possible use case