X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=pom.xml;h=89c1dfd4c65f6949ff920ba8043d1b857ce88ec8;hb=453a59f0836c2091b42ee6445e8411091eeec123;hp=090acb024bc5b7958bbceb10cf248d328bf9cbdd;hpb=374cd3cd1bbe4f765b84b3032ddcfecc4e65f71c;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index 090acb024b..89c1dfd4c6 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>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-
   <name>Trace Compass Parent</name>
 
   <licenses>
@@ -40,8 +39,10 @@
 
 <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.22.0</tycho-version>
+  <tycho-extras-version>0.22.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>
   <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
   <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
@@ -58,19 +59,73 @@
     <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>
+    <id>build-rcp</id>
       <modules>
-        <module>org.eclipse.linuxtools.tracing.rcp.product</module>
+        <module>org.eclipse.tracecompass.rcp.product</module>
       </modules>
   </profile>
+  <profile>
+    <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>
+          <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>performance</id>
     <modules>
-      <module>org.eclipse.linuxtools.lttng.alltests</module>
+      <module>org.eclipse.tracecompass.alltests</module>
     </modules>
   </profile>
   <profile>
@@ -99,6 +154,11 @@
 </profiles>
 
   <modules>
+    <module>doc</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>
@@ -109,75 +169,73 @@
     <module>org.eclipse.tracecompass.ctf.parser</module>
     <module>org.eclipse.tracecompass.ctf.parser.tests</module>
 
-    <module>org.eclipse.linuxtools.pcap.core</module>
-    <module>org.eclipse.linuxtools.pcap.core.tests</module>
+    <module>org.eclipse.tracecompass.pcap.core</module>
+    <module>org.eclipse.tracecompass.pcap.core.tests</module>
 
-    <module>org.eclipse.linuxtools.statesystem.core</module>
-    <module>org.eclipse.linuxtools.statesystem.core.tests</module>
+    <module>org.eclipse.tracecompass.statesystem.core</module>
+    <module>org.eclipse.tracecompass.statesystem.core.tests</module>
 
-    <module>org.eclipse.linuxtools.tmf</module>
-    <module>org.eclipse.linuxtools.tmf.core</module>
-    <module>org.eclipse.linuxtools.tmf.core.tests</module>
-    <module>org.eclipse.linuxtools.tmf.ui</module>
-    <module>org.eclipse.linuxtools.tmf.ui.tests</module>
-    <module>org.eclipse.linuxtools.tmf.ui.swtbot.tests</module>
-    <module>org.eclipse.linuxtools.tmf.help</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.linuxtools.tmf.ctf</module>
-    <module>org.eclipse.linuxtools.tmf.ctf.core</module>
-    <module>org.eclipse.linuxtools.tmf.ctf.core.tests</module>
-    <module>org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests</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.linuxtools.tmf.pcap</module>
-    <module>org.eclipse.linuxtools.tmf.pcap.core</module>
-    <module>org.eclipse.linuxtools.tmf.pcap.core.tests</module>
-    <module>org.eclipse.linuxtools.tmf.pcap.ui</module>
-    <module>org.eclipse.linuxtools.tmf.pcap.ui.swtbot.tests</module>
-    <module>org.eclipse.linuxtools.tmf.pcap.help</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.linuxtools.tmf.analysis.xml.core</module>
-    <module>org.eclipse.linuxtools.tmf.analysis.xml.core.tests</module>
-    <module>org.eclipse.linuxtools.tmf.analysis.xml.ui</module>
-    <module>org.eclipse.linuxtools.tmf.analysis.xml.ui.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.linuxtools.lttng.help</module>
     <module>org.eclipse.tracecompass.releng-site</module>
     <module>org.eclipse.tracecompass.target</module>
-    <module>org.eclipse.linuxtools.lttng.testing</module>
+    <module>org.eclipse.tracecompass.testing</module>
+
+    <module>org.eclipse.tracecompass.analysis.os.linux.core</module>
+    <module>org.eclipse.tracecompass.analysis.os.linux.core.tests</module>
+    <module>org.eclipse.tracecompass.analysis.os.linux.ui</module>
 
-    <module>org.eclipse.linuxtools.lttng2.control</module>
-    <module>org.eclipse.linuxtools.lttng2.control.core</module>
-    <module>org.eclipse.linuxtools.lttng2.control.core.tests</module>
-    <module>org.eclipse.linuxtools.lttng2.control.ui</module>
-    <module>org.eclipse.linuxtools.lttng2.control.ui.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.control.ui.tests</module>
 
-    <module>org.eclipse.linuxtools.lttng2.kernel</module>
-    <module>org.eclipse.linuxtools.lttng2.kernel.core</module>
-    <module>org.eclipse.linuxtools.lttng2.kernel.core.tests</module>
-    <module>org.eclipse.linuxtools.lttng2.kernel.ui</module>
-    <module>org.eclipse.linuxtools.lttng2.kernel.ui.tests</module>
-    <module>org.eclipse.linuxtools.lttng2.kernel.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.linuxtools.lttng2.ust</module>
-    <module>org.eclipse.linuxtools.lttng2.ust.core</module>
-    <module>org.eclipse.linuxtools.lttng2.ust.core.tests</module>
-    <module>org.eclipse.linuxtools.lttng2.ust.ui</module>
-    <module>org.eclipse.linuxtools.lttng2.ust.ui.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.linuxtools.tracing.rcp.branding</module>
-    <module>org.eclipse.linuxtools.tracing.rcp.branding.feature</module>
-    <module>org.eclipse.linuxtools.tracing.rcp</module>
-    <module>org.eclipse.linuxtools.tracing.rcp.help</module>
-    <module>org.eclipse.linuxtools.tracing.rcp.ui</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.ui</module>
 
-    <module>org.eclipse.linuxtools.tracing.examples</module>
+    <module>org.eclipse.tracecompass.examples</module>
   </modules>
 
     <build>
@@ -187,6 +245,7 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <version>${tycho-version}</version>
                 <configuration>
+                    <includePackedArtifacts>true</includePackedArtifacts>
                     <environments>
                         <environment>
                             <os>win32</os>
@@ -283,7 +342,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 +359,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,9 +399,7 @@
           <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>
@@ -337,6 +425,23 @@
           <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>
@@ -365,9 +470,14 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.9.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>
       </plugins>
     </pluginManagement>
   </build>