[releng] Improve the definition of org.eclipse.papyrus.cdo.feature and
improve p2 update-site to reference CDO dependency
Change-Id: I92f56cb39d6b3c3e98bf27dc5ef5e2eb79effd8e
Signed-off-by: Florian NOYRIT <florian.noyrit@cea.fr>
diff --git a/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml b/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
index aa461d2..a9633f3 100755
--- a/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
+++ b/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
@@ -34,6 +34,11 @@
<requires>
<import feature="org.eclipse.papyrus.sdk.feature" version="5.0.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.cdo.ecore" version="1.1.2" match="compatible"/>
+ <import plugin="org.eclipse.emf.cdo.gmf.notation" version="1.10.1" match="compatible"/>
+ <import plugin="org.eclipse.emf.cdo.genmodel" version="1.0.0" match="compatible"/>
+ <import feature="org.eclipse.emf.cdo.sdk" version="5.6.0" match="compatible"/>
+ <import feature="org.eclipse.emf.cdo.dawn" version="2.3.0" match="compatible"/>
</requires>
<plugin
@@ -57,13 +62,6 @@
version="0.0.0"
unpack="false"/>
- <!--<plugin
- id="org.eclipse.papyrus.cdo.ui.customization.properties"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/> -->
-
<plugin
id="org.eclipse.papyrus.cdo.validation.problems"
download-size="0"
@@ -104,7 +102,7 @@
download-size="0"
install-size="0"
version="0.0.0"/>
-
+
<plugin
id="org.eclipse.papyrus.cdo.security"
download-size="0"
diff --git a/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml b/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
index 9ef1f8e..bd89e96 100755
--- a/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
+++ b/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<site>
<feature url="features/org.eclipse.papyrus.cdo.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.cdo.feature" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.collaborativemodeling"/>
@@ -23,4 +22,5 @@
This category provides the CDO'ified version of metamodels (UML, CSS, style, ...), in order to get the best perfomance with CDO.
</description>
</category-def>
+ <repository-reference location="https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/" enabled="true" />
</site>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
index af0b8e8..8f57200 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1610359110">
+<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1611332287">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
@@ -17,17 +17,11 @@
<repository id="eclipse" location="https://download.eclipse.org/releases/2020-12/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.cdo.explorer" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn.gmf" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.explorer.ui" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.ui.admin" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.server.ocl" version="0.0.0"/>
+ <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.ecore" version="0.0.0"/>
+ <unit id="org.eclipse.emf.cdo.genmodel" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.security" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.ui.compare" version="0.0.0"/>
<repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/"/>
</location>
</locations>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
index da55580..4fba406 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
@@ -1,39 +1,25 @@
target "CollaborativeModeling CDO - Papyrus Nightly" with source requirements
-
-
/** Manual dependencies */
-
/* Papyrus Nightly */
location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" papyrus {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
- org.eclipse.papyrus.junit.utils lazy
- org.eclipse.papyrus.junit.framework lazy
- org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.junit.utils lazy
+ org.eclipse.papyrus.junit.framework lazy
+ org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
}
location "https://download.eclipse.org/releases/2020-12/" eclipse {
- org.eclipse.sdk.feature.group lazy
- org.eclipse.emf.sdk.feature.group lazy
- org.eclipse.uml2.sdk.feature.group lazy
+ org.eclipse.sdk.feature.group lazy
+ org.eclipse.emf.sdk.feature.group lazy
+ org.eclipse.uml2.sdk.feature.group lazy
}
-
-//location Sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2019-06"{
-// org.eclipse.papyrus.sysml14.feature.feature.group
-//}
-
-//manual update
+// manual update
location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/" {
- org.eclipse.emf.cdo.explorer lazy
- org.eclipse.emf.cdo.dawn lazy
- org.eclipse.emf.cdo.dawn.gmf lazy
- org.eclipse.emf.cdo.admin lazy
- org.eclipse.emf.cdo.explorer.ui lazy
- org.eclipse.emf.cdo.ui.admin lazy
- org.eclipse.emf.cdo.server.ocl lazy
- org.eclipse.emf.cdo.ecore lazy
- org.eclipse.emf.cdo.gmf.notation lazy
- org.eclipse.emf.cdo.security lazy
- org.eclipse.emf.cdo.ui.compare lazy
+ org.eclipse.emf.cdo.sdk.feature.group lazy
+ org.eclipse.emf.cdo.dawn.feature.group lazy
+ org.eclipse.emf.cdo.ecore lazy
+ org.eclipse.emf.cdo.genmodel lazy
+ org.eclipse.emf.cdo.gmf.notation lazy
}
