diff options
| author | Krum Tsvetkov | 2016-12-21 15:33:18 +0000 |
|---|---|---|
| committer | Krum Tsvetkov | 2016-12-21 15:35:45 +0000 |
| commit | ce2cbf54ee015d5f5cc72d719a20b78c4e995933 (patch) | |
| tree | bff291de9fa855b6803f68bdb6ecdd1fb76c13ab | |
| parent | 765e49c9e89680a72bc046180e1d50c20f931787 (diff) | |
| download | org.eclipse.mat-ce2cbf54ee015d5f5cc72d719a20b78c4e995933.tar.gz org.eclipse.mat-ce2cbf54ee015d5f5cc72d719a20b78c4e995933.tar.xz org.eclipse.mat-ce2cbf54ee015d5f5cc72d719a20b78c4e995933.zip | |
[509589] Fix: Updating MAT RCPs causes errors
Bug: 509589
Change-Id: If6e97f266fcf998e86c05fff2123a51168a793bf
Signed-off-by: Krum Tsvetkov <krum.tsvetkov@sap.com>
| -rw-r--r-- | org.eclipse.mat.product/mat.p2.inf | 3 | ||||
| -rw-r--r-- | org.eclipse.mat.product/mat.product | 7 | ||||
| -rw-r--r-- | plugins/org.eclipse.mat.ui.rcp.tests/pom.xml | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/org.eclipse.mat.product/mat.p2.inf b/org.eclipse.mat.product/mat.p2.inf index 1274ab61..b17ee0d7 100644 --- a/org.eclipse.mat.product/mat.p2.inf +++ b/org.eclipse.mat.product/mat.p2.inf @@ -1,6 +1,3 @@ -requires.1.namespace = org.eclipse.equinox.p2.iu
-requires.1.name = org.eclipse.mat.ui.rcp.feature.feature.group
-requires.1.range = [1.1.0, 2.0.0)
requires.2.namespace = org.eclipse.equinox.p2.iu
requires.2.name = org.eclipse.ui.themes
requires.2.range = [1.0.0, 2.0.0)
diff --git a/org.eclipse.mat.product/mat.product b/org.eclipse.mat.product/mat.product index 4b777a4d..23f30f63 100644 --- a/org.eclipse.mat.product/mat.product +++ b/org.eclipse.mat.product/mat.product @@ -187,7 +187,7 @@ Contributors: </plugins>
<features>
- <feature id="org.eclipse.mat.ui.rcp.feature"/>
+ <feature id="org.eclipse.mat.ui.rcp.feature" installMode="root"/>
<feature id="org.eclipse.rcp"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.help"/>
@@ -197,6 +197,11 @@ Contributors: <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+
+ <property name="org.eclipse.update.reconcile" value="false" />
+ <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/>
+
<property name="osgi.requiredJavaVersion" value="1.6" />
<property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default" />
<property name="applicationCSSResources" value="platform:/plugin/org.eclipse.platform/images/" />
diff --git a/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml b/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml index f72d7537..3acca231 100644 --- a/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml +++ b/plugins/org.eclipse.mat.ui.rcp.tests/pom.xml @@ -81,6 +81,11 @@ <id>org.eclipse.mat.ui.rcp.MemoryAnalyzer</id>
<versionRange>0.0.0</versionRange>
</requirement>
+ <requirement>
+ <type>p2-installable-unit</type>
+ <id>org.eclipse.mat.ui.rcp.feature.feature.group</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
|