Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-05-24 11:52:57 +0000
committerQuentin Le Menez2018-05-24 16:20:03 +0000
commitb2737c31331b2f92bde62e45ba883e5df3255e83 (patch)
tree41147a866d707dfb0f3d096fa11465410326dc21
parentbfd26632a7557afd865d2184d26661d57154749f (diff)
downloadorg.eclipse.papyrus-b2737c31331b2f92bde62e45ba883e5df3255e83.tar.gz
org.eclipse.papyrus-b2737c31331b2f92bde62e45ba883e5df3255e83.tar.xz
org.eclipse.papyrus-b2737c31331b2f92bde62e45ba883e5df3255e83.zip
Bug 535017 - [Toolsmith] Unable to install the Toolsmith Feature for Photon RC1
- create soft references to the required features/plugins instead of including them directly Change-Id: I77e1c5fcdabb25e7ebdc3a05506c239180f63c64 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml4
-rw-r--r--features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml25
-rw-r--r--features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/feature.xml30
-rw-r--r--features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml19
4 files changed, 27 insertions, 51 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
index 30d31f88853..125509b2861 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
@@ -20,10 +20,6 @@ which accompanies this distribution, and is available at
<license url="%licenseURL">
%license
</license>
-
- <description url="https://eclipse.org/papyrus/">
- Common language-agnostic CSS frameworks for GMF-based diagram editors.
- </description>
<plugin
id="org.eclipse.papyrus.infra.gmfdiag.css"
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
index 020913102dd..13f1532057c 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml
@@ -22,6 +22,10 @@ http://www.eclipse.org/legal/epl-v10.html
<license url="%licenseURL">
%license
</license>
+
+ <requires>
+ <import feature="org.eclipse.papyrus.junit.feature" version="1.0.0.qualifier" match="compatible"/>
+ </requires>
<includes
id="org.eclipse.papyrus.tests.uml.diagram.feature"
@@ -80,13 +84,6 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"/>
<plugin
- id="org.eclipse.papyrus.bundles.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.papyrus.editor.integration.tests"
download-size="0"
install-size="0"
@@ -100,20 +97,6 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"/>
<plugin
- id="org.eclipse.papyrus.junit.utils"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.papyrus.junit.framework"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.papyrus.infra.core.clipboard.tests"
download-size="0"
install-size="0"
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/feature.xml
index 2a9b040195f..2e916d0911a 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature/feature.xml
@@ -1,21 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.tests.toolsmiths.feature" label="Papyrus UML Toolsmiths Tests Feature" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<feature
+ id="org.eclipse.papyrus.tests.toolsmiths.feature"
+ label="Papyrus UML Toolsmiths Tests Feature"
+ provider-name="Eclipse Modeling Project"
+ version="1.0.0.qualifier">
+
+ <description url="https://eclipse.org/papyrus/">
+ Tests for toolsmiths.
+ </description>
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
Copyright (c) 2017 CEA LIST.
-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
+ 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
</copyright>
<license url="%licenseURL">
%license
</license>
-
- <description url="https://eclipse.org/papyrus/">
- Tests for toolsmiths.
- </description>
- <plugin download-size="0" id="org.eclipse.papyrus.toolsmiths.profilemigration.tests" install-size="0" unpack="false" version="0.0.0"/>
+ <plugin
+ download-size="0"
+ id="org.eclipse.papyrus.toolsmiths.profilemigration.tests"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
</feature>
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
index cc7af080675..87cd2360fd4 100644
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml
@@ -22,7 +22,9 @@
</license>
<requires>
- <import feature="org.eclipse.papyrus.sdk.feature" version="4.0.0.qualifier"/>
+ <import feature="org.eclipse.papyrus.sdk.feature" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.runtime.emf.ui.properties" version="1.7.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.views.properties.model.xwt" version="2.0.0" match="compatible"/>
</requires>
<includes
@@ -68,13 +70,6 @@
install-size="0"
version="0.0.0"/>
- <plugin
- id="org.eclipse.papyrus.views.properties.model.xwt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<!--Expansion-->
<plugin
@@ -99,14 +94,6 @@
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.eclipse.gmf.runtime.emf.ui.properties"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<!--EMF Expressions-->

Back to the top