Passage setup should use target definition from .target file #1187

Replace inplace target definition with reference Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
eclipse-passage · Dec 15, 2022 · cb6cf74 · cb6cf74
1 parent 439ea4b
commit cb6cf74
Showing 1 changed file with 8 additions and 231 deletions.
diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
@@ -11,10 +11,9 @@
     xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
     name="passage"
     label="Passage">
   <annotation
@@ -87,138 +86,21 @@
     <requirement
         name="org.eclipse.sirius.specifier.feature.group"/>
     <repository
-        url="https://download.eclipse.org/releases/2022-03/"/>
+        url="https://download.eclipse.org/releases/2022-12/"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
   </setupTask>
   <stream name="master">
     <setupTask
         xsi:type="jdt:JRETask"
         version="JavaSE-1.8"
-        location="${jre.location-1.8}"
-        name="JRE for JavaSE-1.8">
+        location="${jre.location-11}"
+        name="JRE for JavaSE-11">
       <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
     </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask"
-        id="api.baseline.targlet"
-        targetName="Modular API Baseline Target"
-        activateTarget="false">
-      <targlet
-          name="${scope.project.label}"
-          activeRepositoryList="Passage Latest Released">
-        <requirement
-            name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <requirement
-            name="com.fasterxml.jackson.core.jackson-core"/>
-        <requirement
-            name="com.fasterxml.jackson.core.jackson-databind"/>
-        <requirement
-            name="com.github.oshi.oshi-core"/>
-        <requirement
-            name="com.sun.jna"/>
-        <requirement
-            name="com.sun.jna.platform"/>
-        <requirement
-            name="jakarta.servlet"/>
-        <requirement
-            name="javax.activation"/>
-        <requirement
-            name="org.apache.commons.csv"
-            versionRange="[1.4.0,2.0.0)"/>
-        <requirement
-            name="org.apache.logging.log4j"/>
-        <requirement
-            name="org.bouncycastle.bcpg"/>
-        <requirement
-            name="org.bouncycastle.bcpkix"/>
-        <requirement
-            name="org.bouncycastle.bcprov"/>
-        <requirement
-            name="org.bouncycastle.bcutil"/>
-        <requirement
-            name="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.query.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.transaction.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.validation.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emfforms.setup.base"/>
-        <requirement
-            name="org.eclipse.gef.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.gmf.runtime.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.ocl.all.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.passage.lbc.execute.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.passage.ldc.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.passage.lic.bc.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.passage.lic.define.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.passage.loc.operator.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"/>
-        <requirement
-            name="org.eclipse.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.sirius.runtime.aql.feature.group"/>
-        <requirement
-            name="org.eclipse.sirius.runtime.feature.group"/>
-        <requirement
-            name="org.eclipse.uml2.sdk.feature.group"/>
-        <requirement
-            name="org.junit"/>
-        <requirement
-            name="org.slf4j.api"/>
-        <requirement
-            name="org.slf4j.apis.log4j"/>
-        <repositoryList
-            name="Passage Latest Released">
-          <repository
-              url="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
-          <repository
-              url="https://download.eclipse.org/ecp/rt/1270/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5/"/>
-          <repository
-              url="https://download.eclipse.org/passage/updates/release/2.6.0/"/>
-          <repository
-              url="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
-          <repository
-              url="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
     <setupTask
         xsi:type="pde:APIBaselineFromTargetTask"
-        predecessor="api.baseline.targlet"
         name="Modular API Baseline"
-        targetName="Modular API Baseline Target">
+        targetName="org.eclipse.passage.baseline">
       <description>An API baseline based on the target platform named 'Modular API Baseline Target'</description>
     </setupTask>
     <setupTask
@@ -243,113 +125,8 @@
       <description>${scope.project.label} GitHub</description>
     </setupTask>
     <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="${scope.project.label}"
-          activeRepositoryList="">
-        <requirement
-            name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <requirement
-            name="com.fasterxml.jackson.core.jackson-core"/>
-        <requirement
-            name="com.fasterxml.jackson.core.jackson-databind"/>
-        <requirement
-            name="com.github.oshi.oshi-core"/>
-        <requirement
-            name="com.sun.jna"/>
-        <requirement
-            name="com.sun.jna.platform"/>
-        <requirement
-            name="jakarta.servlet"/>
-        <requirement
-            name="javax.activation"/>
-        <requirement
-            name="org.apache.commons.csv"
-            versionRange="[1.4.0,2.0.0)"/>
-        <requirement
-            name="org.apache.log4j"/>
-        <requirement
-            name="org.bouncycastle.bcpg"/>
-        <requirement
-            name="org.bouncycastle.bcpkix"/>
-        <requirement
-            name="org.bouncycastle.bcprov"/>
-        <requirement
-            name="org.bouncycastle.bcutil"/>
-        <requirement
-            name="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.query.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.transaction.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.validation.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emfforms.setup.base"/>
-        <requirement
-            name="org.eclipse.gef.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.gmf.runtime.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.ocl.all.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.pde.feature.group"/>
-        <requirement
-            name="org.eclipse.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.sirius.runtime.aql.feature.group"/>
-        <requirement
-            name="org.eclipse.sirius.runtime.feature.group"/>
-        <requirement
-            name="org.eclipse.uml2.sdk.feature.group"/>
-        <requirement
-            name="org.junit"/>
-        <requirement
-            name="org.slf4j.api"/>
-        <requirement
-            name="org.slf4j.apis.log4j"/>
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${git.clone.passage.location}"
-            locateNestedProjects="true"/>
-        <repositoryList
-            name="">
-          <repository
-              url="https://download.eclipse.org/cbi/updates/license/"/>
-          <repository
-              url="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
-          <repository
-              url="https://download.eclipse.org/ecp/rt/1270/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5/"/>
-          <repository
-              url="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
-          <repository
-              url="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
+        xsi:type="pde:TargetPlatformTask"
+        name="org.eclipse.passage.target"/>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
@@ -361,7 +138,7 @@
           name="${scope.project.label}">
         <predicate
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@streams[name='master']/@setupTasks.6/@workingSets[name='${scope.project.label}%20LBC'] //@streams[name='master']/@setupTasks.6/@workingSets[name='${scope.project.label}%20LDC'] //@streams[name='master']/@setupTasks.6/@workingSets[name='${scope.project.label}%20LIC'] //@streams[name='master']/@setupTasks.6/@workingSets[name='${scope.project.label}%20LOC']"/>
+            excludedWorkingSet="//@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LBC'] //@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LDC'] //@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LIC'] //@streams[name='master']/@setupTasks.5/@workingSets[name='${scope.project.label}%20LOC']"/>
       </workingSet>
       <workingSet
           name="${scope.project.label} LIC">