[releng] [layers] correct a missing releng configuration
- rename a wrongly named folder
- create the necessary targetplatform
Change-Id: I7637c4a6aa61d411f204d63c2a3624bc43737f08
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
index 077b269..da0fb89 100755
--- a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
+++ b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
@@ -1,10 +1,29 @@
<?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="1504189034">
+<target name="Layers - Oxygen" sequenceNumber="1504350732">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.ui" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.edit" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.providers" version="0.0.0"/>
+ <unit id="org.junit" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.common.edit" version="0.0.0"/>
+ <unit id="org.eclipse.emf" version="0.0.0"/>
+ <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"/>
+ <unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="0.0.0"/>
+ <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+ </location>
</locations>
</target>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
deleted file mode 100755
index dbd7e60..0000000
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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="1504189034">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository location="http://download.eclipse.org/releases/oxygen/"/>
- </location>
- </locations>
-</target>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
deleted file mode 100755
index 1d1ea71..0000000
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
+++ /dev/null
@@ -1,6 +0,0 @@
-target "Layers - Oxygen" with source requirements
-
-location "http://download.eclipse.org/releases/oxygen/" {
-
-}
-
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/.project
similarity index 100%
rename from layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project
rename to layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/.project
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
new file mode 100755
index 0000000..2a84888
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
@@ -0,0 +1,29 @@
+<?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="1504350732">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.ui" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.edit" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.providers" version="0.0.0"/>
+ <unit id="org.junit" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.common.edit" version="0.0.0"/>
+ <unit id="org.eclipse.emf" version="0.0.0"/>
+ <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"/>
+ <unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="0.0.0"/>
+ <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+ </location>
+ </locations>
+</target>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
new file mode 100755
index 0000000..594bd39
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
@@ -0,0 +1,27 @@
+target "Layers - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" {
+ org.eclipse.ui lazy
+ org.eclipse.gmf.runtime.notation lazy
+ org.eclipse.gmf.runtime.notation.edit lazy
+ org.eclipse.gmf.runtime.notation.providers lazy
+ org.junit lazy
+ org.eclipse.uml2.uml lazy
+ org.eclipse.uml2.common.edit lazy
+ org.eclipse.emf lazy
+ org.eclipse.uml2.uml.edit lazy
+ 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
+ org.eclipse.papyrus.views.modelexplorer lazy
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink lazy
+ org.eclipse.papyrus.integrationtests.editor lazy
+
+}
\ No newline at end of file
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/pom.xml
similarity index 100%
rename from layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml
rename to layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/pom.xml
diff --git a/layers/tests/org.eclipse.papyrus.layers.integrationtests/pom.xml b/layers/tests/org.eclipse.papyrus.layers.integrationtests/pom.xml
new file mode 100755
index 0000000..c142466
--- /dev/null
+++ b/layers/tests/org.eclipse.papyrus.layers.integrationtests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.papyrus.incubation.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.layers.tests</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.layers.integrationtests</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+
+</project>
\ No newline at end of file
diff --git a/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/pom.xml b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/pom.xml
new file mode 100755
index 0000000..ef4d250
--- /dev/null
+++ b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.papyrus.incubation.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.layers.tests</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.layers.stackmodel.tests</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+
+</project>
\ No newline at end of file
diff --git a/layers/tests/pom.xml b/layers/tests/pom.xml
index 0b89419..566a302 100755
--- a/layers/tests/pom.xml
+++ b/layers/tests/pom.xml
@@ -9,14 +9,13 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.incubation.elk.tests</artifactId>
+ <artifactId>org.eclipse.papyrus.incubation.layers.tests</artifactId>
<packaging>pom</packaging>
<modules>
<!-- FIXME present in Papyrus core repo but not in the build
- org.eclipse.papyrus.layers.integrationtests
- org.eclipse.papyrus.layers.stackmodel.tests
- -->
+ <module>org.eclipse.papyrus.layers.integrationtests</module>
+ <module>org.eclipse.papyrus.layers.stackmodel.tests</module> -->
</modules>
</project>
\ No newline at end of file
