X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=pom.xml;h=15eda26d11b61a824e91854d7ed4a8ffbb843dff;hb=423cf6a48470379c8fb29ffb75413594bfa06fa9;hp=63e518104bd425db39c86dc7a85906c42815a218;hpb=f696c5797bbc0265e05b735ac6b1266c4754dbc7;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index 63e518104b..15eda26d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -55,6 +58,10 @@
     <id>repo.eclipse.org</id>
     <url>https://repo.eclipse.org/content/groups/releases/</url>
   </pluginRepository>
+  <pluginRepository>
+    <id>cbi-snapshots</id>
+    <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
+  </pluginRepository>
   <pluginRepository>
     <id>tycho-snapshots</id>
     <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
@@ -77,20 +84,48 @@
     <id>sign-update-site</id>
     <build>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-pack200a-plugin</artifactId>
+          <version>${tycho-extras-version}</version>
+          <executions>
+            <execution>
+              <id>pack200-normalize</id>
+              <goals>
+                <goal>normalize</goal>
+              </goals>
+              <phase>package</phase>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.cbi.maven.plugins</groupId>
           <artifactId>eclipse-jarsigner-plugin</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.2-SNAPSHOT</version>
           <executions>
             <execution>
               <id>sign</id>
-              <phase>install</phase>
+              <phase>package</phase>
               <goals>
                 <goal>sign</goal>
               </goals>
             </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>
@@ -127,8 +162,8 @@
 
   <modules>
     <module>doc</module>
-
     <module>org.eclipse.tracecompass.common.core</module>
+    <module>org.eclipse.tracecompass.common.core.tests</module>
 
     <module>org.eclipse.tracecompass.btf</module>
     <module>org.eclipse.tracecompass.btf.core</module>
@@ -170,6 +205,14 @@
     <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>
@@ -217,6 +260,7 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <version>${tycho-version}</version>
                 <configuration>
+                    <includePackedArtifacts>true</includePackedArtifacts>
                     <environments>
                         <environment>
                             <os>win32</os>
@@ -302,7 +346,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>
@@ -330,6 +374,37 @@
             </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>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <executions>
+          <execution>
+            <id>p2-metadata</id>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <defaultP2Metadata>false</defaultP2Metadata>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -341,7 +416,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>
@@ -385,7 +480,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>
@@ -393,22 +488,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>
@@ -418,6 +528,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>