Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorBenoit Maggi2017-02-09 10:27:55 -0500
committerGerrit Code Review @ Eclipse.org2017-02-10 03:21:36 -0500
commit00e3bccc1ffadc41df1e92392c34dce72191ef1e (patch)
treef3fd92970e5e1955ac847c0f730a3c5e1bf960d6 /releng
parent5d8412473b5630ff3a1b7c52ade8daf4bbe534c1 (diff)
downloadorg.eclipse.papyrus-00e3bccc1ffadc41df1e92392c34dce72191ef1e.tar.gz
org.eclipse.papyrus-00e3bccc1ffadc41df1e92392c34dce72191ef1e.tar.xz
org.eclipse.papyrus-00e3bccc1ffadc41df1e92392c34dce72191ef1e.zip
Bug 511981 - [Marte] remove code from core repository
- remove marte code from master new repository https://git.eclipse.org/r/papyrus/org.eclipse.papyrus-marte Change-Id: I3e29035efc64bcaefd777151c9540f88fb233fbb Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'releng')
-rw-r--r--releng/extra/pom.xml11
-rw-r--r--releng/extra/site/category.xml25
-rw-r--r--releng/org.eclipse.papyrus.oomph/setups/papyrus.setup3
-rw-r--r--releng/toolkit/server/addDownloadStats-extra.xsl4
4 files changed, 1 insertions, 42 deletions
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index 3bd87eb86c0..fd86d4d62d0 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -22,9 +22,6 @@
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module>
- <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module>
- <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>
- <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>
@@ -67,14 +64,6 @@
<module>../../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module>
<module>../../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module>
<module>../../extraplugins/layers/org.eclipse.papyrus.layers.ui</module>
- <module>../../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module>
- <module>../../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module>
- <module>../../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module>
- <module>../../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module>
- <module>../../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module>
- <module>../../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module>
- <module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>
- <module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
<module>../../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>
<module>../../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>
diff --git a/releng/extra/site/category.xml b/releng/extra/site/category.xml
index db798b823be..2387f385f47 100644
--- a/releng/extra/site/category.xml
+++ b/releng/extra/site/category.xml
@@ -6,24 +6,6 @@
<feature url="features/org.eclipse.papyrus.extra.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.feature" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.extra.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.extra.marte.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.marte.feature" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.extra.marte.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.extra.marte.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.marte.feature.source" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.extra.marte.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.extra.marte.properties.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.marte.properties.feature" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.extra.marte.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.extra.marte.properties.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.marte.properties.feature.source" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.extra.marte.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.extra.marte.textedit.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.marte.textedit.feature" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.extra.marte.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.extra.marte.textedit.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.marte.textedit.feature.source" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.extra.marte.category"/>
- </feature>
<feature url="features/org.eclipse.papyrus.extra.cdo.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.cdo.feature" version="1.2.0.qualifier">
<category name="org.eclipse.papyrus.extra.others.category"/>
</feature>
@@ -142,18 +124,13 @@
<category name="org.eclipse.papyrus.extra.others.category"/>
</feature>
<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.extra.others.category"/>
+ <category name="org.eclipse.papyrus.extra.others.category"/>
</feature>
<category-def name="org.eclipse.papyrus.extra.category" label="Papyrus Extra (All - Not recommended)">
<description>
Papyrus Extra Category
</description>
</category-def>
- <category-def name="org.eclipse.papyrus.extra.marte.category" label="Papyrus Marte">
- <description>
- Papyrus Marte Category
- </description>
- </category-def>
<category-def name="org.eclipse.papyrus.extra.others.category" label="Papyrus Extra (Others)"/>
<category-def name="org.eclipse.papyrus.category.sysml11" label="Papyrus SysML 1.1">
<description>
diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index 76de9d8ba0a..a8ac135919e 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -1659,9 +1659,6 @@
<setupTask xsi:type="setup.p2:P2Task">
<requirement name="org.eclipse.xtend.sdk.feature.group"/>
</setupTask>
- <stream label="master (Oxygen/3.0)" name="master">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/>
- </stream>
<stream label="streams/2.0-maintenance (Neon/2.x)" name="streams/2.0-maintenance">
<setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.neon}"/>
</stream>
diff --git a/releng/toolkit/server/addDownloadStats-extra.xsl b/releng/toolkit/server/addDownloadStats-extra.xsl
index 55ab3d4a3c1..91bfb1bac13 100644
--- a/releng/toolkit/server/addDownloadStats-extra.xsl
+++ b/releng/toolkit/server/addDownloadStats-extra.xsl
@@ -32,10 +32,6 @@ Nicolas Bros (Mia-Software) - stats for extra plug-ins
<xsl:call-template name="artifact_properties"/>
</xsl:template>
- <xsl:template match="artifact[@classifier='osgi.bundle' and @id='org.eclipse.papyrus.marte.static.profile']/properties">
- <xsl:call-template name="artifact_properties"/>
- </xsl:template>
-
<xsl:template name="artifact_properties">
<properties size='{@size+1}'>
<xsl:copy-of select="property" />

Back to the top