releng: Use org.eclipse.remote plugins instead of the feature

The top-level feature now includes the doc.isv plugin, which
in turn depends on all org.eclipse.remote features (serial,
telnet, etc.) which we don't need.

Depend directly on the plugins instead.

Change-Id: Iac7eb44d75b0db46549cdc6d3cfe027e504a95bc
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/69298
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-by: Hudson CI

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control/feature.xml b/lttng/org.eclipse.tracecompass.lttng2.control/feature.xml
index d7807570e3a6baff9dfe4cd41df77833451825bb..37ca5b10d6355a9a38541ed63a6b900ae061676a 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control/feature.xml
+++ b/lttng/org.eclipse.tracecompass.lttng2.control/feature.xml
@@ -36,7 +36,8 @@
       <import plugin="org.eclipse.tracecompass.tmf.remote.ui" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tracecompass.tmf.ui" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help"/>
-      <import feature="org.eclipse.remote" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.remote.core" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.remote.ui" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava"/>
       <import plugin="org.eclipse.core.expressions"/>
    </requires>

diff --git a/rcp/org.eclipse.tracecompass.rcp.branding/help_data.xml b/rcp/org.eclipse.tracecompass.rcp.branding/help_data.xml
index 8392d98bdbf688f10e6d4d9c7b7af59e689c20b5..0f9ff99aa40c1233d8fb85ddbe0b818db7086011 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp.branding/help_data.xml
+++ b/rcp/org.eclipse.tracecompass.rcp.branding/help_data.xml
@@ -4,6 +4,5 @@
    </tocOrder>
    <hidden>
       <toc id="/org.eclipse.platform.doc.user/toc.xml"/>
-      <toc id="/org.eclipse.remote.doc.isv/toc.xml"/>
    </hidden>
 </extensions>
\ No newline at end of file

diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
index 82c89608c48f72ed5eed6e7032eec4c4ba338d12..e79aba2f30bc449adc46a37ea3cb6203bbf587d0 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -218,9 +218,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
-      <feature id="org.eclipse.remote"/>
-      <feature id="org.eclipse.remote.console"/>
-      <feature id="org.eclipse.tm.terminal.control.feature"/>
    </features>
 
    <configurations>

diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 8d3a96c6965753347f5902d639650faa56b7ec4f..9f1f393e4e63010a9427eb753cfaaceecb161d66 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -120,4 +120,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.remote.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.remote.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

diff --git a/rcp/org.eclipse.tracecompass.rcp/pom.xml b/rcp/org.eclipse.tracecompass.rcp/pom.xml
index 3d136b3cd7b0454499eb41498d553139a637efcb..01c3f74430ac3551b7e14dea6395b46ba8d40b4f 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/pom.xml
@@ -74,6 +74,9 @@
                 <plugin id="org.swtchart"/>
                 <plugin id="com.google.guava"/>
                 <plugin id="org.apache.commons.io"/>
+                <plugin id="org.eclipse.remote.core"/>
+                <plugin id="org.eclipse.remote.ui"/>
+                <plugin id="org.eclipse.remote.console"/>
               </excludes>
             </configuration>
           </execution>

diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target
index d9bfe20bfbb0fe375cdc2ea9b9a0abaad8439501..9cbda11114081e09555643e76d47a7ec4ea42649 100644 (file)
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target
@@ -19,15 +19,13 @@
 <repository location="http://download.eclipse.org/technology/swtbot/snapshots"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones/UR2-RC2/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.0/GA/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
 <unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
 <unit id="org.apache.commons.io" version="0.0.0"/>

diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
index b724d9794b7d10b30d4b6bf855d4c16fa327581b..3f4e4baeeade24827fa84d638683716777bb2973 100644 (file)
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="tracecompass-e4.6" sequenceNumber="2">
+<?pde version="3.8"?><target name="tracecompass-e4.6" sequenceNumber="3">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -19,15 +19,13 @@
 <repository location="http://download.eclipse.org/technology/swtbot/snapshots"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.1milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="http://download.eclipse.org/tools/cdt/launchbar/neon.m5/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index efbe689524f39bf413406369692d5092e9cbcba2..b269e994ad73a84eff7199c37c5c1afb0a086c07 100644 (file)
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="55">
+<?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="56">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -19,15 +19,13 @@
 <repository location="http://download.eclipse.org/technology/swtbot/snapshots"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.1milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="http://download.eclipse.org/tools/cdt/launchbar/neon.m5/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">