Cleanup remaining terminal features

Author: laeubi

releng/scripts/check_features.sh

@@ -24,9 +24,8 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
         plugin=$(xmllint --xpath 'string(//feature/@id)' $feature_xml)
     fi
 
-    if [ "$plugin" == 'org.eclipse.tm.terminal.control' ]; then
-        # As part of https://github.com/eclipse-cdt/cdt/pull/1166 this bundle
-        # was moved to Eclipse platform, so we cannot run these checks.
+    if [ "$plugin" == 'org.eclipse.tm.terminal.control.feature' ]; then
+        # this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
         continue;
     fi
 
@@ -39,6 +38,16 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
         # this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
         continue;
     fi
+    
+    if [ "$plugin" == 'org.eclipse.tm.terminal.feature' ]; then
+        # this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
+        continue;
+    fi
+    
+    if [ "$plugin" == 'org.eclipse.tm.terminal.view.feature' ]; then
+        # this never contained about mappings and we moved the plugin to platform that does not contain mappings as well
+        continue;
+    fi
 
     feature_dir=$(dirname ${feature_xml})
 

terminal/features/org.eclipse.tm.terminal.control.feature/feature.xml

@@ -18,7 +18,6 @@
       label="%featureName"
       version="12.2.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.tm.terminal.control"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 

terminal/features/org.eclipse.tm.terminal.feature/feature.xml

@@ -13,7 +13,6 @@
       label="%featureName"
       version="12.2.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.tm.terminal.view.core"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 

terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml

@@ -13,7 +13,6 @@
       label="%featureName"
       version="12.2.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.tm.terminal.view.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
@@ -30,13 +29,8 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.view.core" version="4.8.0" match="compatible"/>
-      <import plugin="org.eclipse.tm.terminal.view.ui" version="4.11.0" match="compatible"/>
-      <import plugin="org.eclipse.tm.terminal.control" version="5.2.0" match="compatible"/>
+      <import plugin="org.eclipse.terminal.view.core" />
+      <import plugin="org.eclipse.terminal.view.ui" />
    </requires>
 
 </feature>