commit c9bf286eaa9ca829192557e6892f14cf1bce5e31
author Ed Merks <ed.merks@gmail.com> Fri Jun 10 07:20:16 2022 +0200
committer Ed Merks <ed.merks@gmail.com> Fri Jun 10 07:20:16 2022 +0200
tree 3e0453a83e2592eb512b4e591c7b327d9e722ee7
parent ff2ccc003a1d8c4f5c15c95f48c5dbae54970054

[Releng] Remove org.eclipse.pde.api.tools.ee.feature.feature.group

setups/Oomph.setup

diff --git a/setups/Oomph.setup b/setups/Oomph.setup
index 8719610..b7b1a4d 100644
--- a/setups/Oomph.setup
+++ b/setups/Oomph.setup
@@ -72,9 +72,6 @@
         name="org.eclipse.swtbot.ide.feature.group"/>
     <requirement
         name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
-    <requirement
-        name="org.eclipse.pde.api.tools.ee.feature.feature.group"
-        optional="true"/>
     <repository
         url="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
     <repository

setups/interim/EMFCompare.setup

diff --git a/setups/interim/EMFCompare.setup b/setups/interim/EMFCompare.setup
index 3b6c2e0..499abb7 100644
--- a/setups/interim/EMFCompare.setup
+++ b/setups/interim/EMFCompare.setup
@@ -47,8 +47,6 @@
     <requirement
         name="org.eclipse.emf.ecoretools.sdk.feature.group"/>
     <requirement
-        name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
-    <requirement
         name="net.sf.eclipsecs.feature.group"/>
     <requirement
         name="com.github.sevntu.checkstyle.checks.feature.feature.group"/>
@@ -99,9 +97,22 @@
   <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
-      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
       targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
-      encoding="UTF-8"/>
+      encoding="UTF-8">
+    <content>
+      &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
+      &lt;section name=&quot;Workbench&quot;>
+      	&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
+      		&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
+      		&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
+      		&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
+      		&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
+      		&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
+      	&lt;/section>
+      &lt;/section>
+
+    </content>
+  </setupTask>
   <setupTask
       xsi:type="pde:APIBaselineTask"
       name="${scope.project.label}"
@@ -241,7 +252,7 @@
         name="Core">
       <predicate
           xsi:type="workingsets:ExclusionPredicate"
-          excludedWorkingSet="//@setupTasks.9/@workingSets.6 //@setupTasks.9/@workingSets.1 //@setupTasks.9/@workingSets.2 //@setupTasks.9/@workingSets.3 //@setupTasks.9/@workingSets.4 //@setupTasks.9/@workingSets.7"/>
+          excludedWorkingSet="//@setupTasks.9/@workingSets[name='Packaging'] //@setupTasks.9/@workingSets[name='RCP'] //@setupTasks.9/@workingSets[name='IDE'] //@setupTasks.9/@workingSets[name='UML'] //@setupTasks.9/@workingSets[name='Diagram'] //@setupTasks.9/@workingSets[name='Features']"/>
     </workingSet>
     <workingSet
         name="RCP">
@@ -252,7 +263,7 @@
             pattern=".*compare.rcp.*"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+            excludedWorkingSet="//@setupTasks.9/@workingSets[name='Features']"/>
       </predicate>
     </workingSet>
     <workingSet
@@ -264,7 +275,7 @@
             pattern=".*compare.ide.*"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+            excludedWorkingSet="//@setupTasks.9/@workingSets[name='Features']"/>
       </predicate>
     </workingSet>
     <workingSet
@@ -276,7 +287,7 @@
             pattern=".*uml.*"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+            excludedWorkingSet="//@setupTasks.9/@workingSets[name='Features']"/>
       </predicate>
     </workingSet>
     <workingSet
@@ -288,7 +299,7 @@
             pattern=".*diagram.*"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+            excludedWorkingSet="//@setupTasks.9/@workingSets[name='Features']"/>
       </predicate>
     </workingSet>
     <workingSet