X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=pom.xml;h=055190707502b0ee5540fffa401ce5b43c0bd395;hb=313697faf36c15a5505a34f8607b071443441562;hp=d0ea5a1d7a13406e0a1bfe6206415e119a56ed7b;hpb=9d26aebf874e0f2523551b7f947d14c10462f611;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index d0ea5a1d7a..0551907075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,8 @@
 
   <groupId>org.eclipse.tracecompass</groupId>
   <artifactId>org.eclipse.tracecompass</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-
   <name>Trace Compass Parent</name>
 
   <licenses>
@@ -40,13 +39,18 @@
 
 <properties>
   <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
-  <tycho-version>0.21.0</tycho-version>
-  <target-platform>tracecompass-e4.4</target-platform>
+  <tycho-version>0.23.1</tycho-version>
+  <tycho-extras-version>0.23.1</tycho-extras-version>
+  <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl>
+  <target-platform>tracecompass-e4.5</target-platform>
   <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
   <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-  <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+  <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.5</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>
@@ -58,20 +62,62 @@
     <id>tycho-snapshots</id>
     <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
   </pluginRepository>
+  <pluginRepository>
+    <id>jboss-public-repository-group</id>
+    <name>JBoss Public Repository Group</name>
+    <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+  </pluginRepository>
 </pluginRepositories>
 
 <profiles>
   <profile>
-    <id>tracingRcp</id>
-      <modules>
-        <module>org.eclipse.tracecompass.rcp.product</module>
-      </modules>
-  </profile>
-  <profile>
-    <id>performance</id>
-    <modules>
-      <module>org.eclipse.tracecompass.alltests</module>
-    </modules>
+    <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.2</version>
+          <executions>
+            <execution>
+              <id>sign</id>
+              <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>
   <profile>
     <id>macosx</id>
@@ -99,85 +145,18 @@
 </profiles>
 
   <modules>
-    <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.ctf</module>
-    <module>org.eclipse.tracecompass.ctf.core</module>
-    <module>org.eclipse.tracecompass.ctf.core.tests</module>
-    <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>
-
-    <module>org.eclipse.tracecompass.tmf</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.help</module>
-
-    <module>org.eclipse.tracecompass.tmf.ctf</module>
-    <module>org.eclipse.tracecompass.tmf.ctf.core</module>
-    <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.pcap.help</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.help</module>
-    <module>org.eclipse.tracecompass.releng-site</module>
-    <module>org.eclipse.tracecompass.target</module>
-    <module>org.eclipse.tracecompass.testing</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.control.ui.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.tests</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.gdbtrace</module>
-    <module>org.eclipse.tracecompass.gdbtrace.core</module>
-    <module>org.eclipse.tracecompass.gdbtrace.core.tests</module>
-    <module>org.eclipse.tracecompass.gdbtrace.ui</module>
-    <module>org.eclipse.tracecompass.gdbtrace.ui.tests</module>
-    <module>org.eclipse.tracecompass.gdbtrace.help</module>
-
-    <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.help</module>
-    <module>org.eclipse.tracecompass.rcp.ui</module>
-
-    <module>org.eclipse.tracecompass.examples</module>
+    <module>analysis</module>
+    <module>btf</module>
+    <module>common</module>
+    <module>ctf</module>
+    <module>doc</module>
+    <module>gdbtrace</module>
+    <module>lttng</module>
+    <module>pcap</module>
+    <module>rcp</module>
+    <module>releng</module>
+    <module>statesystem</module>
+    <module>tmf</module>
   </modules>
 
     <build>
@@ -187,6 +166,7 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <version>${tycho-version}</version>
                 <configuration>
+                    <includePackedArtifacts>true</includePackedArtifacts>
                     <environments>
                         <environment>
                             <os>win32</os>
@@ -219,7 +199,7 @@
                         <groupId>org.eclipse.tracecompass</groupId>
                         <artifactId>org.eclipse.tracecompass.target</artifactId>
                         <classifier>${target-platform}</classifier>
-                        <version>1.0.0</version>
+                        <version>2.0.0</version>
                       </artifact>
                     </target>
                     <filters>
@@ -272,7 +252,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>
@@ -283,7 +263,7 @@
                 <!-- Where to put jacoco coverage report -->
                 <destFile>${sonar.jacoco.reportPath}</destFile>
                 <includes>
-                  <include>org.eclipse.linuxtools.*</include>
+                  <include>org.eclipse.tracecompass.*</include>
                 </includes>
                 <append>true</append>
               </configuration>
@@ -300,6 +280,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>
@@ -309,11 +320,29 @@
           <version>${tycho-version}</version>
           <configuration>
             <encoding>UTF-8</encoding>
-            <compilerArguments>
-              <properties>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</properties>
-            </compilerArguments>
+            <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>
@@ -337,10 +366,27 @@
           <artifactId>tycho-versions-plugin</artifactId>
           <version>${tycho-version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-packaging-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <sourceReferences>
+              <generate>true</generate>
+            </sourceReferences>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.eclipse.tycho.extras</groupId>
+              <artifactId>tycho-sourceref-jgit</artifactId>
+              <version>${tycho-extras-version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
 	<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>
@@ -348,26 +394,88 @@
         <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.linuxtools.internal.*:*.test*</excludePackageNames>
+            <excludePackageNames>org.eclipse.tracecompass.internal.*:*.test*</excludePackageNames>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.jboss.tools.tycho-plugins</groupId>
+          <artifactId>repository-utils</artifactId>
+          <version>0.22.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>2.6</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>