pcap: Move plugins to their own sub-directory

[deliverable/tracecompass.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c8ff0504a0a60bdc1e36c88254b39020fc4c1c53..170b9c7a4a12e34442f686c57ade19f4267cad35 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
 
 <properties>
   <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
-  <tycho-version>0.22.0</tycho-version>
-  <tycho-extras-version>0.22.0</tycho-extras-version>
+  <tycho-version>0.23.0</tycho-version>
+  <tycho-extras-version>0.23.0</tycho-extras-version>
   <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl>
   <target-platform>tracecompass-eStaging</target-platform>
   <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -49,6 +49,8 @@
   <sonar.java.source>1.7</sonar.java.source>
   <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4</help-docs-eclipserun-repo>
+  <!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
+  <SWT_GTK3>0</SWT_GTK3>
 </properties>
 
 <pluginRepositories>
@@ -95,7 +97,7 @@
         <plugin>
           <groupId>org.eclipse.cbi.maven.plugins</groupId>
           <artifactId>eclipse-jarsigner-plugin</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.2</version>
           <executions>
             <execution>
               <id>sign</id>
@@ -155,13 +157,12 @@
 </profiles>
 
   <modules>
+    <module>btf</module>
     <module>doc</module>
-    <module>org.eclipse.tracecompass.common.core</module>
+    <module>pcap</module>
 
-    <module>org.eclipse.tracecompass.btf</module>
-    <module>org.eclipse.tracecompass.btf.core</module>
-    <module>org.eclipse.tracecompass.btf.core.tests</module>
-    <module>org.eclipse.tracecompass.btf.ui</module>
+    <module>org.eclipse.tracecompass.common.core</module>
+    <module>org.eclipse.tracecompass.common.core.tests</module>
 
     <module>org.eclipse.tracecompass.ctf</module>
     <module>org.eclipse.tracecompass.ctf.core</module>
@@ -169,9 +170,6 @@
     <module>org.eclipse.tracecompass.ctf.parser</module>
     <module>org.eclipse.tracecompass.ctf.parser.tests</module>
 
-    <module>org.eclipse.tracecompass.pcap.core</module>
-    <module>org.eclipse.tracecompass.pcap.core.tests</module>
-
     <module>org.eclipse.tracecompass.statesystem.core</module>
     <module>org.eclipse.tracecompass.statesystem.core.tests</module>
 
@@ -187,12 +185,6 @@
     <module>org.eclipse.tracecompass.tmf.ctf.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests</module>
 
-    <module>org.eclipse.tracecompass.tmf.pcap</module>
-    <module>org.eclipse.tracecompass.tmf.pcap.core</module>
-    <module>org.eclipse.tracecompass.tmf.pcap.core.tests</module>
-    <module>org.eclipse.tracecompass.tmf.pcap.ui</module>
-    <module>org.eclipse.tracecompass.tmf.pcap.ui.swtbot.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>
@@ -202,6 +194,9 @@
     <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.swtbot.tests</module>
+
+    <module>org.eclipse.tracecompass.tmf.remote.ui.tests</module>
 
     <module>org.eclipse.tracecompass.releng-site</module>
     <module>org.eclipse.tracecompass.target</module>