projects / deliverable / tracecompass.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
pcap: Move plugins to their own sub-directory
[deliverable/tracecompass.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 8b89b79c41d14a5d45a7b4d511447dc8b58777a6..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>
@@ -48,6 +48,9 @@
   <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
   <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>
@@ -94,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>
@@ -105,6 +108,20 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-pack200b-plugin</artifactId>
+          <version>${tycho-extras-version}</version>
+          <executions>
+            <execution>
+              <id>pack200-pack</id>
+              <goals>
+                <goal>pack</goal>
+              </goals>
+              <phase>package</phase>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </build>
   </profile>
@@ -140,14 +157,12 @@
 </profiles>
 
   <modules>
+    <module>btf</module>
     <module>doc</module>
+    <module>pcap</module>
 
     <module>org.eclipse.tracecompass.common.core</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.tests</module>
 
     <module>org.eclipse.tracecompass.ctf</module>
     <module>org.eclipse.tracecompass.ctf.core</module>
@@ -155,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>
 
@@ -173,17 +185,19 @@
     <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>
     <module>org.eclipse.tracecompass.tmf.analysis.xml.ui.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.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>
     <module>org.eclipse.tracecompass.testing</module>
@@ -317,7 +331,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.7.2.201409121644</version>
+          <version>0.7.4.201502262128</version>
           <executions>
             <execution>
              <id>pre-test</id>
@@ -387,7 +401,27 @@
             <encoding>UTF-8</encoding>
             <useProjectSettings>true</useProjectSettings>
           </configuration>
-        </plugin>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>target-platform-configuration</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-plugin</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-publisher-plugin</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-repository-plugin</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
        <plugin>
          <groupId>org.eclipse.tycho</groupId>
          <artifactId>tycho-surefire-plugin</artifactId>
@@ -431,7 +465,7 @@
        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
+          <version>2.7</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -439,22 +473,37 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
+          <version>1.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.4</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.6.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.7</version>
+          <version>2.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.9.1</version>
+          <version>2.10.1</version>
           <configuration>
             <excludePackageNames>org.eclipse.tracecompass.internal.*:*.test*</excludePackageNames>
           </configuration>
@@ -464,6 +513,43 @@
           <artifactId>repository-utils</artifactId>
           <version>0.22.0</version>
         </plugin>
+        <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-eclipserun-plugin</artifactId>
+                <version>${tycho-extras-version}</version>
+                <configuration>
+                        <dependencies>
+                                <dependency>
+                                        <artifactId>org.apache.ant</artifactId>
+                                        <type>eclipse-plugin</type>
+                                </dependency>
+                                <dependency>
+                                        <artifactId>org.eclipse.help.base</artifactId>
+                                        <type>eclipse-plugin</type>
+                                </dependency>
+                                <dependency>
+                                        <artifactId>org.eclipse.ant.core</artifactId>
+                                        <type>eclipse-plugin</type>
+                                </dependency>
+                        </dependencies>
+                        <!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
+                        <repositories>
+                                <repository>
+                                        <id>platform</id>
+                                        <layout>p2</layout>
+                                        <url>${help-docs-eclipserun-repo}</url>
+                                </repository>
+                        </repositories>
+                </configuration>
+                <executions>
+                        <execution>
+                                <goals>
+                                        <goal>eclipse-run</goal>
+                                </goals>
+                                <phase>compile</phase>
+                        </execution>
+                </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
Tracecompass - Deliverables
This page took 0.026829 seconds and 5 git commands to generate.