[Releng] Update to use papyrus 6.0 nightly and remove compilation of IEEE based on SysML 1.4
Change-Id: I03baffa58f3ce2ff4e12176131713e0ec41f9612
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
diff --git a/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
index 9f7b2e7..508f8f1 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
@@ -20,7 +20,7 @@
</license>
<requires>
- <import feature="org.eclipse.papyrus.sdk.feature" version="5.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.papyrus.sdk.feature" version="6.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.papyrus.model2doc.feature" version="0.8.0" match="compatible"/>
<import feature="org.eclipse.papyrus.model2doc.uml.feature" version="0.8.0" match="compatible"/>
</requires>
diff --git a/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml
index e91f37e..91d0ff5 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml
@@ -20,7 +20,7 @@
</license>
<requires>
- <import feature="org.eclipse.papyrus.sdk.feature" version="5.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.papyrus.sdk.feature" version="6.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.papyrus.model2doc.feature" version="0.8.0" match="compatible"/>
<import feature="org.eclipse.papyrus.model2doc.gmf.feature" version="0.8.0" match="compatible"/>
<import feature="org.eclipse.papyrus.model2doc.integration.feature" version="0.8.0" match="compatible"/>
diff --git a/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature/feature.xml
index 3e40637..38331ba 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature/feature.xml
@@ -7,7 +7,7 @@
license-feature="org.eclipse.license"
license-feature-version="2.0.2">
- <description url="http://www.example.com/description">
+ <description url="https://eclipse.org/papyrus/">
%description
</description>
diff --git a/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml
index a46fc5a..9044f12 100755
--- a/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml
@@ -7,7 +7,7 @@
license-feature="org.eclipse.license"
license-feature-version="2.0.2">
- <description url="http://www.example.com/description">
+ <description url="https://eclipse.org/papyrus/">
%description
</description>
diff --git a/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml
index 71af95c..09af9b4 100755
--- a/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml
@@ -7,7 +7,7 @@
license-feature="org.eclipse.license"
license-feature-version="2.0.2">
- <description url="http://www.example.com/description">
+ <description url="https://eclipse.org/papyrus/">
%description
</description>
@@ -25,7 +25,7 @@
<import feature="org.eclipse.papyrus.model2doc.gmf.feature" version="0.8.0" match="compatible"/>
<import feature="org.eclipse.papyrus.model2doc.integration.feature" version="0.8.0" match="compatible"/>
<import feature="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature" version="0.8.0" match="compatible"/>
- <import feature="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature" version="0.8.0" match="compatible"/>
+ <!--import feature="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature" version="0.8.0" match="compatible"/-->
<import feature="org.eclipse.papyrus.model2doc.uml.feature" version="0.8.0" match="compatible"/>
</requires>
diff --git a/features/pom.xml b/features/pom.xml
index 91a03f4..4531cab 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,7 @@
<module>org.eclipse.papyrus.model2doc.tests.feature</module>
<module>org.eclipse.papyrus.model2doc.uml.feature</module>
<module>org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature</module>
- <module>org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature</module>
+ <!--module>org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature</module-->
<module>org.eclipse.papyrus.model2doc.integration.feature</module>
</modules>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/META-INF/MANIFEST.MF
index 2f01d09..02f766f 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[5.0.0,6.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/integration/pom.xml b/plugins/integration/pom.xml
index 95485dd..73eda9d 100755
--- a/plugins/integration/pom.xml
+++ b/plugins/integration/pom.xml
@@ -18,7 +18,7 @@
<description>Container of the Papyrus DocumentStructureTemplate Integration plugins</description>
<modules>
- <module>ieee</module>
+ <!--module>ieee</module-->
<module>nattable</module>
<module>org.eclipse.papyrus.model2doc.integration.core.author.properties</module>
<module>org.eclipse.papyrus.model2doc.integration.core.generatorconfiguration.properties</module>
diff --git a/pom.xml b/pom.xml
index 437e6ad..467dfd5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
<mojo.execmaven.version>1.6.0</mojo.execmaven.version>
<maven.compiler.version>3.8.0</maven.compiler.version>
- <tycho-version>1.7.0</tycho-version>
- <tychoExtrasVersion>1.3.0</tychoExtrasVersion>
+ <tycho-version>2.2.0</tycho-version>
+ <tychoExtrasVersion>2.2.0</tychoExtrasVersion>
<jarSignerVersion>1.1.5</jarSignerVersion>
<findbugs.version>3.0.5</findbugs.version>
<xtext.version>2.16.0</xtext.version>
diff --git a/releng-model2doc/category/category.xml b/releng-model2doc/category/category.xml
index 22c6eee..a9d232d 100755
--- a/releng-model2doc/category/category.xml
+++ b/releng-model2doc/category/category.xml
@@ -24,12 +24,12 @@
<feature url="features/org.eclipse.papyrus.model2doc.integration.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.feature.source" version="0.8.0.qualifier">
<category name="org.eclipse.papyrus.model2doc.integration.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature" version="0.8.0.qualifier">
- <category name="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature.source" version="0.8.0.qualifier">
- <category name="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.category"/>
- </feature>
+ <!--feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature" version="0.8.0.qualifier"-->
+ <!--category name="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.category"/-->
+ <!--/feature-->
+ <!--feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature.source" version="0.8.0.qualifier"-->
+ <!--category name="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.category"/-->
+ <!--/feature-->
<feature url="features/org.eclipse.papyrus.model2doc.dev.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.dev.feature" version="0.8.0.qualifier">
<category name="org.eclipse.papyrus.model2doc.dev.category"/>
</feature>
@@ -49,11 +49,11 @@
Papyrus-Model2Doc : Integration as Papyrus Editor.
</description>
</category-def>
- <category-def name="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.category" label="Papyrus-Model2Doc Papyrus IEEE Integration for SysML 1.4 (ODT format)">
- <description>
- Papyrus-Model2Doc : Documentation Tools to generate SysML 1.4 Requirements as recommended by IEEE under the ODT format.
- </description>
- </category-def>
+ <!--category-def name="org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.category" label="Papyrus-Model2Doc Papyrus IEEE Integration for SysML 1.4 (ODT format)"-->
+ <!--description-->
+ <!-- Papyrus-Model2Doc : Documentation Tools to generate SysML 1.4 Requirements as recommended by IEEE under the ODT format.-->
+ <!--/description-->
+ <!--/category-def-->
<category-def name="org.eclipse.papyrus.model2doc.dev.category" label="Papyrus-Model2Doc Developer Tools">
<description>
Papyrus-Model2Doc : Developer Tools.
@@ -74,6 +74,6 @@
Papyrus-Model2Doc : GMF View to Documentation integration for Papyrus
</description>
</category-def>
- <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" enabled="true" />
- <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301" enabled="true" />
+ <!--repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" enabled="true" /-->
+ <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913" enabled="true" />
</site>
diff --git a/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.target b/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.target
index 16adee9..6d4ebbc 100755
--- a/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.target
+++ b/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.target
@@ -1,34 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus-Model2Doc - 2021-03" sequenceNumber="1618581779">
+<target name="Papyrus-Model2Doc - 2021-09" sequenceNumber="1634814696">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/>
- <repository id="eclipse-2021-03" location="http://download.eclipse.org/releases/2021-03"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.21.0.v20210906-0842"/>
+ <repository id="eclipse-2021-09" location="http://download.eclipse.org/releases/2021-09"/>
</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"/>
<unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
- <repository id="Papyrus-2021-03" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="2.0.0.202011091859"/>
- <repository id="Sysml" location="https://ci.eclipse.org/papyrus/job/papyrus-sysml14-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+ <repository id="Papyrus-nightly" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/>
<repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.28.0.v20210925-0555"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202109250545"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.1.202106221344"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
@@ -36,8 +32,12 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.xmlbeans" version="3.1.0.v20200922-1359"/>
- <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
+ <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+ <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
</locations>
</target>
diff --git a/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.tpd b/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.tpd
index cbee587..0f74ae4 100755
--- a/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.tpd
+++ b/releng-model2doc/targetplatform/org.eclipse.papyrus.model2doc.releng.main.targetplatform.tpd
@@ -1,7 +1,7 @@
-target "Papyrus-Model2Doc - 2021-03" with source requirements
+target "Papyrus-Model2Doc - 2021-09" with source requirements
//build with simrel commit e014ee7948cbdea3d3eea7591de339b4bc25d0ed
-location "http://download.eclipse.org/releases/2021-03" eclipse-2021-03 {
+location "http://download.eclipse.org/releases/2021-09" eclipse-2021-09 {
org.eclipse.sdk.feature.group
}
@@ -9,7 +9,7 @@
/** Manual dependencies */
//manualUpdate
-location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" Papyrus-2021-03 {
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" Papyrus-nightly {
org.eclipse.papyrus.junit.feature.feature.group lazy
org.eclipse.papyrus.junit.framework lazy
org.eclipse.papyrus.sdk.feature.feature.group lazy
@@ -18,9 +18,9 @@
//manualUpdate
-location Sysml "https://ci.eclipse.org/papyrus/job/papyrus-sysml14-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"{
- org.eclipse.papyrus.sysml14.feature.feature.group
-}
+//location Sysml "https://ci.eclipse.org/papyrus/job/papyrus-sysml14-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"{
+// org.eclipse.papyrus.sysml14.feature.feature.group
+//}
/** Automatic dependencies */
@@ -33,24 +33,30 @@
//updateFrom("EMF (Core)",0)
-location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.25" {
+location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202109250545" {
org.eclipse.emf.sdk.feature.group
}
-//updateFrom("GMF Runtime 1.13.0 for SimRel 2020-12",0)
+//updateFrom("GMF Runtime 1.13.1 for SimRel 2021-09",0)
-location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913" {
+location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/" {
org.eclipse.gmf.runtime.sdk.feature.group
}
-//updateFrom("GMF Runtime 1.13.0 for SimRel 2020-12",1)
+//updateFrom("GMF Runtime 1.13.1 for SimRel 2021-09",1)
location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913" {
org.eclipse.gmf.runtime.notation.sdk.feature.group
}
//updateFrom("Orbit",0)
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" {
org.apache.xmlbeans [3.1.0,4.0.0) //required because it doesn't work with previous version
org.apache.commons.compress [1.19.0,2.0.0)
+}
+
+//manualUpdate("XWT",0)
+
+location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
+ org.eclipse.xwt.feature.feature.group lazy
}
\ No newline at end of file
diff --git a/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF b/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF
index 998b000..3714548 100755
--- a/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF
+++ b/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)",
diff --git a/tests/org.eclipse.papyrus.model2doc.bundles.tests/pom.xml b/tests/org.eclipse.papyrus.model2doc.bundles.tests/pom.xml
index 4ccf513..7ef304a 100755
--- a/tests/org.eclipse.papyrus.model2doc.bundles.tests/pom.xml
+++ b/tests/org.eclipse.papyrus.model2doc.bundles.tests/pom.xml
@@ -56,11 +56,13 @@
<id>org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
+ <!--
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.papyrus.model2doc.integration.ieee.sysml14.odt.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
+ -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.papyrus.model2doc.tests.feature</id>
