Remove Mylyn from DSL package

Follow up to eclipse-packaging#19, eclipse-packaging#24, eclipse-packaging#26 Fixes eclipse-packaging#30
jonahgraham · Jun 5, 2023 · ffec2a1 · ffec2a1
1 parent 15ae749
commit ffec2a1
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 40 deletions.
diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -234,13 +234,6 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
-      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
-      <feature id="org.eclipse.mylyn.git" installMode="root"/>
-      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
-      <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
       <feature id="org.eclipse.epp.package.dsl.feature" version="4.28.0.qualifier"/>
@@ -255,7 +248,6 @@ United States, other countries, or both.
       <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.buildship" installMode="root"/>
-      <feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
    </features>
 
 

diff --git a/packages/org.eclipse.epp.package.dsl.product/p2.inf b/packages/org.eclipse.epp.package.dsl.product/p2.inf
@@ -141,35 +141,3 @@ requires.116.filter = (org.eclipse.epp.install.roots=true)
 requires.117.namespace = org.eclipse.equinox.p2.iu
 requires.117.name = org.eclipse.buildship.feature.group
 requires.117.filter = (org.eclipse.epp.install.roots=true)
-
-requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
-requires.200.filter = (org.eclipse.epp.install.roots=true)
-
-requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
-requires.201.filter = (org.eclipse.epp.install.roots=true)
-
-requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
-requires.202.filter = (org.eclipse.epp.install.roots=true)
-
-requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.git.feature.group
-requires.203.filter = (org.eclipse.epp.install.roots=true)
-
-requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.github.feature.feature.group
-requires.204.filter = (org.eclipse.epp.install.roots=true)
-
-requires.205.namespace = org.eclipse.equinox.p2.iu
-requires.205.name = org.eclipse.mylyn.hudson.feature.group
-requires.205.filter = (org.eclipse.epp.install.roots=true)
-
-requires.206.namespace = org.eclipse.equinox.p2.iu
-requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
-requires.206.filter = (org.eclipse.epp.install.roots=true)
-
-requires.210.namespace = org.eclipse.equinox.p2.iu
-requires.210.name = org.eclipse.mylyn.java_feature.feature.group
-requires.210.filter = (org.eclipse.epp.install.roots=true)
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>

diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -234,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+
+      <!-- common features to almost all products -->
       <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
       <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>