438981: [Oomph] Define an Oomph model for Papyrus

https://bugs.eclipse.org/bugs/show_bug.cgi?id=438981

Add QVTo SDK to the developer tools for the Customization component.

Move Subversive targlet content to the specific component that needs it and include a connector from Polarion to ensure that the Connector Discovery dialog doesn't appear at run-time, especially in JUnit launch configurations where it blocks test execution.

1 files changed, 35 insertions, 120 deletions

diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index 92c8ca220fb..74d0e771f89 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -1429,8 +1429,6 @@
           id="org.eclipse.sdk.feature.group"/>
       <requirement
           id="org.eclipse.acceleo.feature.group"/>
-      <requirement
-          id="org.eclipse.team.svn.feature.group"/>
       <repositoryList
           name="Papyrus Main Dependencies">
         <repository
@@ -1476,8 +1474,6 @@
         <repository
             url="${base.downloads.url}/modeling/emf/compare/updates/${dep.emfcompare.repo}"/>
         <repository
-            url="${base.downloads.url}/technology/subversive/${dep.subversive.repo}/"/>
-        <repository
             url="${base.downloads.url}/webtools/downloads/drops/${dep.wtp.repo}/repository"/>
         <repository
             url="${base.downloads.url}/nattable/${dep.nattable.repo}/repository/"/>
@@ -1868,10 +1864,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2016,10 +2008,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2218,10 +2206,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2369,10 +2353,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2520,10 +2500,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2696,10 +2672,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2843,10 +2815,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -2860,6 +2828,11 @@
         name="customization"
         label="Customization">
       <setupTask
+          xsi:type="setup.p2:P2Task">
+        <requirement
+            id="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
+      </setupTask>
+      <setupTask
           xsi:type="projects:ProjectsImportTask">
         <sourceLocator
             rootFolder="${papyrus.git.clone.location/plugins/customization}"/>
@@ -2989,10 +2962,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -3124,10 +3093,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -3259,10 +3224,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -3401,10 +3362,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -3435,11 +3392,41 @@
           </predicate>
         </workingSet>
       </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Papyrus Other Dependencies"
+            activeRepositoryList="">
+          <requirement
+              id="org.eclipse.team.svn.feature.group"/>
+          <requirement
+              id="org.polarion.eclipse.team.svn.connector.svnkit18.feature.group"/>
+          <repositoryList>
+            <repository
+                url="${base.downloads.url}/technology/subversive/${dep.subversive.repo}/"/>
+            <repository
+                url="http://community.polarion.com/projects/subversive/download/eclipse/${dep.svnconnector.repo}/update-site/"/>
+          </repositoryList>
+        </targlet>
+        <description>
+          Additional dependencies, e.g. for Subversive (SVN team integration), including
+          an SVN connector from Polarion to prevent the connector dialog appearing at
+          run-time, especially as it interferes with JUnit test execution.
+        </description>
+      </setupTask>
       <stream
           name="master"
           label="master (Luna/1.0.x)">
         <setupTask
             xsi:type="setup:VariableTask"
+            name="dep.subversive.repo"
+            value="2.0/luna-site"/>
+        <setupTask
+            xsi:type="setup:VariableTask"
+            name="dep.svnconnector.repo"
+            value="4.0"/>
+        <setupTask
+            xsi:type="setup:VariableTask"
             name="papyrus.nightly.repo"
             value="updates/nightly/luna"
             storePromptedValue="false"/>
@@ -3539,10 +3526,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -3682,10 +3665,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -3817,10 +3796,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4037,10 +4012,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4201,10 +4172,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4326,10 +4293,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4452,10 +4415,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4578,10 +4537,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4727,10 +4682,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4858,10 +4809,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -4984,10 +4931,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5110,10 +5053,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5236,10 +5175,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5367,10 +5302,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5498,10 +5429,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5629,10 +5556,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5755,10 +5678,6 @@
               value="releases/3.0"/>
           <setupTask
               xsi:type="setup:VariableTask"
-              name="dep.subversive.repo"
-              value="2.0/luna-site"/>
-          <setupTask
-              xsi:type="setup:VariableTask"
               name="dep.wtp.repo"
               value="R3.6.0/R-3.6.0-20140602160322"/>
           <setupTask
@@ -5938,10 +5857,6 @@
             value="releases/3.0"/>
         <setupTask
             xsi:type="setup:VariableTask"
-            name="dep.subversive.repo"
-            value="2.0/luna-site"/>
-        <setupTask
-            xsi:type="setup:VariableTask"
             name="dep.wtp.repo"
             value="R3.6.0/R-3.6.0-20140602160322"/>
         <setupTask