[Layers] Update target platform to the Photon release
- removed the layers from the root modules as long as it is dependent on a different platform than the rest of the modules (i.e. photon vs oxygen)
Change-Id: Iac5f952dde911c10137d34a94147c14a5da8df12
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
index df83c8d..5305a0f 100755
--- a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
+++ b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.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="Layers - Oxygen" sequenceNumber="1513937936">
+<target name="Layers - Oxygen" sequenceNumber="1535530115">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ui" version="0.0.0"/>
@@ -15,9 +15,6 @@
<unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
<unit id="org.eclipse.emf.databinding.edit" version="0.0.0"/>
<unit id="org.eclipse.emf.query.ocl" version="0.0.0"/>
- <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.infra.core" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.emf.diagram.common" version="0.0.0"/>
@@ -27,7 +24,7 @@
<unit id="org.eclipse.papyrus.infra.gmfdiag.css.properties" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.css.model" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.css.model.edit" version="0.0.0"/>
- <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+ <repository location="file:/home/data/httpd/download.eclipse.org/releases/photon/"/>
</location>
</locations>
</target>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
index 0747d2f..9d48310 100755
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.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="Layers - Oxygen" sequenceNumber="1513937936">
+<target name="Layers - Oxygen" sequenceNumber="1535530115">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ui" version="0.0.0"/>
@@ -15,9 +15,6 @@
<unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
<unit id="org.eclipse.emf.databinding.edit" version="0.0.0"/>
<unit id="org.eclipse.emf.query.ocl" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/oxygen/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.infra.core" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.emf.diagram.common" version="0.0.0"/>
@@ -27,7 +24,7 @@
<unit id="org.eclipse.papyrus.infra.gmfdiag.css.properties" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.css.model" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.css.model.edit" version="0.0.0"/>
- <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+ <repository location="http://download.eclipse.org/releases/photon/"/>
</location>
</locations>
</target>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd
index 17f13c8..64a6907 100755
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd
@@ -1,6 +1,6 @@
target "Layers - Oxygen" with source requirements
-location "http://download.eclipse.org/releases/oxygen/" {
+location "http://download.eclipse.org/releases/photon/" {
org.eclipse.ui lazy
org.eclipse.gmf.runtime.notation lazy
org.eclipse.gmf.runtime.notation.edit lazy
@@ -13,10 +13,6 @@
org.eclipse.emf.databinding.edit lazy
org.eclipse.emf.query.ocl lazy
-}
-
-//manualUpdate
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen {
org.eclipse.papyrus.infra.core lazy
org.eclipse.papyrus.infra.gmfdiag.common lazy
org.eclipse.papyrus.infra.emf.diagram.common lazy
@@ -26,5 +22,4 @@
org.eclipse.papyrus.infra.gmfdiag.css.properties lazy
org.eclipse.papyrus.infra.gmfdiag.css.model lazy
org.eclipse.papyrus.infra.gmfdiag.css.model.edit lazy
-
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 011108e..1a0d831 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,8 @@
<module>refactoring</module>
<module>diagramtemplate</module>
<module>alf</module>
- <module>layers</module>
+ <!-- deactivate layers from the root build as long as it is built on a different platform
+ <-module>layers</module> -->
<module>elk</module>
<module>dsml.validation</module>
</modules>
