Bug 538442 - [PapyrusReq] make Papyrus req build on Photon
Change-Id: I7de68b445bf76864bc4a16f0964de061b1ca47a7
diff --git a/features/org.eclipse.papyrus.requirements.bmm.feature/feature.xml b/features/org.eclipse.papyrus.requirements.bmm.feature/feature.xml
index ba26f3c..16a749e 100755
--- a/features/org.eclipse.papyrus.requirements.bmm.feature/feature.xml
+++ b/features/org.eclipse.papyrus.requirements.bmm.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.requirements.bmm.feature"
label="Requirements BMM (Incubation)"
- version="4.0.0.qualifier"
+ version="4.0.100.qualifier"
provider-name="Eclipse Modeling Project">
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
diff --git a/features/org.eclipse.papyrus.requirements.bmm.feature/pom.xml b/features/org.eclipse.papyrus.requirements.bmm.feature/pom.xml
index 9f4b7d0..6ef4801 100755
--- a/features/org.eclipse.papyrus.requirements.bmm.feature/pom.xml
+++ b/features/org.eclipse.papyrus.requirements.bmm.feature/pom.xml
@@ -33,5 +33,5 @@
</plugins>
</build>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.100-SNAPSHOT</version>
</project>
\ No newline at end of file
diff --git a/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF
index 5185bbc..fff954e 100644
--- a/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF
+++ b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.bmm.diagram;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.100.qualifier
Bundle-Activator: org.eclipse.papyrus.bmm.diagram.Activator
Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
@@ -9,11 +9,12 @@
org.eclipse.core.runtime,
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.bmm.types;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.bmm.types;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml
index e103f1f..522656e 100644
--- a/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml
+++ b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml
@@ -30,6 +30,6 @@
<!-- POM Description -->
<artifactId>org.eclipse.papyrus.bmm.diagram</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.7.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/plugins/bmm/model/org.eclipse.papyrus.bmm.types/META-INF/MANIFEST.MF b/plugins/bmm/model/org.eclipse.papyrus.bmm.types/META-INF/MANIFEST.MF
index 3a8af3e..f1d4424 100644
--- a/plugins/bmm/model/org.eclipse.papyrus.bmm.types/META-INF/MANIFEST.MF
+++ b/plugins/bmm/model/org.eclipse.papyrus.bmm.types/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.bmm.types;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.bmm.types.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.bmm;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.papyrus.bmm.types
diff --git a/plugins/bmm/model/org.eclipse.papyrus.bmm.types/pom.xml b/plugins/bmm/model/org.eclipse.papyrus.bmm.types/pom.xml
index 928b593..7207cb6 100644
--- a/plugins/bmm/model/org.eclipse.papyrus.bmm.types/pom.xml
+++ b/plugins/bmm/model/org.eclipse.papyrus.bmm.types/pom.xml
@@ -30,6 +30,6 @@
<!-- POM Description -->
<artifactId>org.eclipse.papyrus.bmm.types</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/META-INF/MANIFEST.MF b/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/META-INF/MANIFEST.MF
index d60203f..804a294 100644
--- a/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/META-INF/MANIFEST.MF
+++ b/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/META-INF/MANIFEST.MF
@@ -1,25 +1,26 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.bmm.ui
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core,
- org.eclipse.papyrus.bmm;bundle-version="0.7.0",
- org.eclipse.papyrus.bmm.diagram;bundle-version="0.7.0"
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.bmm;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.bmm.diagram;bundle-version="[0.7.0,0.8.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.100.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.bmm.ui.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/pom.xml b/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/pom.xml
index 33ad06b..458a496 100644
--- a/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/pom.xml
+++ b/plugins/bmm/viewpointconfig/org.eclipse.papyrus.bmm.architecture/pom.xml
@@ -30,6 +30,6 @@
<!-- POM Description -->
<artifactId>org.eclipse.papyrus.bmm.architecture</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.7.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.requirements.p2/category.xml b/releng/org.eclipse.papyrus.requirements.p2/category.xml
index 2917590..88929d5 100755
--- a/releng/org.eclipse.papyrus.requirements.p2/category.xml
+++ b/releng/org.eclipse.papyrus.requirements.p2/category.xml
@@ -15,7 +15,7 @@
<feature url="features/org.eclipse.papyrus.requirements.sysml14.metrics.feature_3.0.0.qualifier.jar" id="org.eclipse.papyrus.requirements.sysml14.metrics.feature" version="3.0.0.qualifier">
<category name="org.eclipse.papyrus.requirementmetrics"/>
</feature>
- <feature url="features/org.eclipse.papyrus.requirements.bmm.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.requirements.bmm.feature" version="4.0.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.requirements.bmm.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.requirements.bmm.feature" version="4.0.100.qualifier">
<category name="org.eclipse.papyrus.bmm"/>
</feature>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.target
index a7f9639..8d5228f 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.target
@@ -11,28 +11,24 @@
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d" version="0.0.0"/>
- <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
+ <repository id="eclipse-photon" location="http://download.eclipse.org/releases/photon/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
+ <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen/"/>
+ <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/photon/"/>
</location>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sysml.nattable.feature.feature.group" version="0.0.0"/>
- <repository location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
- </location>
+
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
- <repository id="uml2" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
+ <repository id="uml2" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <repository id="emfCore" location="http://download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
+ <repository id="emfCore" location="http://download.eclipse.org/modeling/emf/emf/builds/release/2.14"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
@@ -74,7 +70,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.lang" version="0.0.0"/>
<unit id="org.apache.commons.codec" version="0.0.0"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
</location>
</locations>
</target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.tpd
index 72ab3e0..d2e8a3e 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.requirements.targetplatform/org.eclipse.papyrus.requirements.targetplatform.tpd
@@ -1,6 +1,6 @@
target "Requirements Target Platform"
-location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
+location "http://download.eclipse.org/releases/photon/" {
org.eclipse.platform.feature.group lazy
org.eclipse.rcp.feature.group lazy
org.eclipse.jdt.feature.group lazy
@@ -9,82 +9,35 @@
org.eclipse.pde.feature.group lazy
org.eclipse.draw2d lazy
+ org.eclipse.uml2.sdk.feature.group lazy
+ org.eclipse.emf.transaction.sdk.feature.group lazy
+ org.eclipse.emf.validation.sdk.feature.group lazy
+ org.eclipse.gef.sdk.feature.group lazy
+ org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+ org.eclipse.gmf.runtime.sdk.feature.group lazy
+ org.eclipse.ocl.all.sdk.feature.group lazy
+ org.eclipse.m2m.qvt.oml.sdk.feature.group lazy
+
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
}
-//manualUpdate for Papyrus (nightly)
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/" {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
-}
-//manualUpdate for SysML14 (release)
-location "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen/" {
+//manualUpdate
+
+location sysml14 "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/photon/" {
org.eclipse.papyrus.sysml14 lazy
+}
+
+location rmf "http://download.eclipse.org/rmf/updates/releases" {
+ org.eclipse.rmf.reqif10.sdk.feature.feature.group lazy
+ org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group lazy
}
-
-//manualUpdate for SysML11 (nightly)
-location "https://hudson.eclipse.org/papyrus/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/" {
- org.eclipse.papyrus.sysml.feature.feature.group lazy
- org.eclipse.papyrus.sysml.nattable.feature.feature.group lazy
-}
-
-//updateFrom("MDT UML2",0)
-location uml2 "http://download.eclipse.org/modeling/mdt/uml2/updates/5.3" {
- org.eclipse.uml2.sdk.feature.group lazy
-}
-
-//updateFrom("EMF (Core)",0)
-location emfCore "http://download.eclipse.org/modeling/emf/emf/updates/2.13/" {
- org.eclipse.emf.sdk.feature.group lazy
-}
-
-//updateFrom("EMF Transaction",0)
-location emfTransaction "http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339" {
- org.eclipse.emf.transaction.sdk.feature.group lazy
-}
-
-//updateFrom ("EMF Validation",0)
-location emfValidation "http://download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352" {
- org.eclipse.emf.validation.sdk.feature.group lazy
-}
-
-//updateFrom ("GMF Runtime",0)
-location gmfRuntim "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437" {
- org.eclipse.gmf.runtime.sdk.feature.group lazy
-}
-
-//updateFrom ("GMF Notation",0)
-location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354" {
- org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
-}
-
-//updateFrom ("GEF",0)
-location gef "http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" {
- org.eclipse.gef.sdk.feature.group lazy
-}
-
-//updateFrom ("Eclipse OCL 6.3",0)
-location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.3.0" {
- org.eclipse.ocl.all.sdk.feature.group lazy
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository" {
+ org.apache.commons.lang lazy
+ org.apache.commons.codec lazy
}
location xwt "http://download.eclipse.org/xwt/updates" {
org.eclipse.xwt.feature.feature.group [1.3.1, 2.0.0)
}
-
-//updateFrom("QVT Operational",0)
-location qvto "http://download.eclipse.org/mmt/qvto/updates/releases/3.7.0" {
- org.eclipse.m2m.qvt.oml.sdk.feature.group lazy
-}
-
-//manualUpdate
-
-location rmf "http://download.eclipse.org/rmf/updates/releases" {
- org.eclipse.rmf.reqif10.sdk.feature.feature.group lazy
- org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group lazy
-}
-
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository" {
- org.apache.commons.lang lazy
- org.apache.commons.codec lazy
-}
\ No newline at end of file
