Description: Modify pom files to fix build for Debian

---

diff --git a/ctf/org.eclipse.tracecompass.ctf.parser/pom.xml b/ctf/org.eclipse.tracecompass.ctf.parser/pom.xml
index e86982b..4d6c222 100644
--- a/ctf/org.eclipse.tracecompass.ctf.parser/pom.xml
+++ b/ctf/org.eclipse.tracecompass.ctf.parser/pom.xml
@@ -22,10 +22,20 @@
   <name>Trace Compass CTF Parser Plug-in</name>
   <artifactId>org.eclipse.tracecompass.ctf.parser</artifactId>
   <version>1.0.6-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <build>
+    <sourceDirectory>src</sourceDirectory>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            </archive>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
diff --git a/lttng/pom.xml b/lttng/pom.xml
index bc4b9f6..8a74b61 100644
--- a/lttng/pom.xml
+++ b/lttng/pom.xml
@@ -28,28 +28,29 @@
 
   <modules>
     <module>org.eclipse.tracecompass.lttng2.common.core</module>
-    <module>org.eclipse.tracecompass.lttng2.common.core.tests</module>
-
     <module>org.eclipse.tracecompass.lttng2.control</module>
     <module>org.eclipse.tracecompass.lttng2.control.core</module>
-    <module>org.eclipse.tracecompass.lttng2.control.core.tests</module>
     <module>org.eclipse.tracecompass.lttng2.control.ui</module>
+    <module>org.eclipse.tracecompass.lttng2.kernel</module>
+    <module>org.eclipse.tracecompass.lttng2.kernel.core</module>
+    <module>org.eclipse.tracecompass.lttng2.kernel.ui</module>
+    <module>org.eclipse.tracecompass.lttng2.ust</module>
+    <module>org.eclipse.tracecompass.lttng2.ust.core</module>
+    <module>org.eclipse.tracecompass.lttng2.ust.ui</module>
+<!--
+    <module>org.eclipse.tracecompass.lttng2.common.core.tests</module>
+
+    <module>org.eclipse.tracecompass.lttng2.control.core.tests</module>
     <module>org.eclipse.tracecompass.lttng2.control.ui.tests</module>
     <module>org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests</module>
 
-    <module>org.eclipse.tracecompass.lttng2.kernel</module>
-    <module>org.eclipse.tracecompass.lttng2.kernel.core</module>
     <module>org.eclipse.tracecompass.lttng2.kernel.core.tests</module>
-    <module>org.eclipse.tracecompass.lttng2.kernel.ui</module>
     <module>org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests</module>
 
-    <module>org.eclipse.tracecompass.lttng2.ust</module>
-    <module>org.eclipse.tracecompass.lttng2.ust.core</module>
     <module>org.eclipse.tracecompass.lttng2.ust.core.tests</module>
-    <module>org.eclipse.tracecompass.lttng2.ust.ui</module>
     <module>org.eclipse.tracecompass.lttng2.ust.ui.tests</module>
     <module>org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests</module>
-
+-->
   </modules>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 498ac9b..05e49f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,8 @@
   </licenses>
 
   <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <required-maven-version>3.3</required-maven-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -49,11 +51,10 @@
     <skip-short-tc-ui-tests>false</skip-short-tc-ui-tests>
     <skip-long-tc-ui-tests>false</skip-long-tc-ui-tests>
 
-    <tycho-version>1.3.0</tycho-version>
+    <tycho-version>1.6.0</tycho-version>
     <tycho-extras-version>1.3.0</tycho-extras-version>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl>
     <cbi-plugins.version>1.1.3</cbi-plugins.version>
-    <target-platform>tracecompass-e4.18</target-platform>
     <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.8</help-docs-eclipserun-repo>
 
     <rcptt-version>2.2.0</rcptt-version>
@@ -318,6 +319,209 @@
     <module>jsontrace</module>
   </modules>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.resources</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.osgi</groupId>
+      <artifactId>org.eclipse.osgi.util</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>org.eclipse.equinox.registry</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.jobs</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.cdt</groupId>
+      <artifactId>org.eclipse.cdt.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.linuxtools.profiling</groupId>
+      <artifactId>org.eclipse.linuxtools.dataviewers.piechart</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jface</groupId>
+      <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.swt</groupId>
+      <artifactId>org.eclipse.swt</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>org.eclipse.ui.views</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.commands</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>org.eclipse.ui.navigator</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>org.eclipse.ui.ide</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.filesystem</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jface</groupId>
+      <artifactId>org.eclipse.jface.text</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.expressions</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.emf</groupId>
+      <artifactId>org.eclipse.emf.common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.emf</groupId>
+      <artifactId>org.eclipse.emf.ecore</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.contenttype</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.swtchart</groupId>
+      <artifactId>org.swtchart</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.text</groupId>
+      <artifactId>org.eclipse.text</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.remote</groupId>
+      <artifactId>org.eclipse.remote.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.remote</groupId>
+      <artifactId>org.eclipse.remote.ui</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>org.eclipse.equinox.app</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.swtchart</groupId>
+      <artifactId>org.eclipse.swtchart</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -372,7 +576,6 @@
             <artifact>
               <groupId>org.eclipse.tracecompass</groupId>
               <artifactId>org.eclipse.tracecompass.target</artifactId>
-              <classifier>${target-platform}</classifier>
               <version>6.2.0-SNAPSHOT</version>
             </artifact>
           </target>
diff --git a/rcp/org.eclipse.tracecompass.rcp.branding/pom.xml b/rcp/org.eclipse.tracecompass.rcp.branding/pom.xml
index db115b7..e62e763 100644
--- a/rcp/org.eclipse.tracecompass.rcp.branding/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp.branding/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>org.eclipse.tracecompass.rcp.branding</artifactId>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <name>Trace Compass RCP Branding plug-in</name>
 
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/pom.xml b/rcp/org.eclipse.tracecompass.rcp.product/pom.xml
index 287de46..866b645 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp.product/pom.xml
@@ -20,7 +20,7 @@
     </parent>
 
     <artifactId>org.eclipse.tracecompass.rcp.product</artifactId>
-    <packaging>eclipse-repository</packaging>
+    <packaging>jar</packaging>
 
     <name>Trace Compass RCP Product</name>
 
@@ -33,6 +33,14 @@
         <rootFolderMac>${rootFolder}.app</rootFolderMac>
     </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.tracecompass</groupId>
+      <artifactId>org.eclipse.tracecompass.rcp</artifactId>
+      <version>6.2.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/rcp/org.eclipse.tracecompass.rcp/pom.xml b/rcp/org.eclipse.tracecompass.rcp/pom.xml
index 72ffa4a..153bd8d 100644
--- a/rcp/org.eclipse.tracecompass.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>org.eclipse.tracecompass.rcp</artifactId>
-  <packaging>eclipse-feature</packaging>
+  <packaging>jar</packaging>
 
   <name>Trace Compass RCP Feature</name>
 
diff --git a/rcp/pom.xml b/rcp/pom.xml
index 915668d..7aea376 100644
--- a/rcp/pom.xml
+++ b/rcp/pom.xml
@@ -27,12 +27,14 @@
   <name>Trace Compass RCP Parent</name>
 
   <modules>
-    <module>org.eclipse.tracecompass.rcp.branding</module>
-    <module>org.eclipse.tracecompass.rcp.branding.feature</module>
     <module>org.eclipse.tracecompass.rcp</module>
     <module>org.eclipse.tracecompass.rcp.ui</module>
+<!--
+    <module>org.eclipse.tracecompass.rcp.branding</module>
+    <module>org.eclipse.tracecompass.rcp.branding.feature</module>
     <module>org.eclipse.tracecompass.rcp.ui.tests</module>
     <module>org.eclipse.tracecompass.rcp.incubator</module>
+-->
     <module>org.eclipse.tracecompass.rcp.incubator.ui</module>
   </modules>
 
diff --git a/releng/pom.xml b/releng/pom.xml
index d5648e7..0187ded 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -28,9 +28,5 @@
 
   <modules>
     <module>org.eclipse.tracecompass.target</module>
-    <module>org.eclipse.tracecompass.alltests</module>
-    <module>org.eclipse.tracecompass.integration.swtbot.tests</module>
-    <module>org.eclipse.tracecompass.releng-site</module>
-    <module>org.eclipse.tracecompass.testing</module>
   </modules>
 </project>
diff --git a/tmf/org.eclipse.tracecompass.tmf.filter.parser/pom.xml b/tmf/org.eclipse.tracecompass.tmf.filter.parser/pom.xml
index 0d44cee..9801bea 100644
--- a/tmf/org.eclipse.tracecompass.tmf.filter.parser/pom.xml
+++ b/tmf/org.eclipse.tracecompass.tmf.filter.parser/pom.xml
@@ -25,10 +25,20 @@
   <name>Trace Compass Filter Parser</name>
   <artifactId>org.eclipse.tracecompass.tmf.filter.parser</artifactId>
   <version>1.0.6-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <build>
+    <sourceDirectory>src</sourceDirectory>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            </archive>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml b/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml
index fb4421d..2d67608 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml
@@ -22,10 +22,39 @@
   <artifactId>org.eclipse.tracecompass.tmf.ui</artifactId>
   <version>6.2.0-SNAPSHOT</version>
 
-  <packaging>eclipse-plugin</packaging>
+  <packaging>jar</packaging>
 
   <build>
+    <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>${basedir}</directory>
+        <includes>
+          <include>icons/</include>
+          <include>about.html</include>
+          <include>plugin.properties</include>
+          <include>plugin.xml</include>
+          <include>schema/</include>
+          <include>css/</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src</directory>
+        <includes>
+          <include>**/messages.properties</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            </archive>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -62,5 +91,27 @@
       </plugin>
    </plugins>
  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.tracecompass</groupId>
+      <artifactId>org.eclipse.tracecompass.common.core</artifactId>
+      <version>4.3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.tracecompass</groupId>
+      <artifactId>org.eclipse.tracecompass.tmf.core</artifactId>
+      <version>6.2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.tracecompass</groupId>
+      <artifactId>org.eclipse.tracecompass.segmentstore.core</artifactId>
+      <version>3.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.tracecompass</groupId>
+      <artifactId>org.eclipse.tracecompass.tmf.filter.parser</artifactId>
+      <version>1.0.6-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 
 </project>
diff --git a/tmf/pom.xml b/tmf/pom.xml
index f0acfbc..ab54d38 100644
--- a/tmf/pom.xml
+++ b/tmf/pom.xml
@@ -28,35 +28,17 @@
 
   <modules>
     <module>org.eclipse.tracecompass.tmf</module>
+    <module>org.eclipse.tracecompass.tmf.remote</module>
+    <module>org.eclipse.tracecompass.tmf.remote.core</module>
     <module>org.eclipse.tracecompass.tmf.core</module>
-    <module>org.eclipse.tracecompass.tmf.core.tests</module>
-    <module>org.eclipse.tracecompass.tmf.ui</module>
-    <module>org.eclipse.tracecompass.tmf.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.ui.swtbot.tests</module>
-
     <module>org.eclipse.tracecompass.tmf.cli</module>
     <module>org.eclipse.tracecompass.tmf.cli.core</module>
-    <module>org.eclipse.tracecompass.tmf.cli.core.tests</module>
-
-    <module>org.eclipse.tracecompass.tmf.analysis.xml.core</module>
-    <module>org.eclipse.tracecompass.tmf.analysis.xml.core.tests</module>
-    <module>org.eclipse.tracecompass.tmf.analysis.xml.ui</module>
-    <module>org.eclipse.tracecompass.tmf.analysis.xml.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests</module>
-
+    <module>org.eclipse.tracecompass.tmf.ui</module>
+    <module>org.eclipse.tracecompass.tmf.remote.ui</module>
     <module>org.eclipse.tracecompass.tmf.chart.core</module>
-    <module>org.eclipse.tracecompass.tmf.chart.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.chart.ui</module>
-    <module>org.eclipse.tracecompass.tmf.chart.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.chart.ui.swtbot.tests</module>
-
-    <module>org.eclipse.tracecompass.tmf.remote</module>
-    <module>org.eclipse.tracecompass.tmf.remote.core</module>
-    <module>org.eclipse.tracecompass.tmf.remote.core.tests</module>
-    <module>org.eclipse.tracecompass.tmf.remote.ui</module>
-    <module>org.eclipse.tracecompass.tmf.remote.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests</module>
-
+    <module>org.eclipse.tracecompass.tmf.analysis.xml.core</module>
+    <module>org.eclipse.tracecompass.tmf.analysis.xml.ui</module>
     <module>org.eclipse.tracecompass.tmf.filter.parser</module>
   </modules>