Bug 515084 - [DSML Validation] Feature missing in incubation repository
- update target platform (required because of the **** junit framework)
- add dsml feature in category.xml
- remove refactoring and diagramtemplate from the build (compilation
error)
- patch double description in umlexport
Change-Id: I116329e2284798d26045e46d3b3b46f20862a5db
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF b/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
index 4dfa6e8..671e485 100755
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
+++ b/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
- org.eclipse.xtend2.lib,
org.eclipse.jdt.core;bundle-version="3.11.0",
org.eclipse.papyrus.infra.tools;bundle-version="2.0.0"
Export-Package: org.eclipse.papyrus.dsml.validation.generator,
diff --git a/org.eclipse.papyrus.incubation.p2/.project b/org.eclipse.papyrus.incubation.p2/.project
new file mode 100755
index 0000000..0a79233
--- /dev/null
+++ b/org.eclipse.papyrus.incubation.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.incubation.p2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.papyrus.incubation.p2/category.xml b/org.eclipse.papyrus.incubation.p2/category.xml
index d66aae4..7e50c46 100755
--- a/org.eclipse.papyrus.incubation.p2/category.xml
+++ b/org.eclipse.papyrus.incubation.p2/category.xml
@@ -6,12 +6,14 @@
<feature url="features/org.eclipse.papyrus.uml.export.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.uml.export.feature.source" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.incubation.category"/>
</feature>
+ <!-- TODO restore when compilation error solved
<feature url="features/org.eclipse.papyrus.extra.diagramtemplate.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.diagramtemplate.feature" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.incubation.category"/>
</feature>
<feature url="features/org.eclipse.papyrus.extra.diagramtemplate.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.diagramtemplate.feature.source" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.incubation.category"/>
</feature>
+ -->
<feature url="features/org.eclipse.papyrus.uml.alf.extra.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.uml.alf.extra.feature" version="0.7.0.qualifier">
<category name="org.eclipse.papyrus.incubation.category"/>
</feature>
@@ -30,6 +32,12 @@
<feature url="features/org.eclipse.papyrus.infra.gmfdiag.elk.feature.source_0.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.elk.feature.source" version="0.1.0.qualifier">
<category name="org.eclipse.papyrus.incubation.category"/>
</feature>
+
+ <feature url="features/org.eclipse.papyrus.extra.dsml.validation.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.dsml.validation.feature" version="1.2.0.qualifier">
+ <category name="org.eclipse.papyrus.incubation.category"/>
+ </feature>
+
+
<category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
<description>
Papyrus incubating features
diff --git a/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.target b/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.target
index 61c043b..0360148 100755
--- a/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.target
+++ b/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Oxygen" sequenceNumber="1488476925">
+<target name="Papyrus Oxygen" sequenceNumber="1491900207">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
@@ -24,7 +24,6 @@
<unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
@@ -44,6 +43,10 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <repository id="Papyrus-Nightly-Main" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
<repository id="eclipse-papyrus-developer-master" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
</location>
@@ -58,6 +61,15 @@
<repository id="elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
+ <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+ <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+ <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+ <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+ <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
<unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/>
<repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
diff --git a/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd b/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd
index 4821180..0c46b66 100755
--- a/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd
+++ b/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd
@@ -21,7 +21,6 @@
org.eclipse.ocl.core.sdk.feature.group lazy // necessary?
org.eclipse.ocl.examples.feature.group lazy
org.eclipse.ocl.uml.feature.group lazy
- org.eclipse.papyrus.sdk.feature.feature.group lazy
org.eclipse.pde.feature.group lazy
org.eclipse.platform.feature.group lazy
org.eclipse.rcp.feature.group lazy
@@ -42,6 +41,9 @@
org.eclipse.acceleo.feature.group lazy
}
+location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main" Papyrus-Nightly-Main {
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" eclipse-papyrus-developer-master {
org.eclipse.papyrus.junit.feature.feature.group lazy
@@ -58,6 +60,15 @@
org.eclipse.elk.gmf.feature.feature.group
}
+location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
+ org.eclipse.nebula.widgets.nattable.core.feature.feature.group
+ org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group
+ org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group
+ org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group
+}
+
location xpand "http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/" {
org.eclipse.xpand.sdk.feature.group
diff --git a/pom.xml b/pom.xml
index cf51c2f..10080f9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
<packaging>pom</packaging>
<modules>
<module>umlexport</module>
- <module>refactoring</module>
- <module>diagramtemplate</module>
+ <!-- compilation error 11/04/2017 <module>refactoring</module> -->
+ <!-- compilation error 11/04/2017 <module>diagramtemplate</module> -->
<module>alf</module>
<module>layers</module>
<module>elk</module>
@@ -18,7 +18,7 @@
<module>org.eclipse.papyrus.incubation.p2</module>
</modules>
<properties>
- <tycho-version>0.26.0</tycho-version>
+ <tycho-version>1.0.0</tycho-version>
<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/feature.xml b/umlexport/org.eclipse.papyrus.uml.export.feature/feature.xml
index ea5cad2..149a0c4 100755
--- a/umlexport/org.eclipse.papyrus.uml.export.feature/feature.xml
+++ b/umlexport/org.eclipse.papyrus.uml.export.feature/feature.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.uml.export.feature" label="Papyrus Export Profiles Feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.2.0.qualifier">
- <description url="http://www.example.com/description">
- This feature enables expoting and installing applied profiles from worksapce
- </description>
-
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
Copyright (c) 2012 CEA LIST
All rights reserved. This program and the accompanying materials
