[482528] Integrate properties view support in the main repo

The incubation-specific repo and profiles are still kept and built at
this point to minimize the risks during the transition, but may be
removed later.

Bug: 482528
Change-Id: I967c1572cee3cf78a5729099513763ca16af399b
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

3 files changed, 31 insertions, 23 deletions

diff --git a/build.sh b/build.sh
index 99123130ff..74825b2ef7 100755
--- a/build.sh
+++ b/build.sh
@@ -8,4 +8,4 @@ readonly TESTS_SUITES=${3:-junit,swtbot-sequence,swtbot}
 readonly BUILD_POM="packaging/org.eclipse.sirius.parent/pom.xml"
 readonly USE_P2_MIRRORS="true"
 
-SWT_GTK3=0 mvn -Dplatform-version-name="$PLATFORM" -Declipse.p2.mirrors="$USE_P2_MIRRORS" -f "$BUILD_POM" -P full,headless,incubation,"$TESTS_SUITES" clean "$GOAL"
+SWT_GTK3=0 mvn -Dplatform-version-name="$PLATFORM" -Declipse.p2.mirrors="$USE_P2_MIRRORS" -f "$BUILD_POM" -P full,headless,"$TESTS_SUITES" clean "$GOAL"
diff --git a/packaging/org.eclipse.sirius.parent/pom.xml b/packaging/org.eclipse.sirius.parent/pom.xml
index e6bee13d7f..d140721dae 100644
--- a/packaging/org.eclipse.sirius.parent/pom.xml
+++ b/packaging/org.eclipse.sirius.parent/pom.xml
@@ -361,6 +361,16 @@
         <module>../../plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily.design</module>
         <module>../../plugins/org.eclipse.sirius.samples.family</module>
 
+        <module>../../incubation/org.eclipse.sirius.common.interpreter</module>
+        <module>../../incubation/org.eclipse.sirius.properties</module>
+        <module>../../incubation/org.eclipse.sirius.properties.edit</module>
+        <module>../../incubation/org.eclipse.sirius.editor.properties</module>
+        <module>../../incubation/org.eclipse.sirius.ui.properties</module>
+        <module>../../incubation/org.eclipse.sirius.sample.properties</module>
+        <module>../../incubation/org.eclipse.sirius.sample.properties.checkbox</module>
+        <module>../../incubation/org.eclipse.sirius.sample.properties.radio</module>
+        <module>../../incubation/org.eclipse.sirius.sample.properties.textarea</module>
+
         <!-- features -->
         <module>../../packaging/org.eclipse.sirius.aql</module>
         <module>../../packaging/org.eclipse.sirius.doc.feature</module>
@@ -374,9 +384,16 @@
         <module>../../packaging/org.eclipse.sirius.specifier.ide.ui.aql</module>
         <module>../../packaging/org.eclipse.sirius.specifier.ide.ui</module>
         <module>../../packaging/org.eclipse.sirius.tests.support</module>
+        
+        <module>../../incubation/org.eclipse.sirius.interpreter.feature</module>
+        <module>../../incubation/org.eclipse.sirius.properties.feature</module>
+        <module>../../incubation/org.eclipse.sirius.specifier.properties.feature</module>
+        <module>../../incubation/org.eclipse.sirius.samples.properties.feature</module>
+        <module>../../incubation/org.eclipse.sirius.incubation</module>
 
         <!-- update sites -->
         <module>../../packaging/org.eclipse.sirius.update</module>
+        <module>../../incubation/org.eclipse.sirius.incubation.update</module>
 
         <!-- Test metamodels and modelers -->
         <module>../../plugins/org.eclipse.sirius.sample.ecore.design</module>
@@ -405,33 +422,16 @@
         <module>../../packaging/org.eclipse.sirius.tests.update</module>
 
     </modules>
-</profile>
-<profile>
+    <profile>
       <id>incubation</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
-        <!-- plugins -->
-        <module>../../incubation/org.eclipse.sirius.common.interpreter</module>
-        <module>../../incubation/org.eclipse.sirius.properties</module>
-        <module>../../incubation/org.eclipse.sirius.properties.edit</module>
-        <module>../../incubation/org.eclipse.sirius.editor.properties</module>
-        <module>../../incubation/org.eclipse.sirius.ui.properties</module>
-        <module>../../incubation/org.eclipse.sirius.sample.properties</module>
-        <module>../../incubation/org.eclipse.sirius.sample.properties.checkbox</module>
-        <module>../../incubation/org.eclipse.sirius.sample.properties.radio</module>
-        <module>../../incubation/org.eclipse.sirius.sample.properties.textarea</module>
-        <!-- features -->
-        <module>../../incubation/org.eclipse.sirius.incubation</module>
-        <module>../../incubation/org.eclipse.sirius.interpreter.feature</module>
-        <module>../../incubation/org.eclipse.sirius.properties.feature</module>
-        <module>../../incubation/org.eclipse.sirius.specifier.properties.feature</module>
-        <module>../../incubation/org.eclipse.sirius.samples.properties.feature</module>
-        <!-- update sites -->
-        <module>../../incubation/org.eclipse.sirius.incubation.update</module>
       </modules>
     </profile>
+    
+</profile>
     <profile>
       <id>sign</id>
       <activation>
diff --git a/packaging/org.eclipse.sirius.update/category.xml b/packaging/org.eclipse.sirius.update/category.xml
index be882c6df4..42f988522f 100644
--- a/packaging/org.eclipse.sirius.update/category.xml
+++ b/packaging/org.eclipse.sirius.update/category.xml
@@ -95,8 +95,16 @@
    <feature id="org.eclipse.sirius.tests.support.source" version="0.0.0">
       <category name="Sirius.SDK"/>
    </feature>
-   <feature id="org.eclipse.acceleo.query" version="0.0.0"/>
-   <feature id="org.eclipse.acceleo.query.source" version="0.0.0"/>
+   <feature id="org.eclipse.acceleo.query" version="0.0.0" />
+   <feature id="org.eclipse.acceleo.query.source" version="0.0.0" />
+   
+   <feature id="org.eclipse.sirius.interpreter.feature" version="0.0.0" />
+   <feature id="org.eclipse.sirius.interpreter.feature.source" version="0.0.0" />
+   <feature id="org.eclipse.sirius.properties.feature" version="0.0.0" />
+   <feature id="org.eclipse.sirius.properties.feature.source" version="0.0.0" />
+   <feature id="org.eclipse.sirius.specifier.properties.feature" version="0.0.0" />
+   <feature id="org.eclipse.sirius.specifier.properties.feature.source" version="0.0.0" />
+   
    <category-def name="Sirius" label="Sirius">
       <description>
          The Sirius Modeling Platform