Bug 401037 - [CBI] org.eclipse.rcp.configuration is in CBI builds, but

not PDE builds (removing explicit listing of dependency from products,
adding p2-metadata only to final repo.)

10 files changed, 80 insertions, 9 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product
index 7db5e823d..47cbbebcf 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product
@@ -160,7 +160,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.platform.source"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.rcp.configuration"/>
    </features>
 
    <configurations>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index a8c05f131..6e9b6a458 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -32,6 +32,22 @@
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- this guarantees proper reactor build order  -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp.configuration</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>    
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-packaging-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
index 3082899c0..7fa41046c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -159,7 +159,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    <features>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.rcp.configuration"/>
    </features>
 
    <configurations>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
index d300b4cf3..975a4f115 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
@@ -32,6 +32,22 @@
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- this guarantees proper reactor build order  -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp.configuration</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>    
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-packaging-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product
index 3cd020507..604d0bcb9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product
@@ -157,7 +157,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    <features>
       <feature id="org.eclipse.rcp"/>
       <feature id="org.eclipse.rcp.source"/>
-      <feature id="org.eclipse.rcp.configuration"/>
    </features>
 
    <configurations>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
index 4b887de59..82684c88e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
@@ -32,6 +32,22 @@
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- this guarantees proper reactor build order  -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp.configuration</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>    
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-packaging-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
index 2e559962a..e09a474ae 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
@@ -155,7 +155,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
 
    <features>
       <feature id="org.eclipse.rcp"/>
-      <feature id="org.eclipse.rcp.configuration"/>
    </features>
 
    <configurations>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index 4cbb1a7f2..d90461168 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -32,6 +32,22 @@
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- this guarantees proper reactor build order  -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>org.eclipse.rcp.configuration</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>    
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-packaging-plugin</artifactId>
         <version>${tycho.version}</version>
         <configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
index 45bed226e..55dd939cc 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.eclipse.sdk.ide" name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.3.0.qualifier" useFeatures="true" includeLaunchers="true">
+
 
    <configIni use="default">
    </configIni>
@@ -161,7 +162,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    <features>
       <feature id="org.eclipse.sdk"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.rcp.configuration"/>
    </features>
 
    <configurations>
diff --git a/eclipse.platform.repository/pom.xml b/eclipse.platform.repository/pom.xml
index 901ecb8bb..2e210cf3b 100644
--- a/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.repository/pom.xml
@@ -112,6 +112,17 @@
             <configuration>
               <source>
                 <!-- source repositories to mirror from -->
+
+                <!-- This config/executable p2 metadata should be in any of the "product" targetPlatformRepoositories, 
+                     I'd just arbitrarily picked "platform" as the one to use to get our final versions from, for our 
+                     main repository.
+                -->
+                <repository>
+                  <url>${project.baseUri}../eclipse.platform.releng.tychoeclipsebuilder/platform/target/targetPlatformRepository</url>
+                  <layout>p2-metadata</layout>
+                  <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
+                </repository>
+
                 <repository>
                   <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/rcp/target/repository</url>
                   <layout>p2</layout>
@@ -672,7 +683,7 @@
                 <iu>
                   <id>org.eclipse.platform.feature.group</id>
                   <id>org.eclipse.equinox.p2.user.ui.feature.group</id>
-                  <id>org.eclipse.rcp.configuration.feature.group</id>
+                 
                   <id>org.eclipse.equinox.executable.feature.group</id>
                   <id>org.eclipse.platform.ide</id>
                 </iu>
@@ -724,7 +735,7 @@
                   <id>org.eclipse.platform.source.feature.group</id>
                   <id>org.eclipse.equinox.p2.user.ui.feature.group</id>
                   <id>org.eclipse.equinox.p2.user.ui.source.feature.group</id>
-                  <id>org.eclipse.rcp.configuration.feature.group</id>
+                 
                   <id>org.eclipse.equinox.executable.feature.group</id>
                   <id>org.eclipse.platform.ide</id>
                 </iu>