Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-04-14 08:27:12 -0400
committerDavid Williams2013-04-14 08:27:12 -0400
commit4aa2622011ed90061196ce33c8e3686e34bb23f8 (patch)
tree84738055e458b65400a0aa848a9896253668bdf8 /eclipse.platform.releng.tychoeclipsebuilder/rcp
parent9b6999e552e3b2a1df9b5babfba0599dafbce875 (diff)
downloadeclipse.platform.releng.aggregator-4aa2622011ed90061196ce33c8e3686e34bb23f8.tar.gz
eclipse.platform.releng.aggregator-4aa2622011ed90061196ce33c8e3686e34bb23f8.tar.xz
eclipse.platform.releng.aggregator-4aa2622011ed90061196ce33c8e3686e34bb23f8.zip
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.)
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder/rcp')
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml16
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product1
2 files changed, 16 insertions, 1 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
index 4b887de5..82684c88 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 2e559962..e09a474a 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>

Back to the top