X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=pom.xml;h=d2801f41cf2a78887d98b1328144fdebf4b21ad3;hb=refs%2Fheads%2Ftime-graph-model-3;hp=dff1400db49934f96d09085c4d813020f4c9bf63;hpb=e27e0642a00a8aea214f0f1ad707d0c0171968eb;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index dff1400db4..d2801f41cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>org.eclipse.tracecompass</groupId>
   <artifactId>org.eclipse.tracecompass</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Trace Compass Parent</name>
 
@@ -43,13 +43,14 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <testArgLine></testArgLine>
 
-    <tycho-version>0.24.0</tycho-version>
-    <tycho-extras-version>0.24.0</tycho-extras-version>
+    <tycho-version>1.0.0</tycho-version>
+    <tycho-extras-version>1.0.0</tycho-extras-version>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass/org.eclipse.tracecompass.git</tycho.scmUrl>
-    <target-platform>tracecompass-e4.6</target-platform>
-    <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5</help-docs-eclipserun-repo>
+    <cbi-plugins.version>1.1.3</cbi-plugins.version>
+    <target-platform>tracecompass-e4.7</target-platform>
+    <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6</help-docs-eclipserun-repo>
 
-    <rcptt-version>2.1.0-SNAPSHOT</rcptt-version>
+    <rcptt-version>2.2.0-SNAPSHOT</rcptt-version>
     <!-- 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>
 
@@ -129,7 +130,7 @@
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-jarsigner-plugin</artifactId>
-            <version>1.1.3</version>
+            <version>${cbi-plugins.version}</version>
             <executions>
               <execution>
                 <id>sign</id>
@@ -174,7 +175,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.7.6.201602180812</version>
+            <version>0.7.9</version>
             <executions>
               <execution>
                 <id>pre-test</id>
@@ -280,6 +281,19 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- Automatic profile to skip sonar -->
+    <profile>
+      <id>skip-sonar</id>
+      <activation>
+        <file>
+          <exists>sonar.skip.properties</exists>
+        </file>
+      </activation>
+      <properties>
+        <sonar.skip>true</sonar.skip>
+      </properties>
+    </profile>
   </profiles>
 
   <modules>
@@ -362,7 +376,7 @@
               <groupId>org.eclipse.tracecompass</groupId>
               <artifactId>org.eclipse.tracecompass.target</artifactId>
               <classifier>${target-platform}</classifier>
-              <version>2.0.0</version>
+              <version>3.0.0-SNAPSHOT</version>
             </artifact>
           </target>
         </configuration>
@@ -450,10 +464,19 @@
             <source>1.8</source>
             <target>1.8</target>
             <encoding>UTF-8</encoding>
-            <useProjectSettings>true</useProjectSettings>
             <compilerArguments>
               <annotationpath>common/org.eclipse.tracecompass.common.core/annotations</annotationpath>
             </compilerArguments>
+            <extraClasspathElements>
+              <!-- Include the jfxswt.jar, which contains the JavaFX embedding functionality -->
+              <extraClasspathElement>
+                <groupId>com.oracle</groupId>
+                <artifactId>javafx</artifactId>
+                <version>8.0.0-SNAPSHOT</version>
+                <systemPath>${java.home}/lib/jfxswt.jar</systemPath>
+                <scope>system</scope>
+              </extraClasspathElement>
+            </extraClasspathElements>
           </configuration>
         </plugin>
 
@@ -479,6 +502,9 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-p2-repository-plugin</artifactId>
           <version>${tycho-version}</version>
+          <configuration>
+            <skipArchive>true</skipArchive>
+          </configuration>
         </plugin>
 
         <plugin>
@@ -498,6 +524,7 @@
             </dependencies>
             <product>org.eclipse.platform.ide</product>
             <argLine>${testArgLine} ${base.ui.test.vmargs} -Xms512m -Xmx1024m</argLine>
+            <appArgLine>-consoleLog</appArgLine>
           </configuration>
         </plugin>
 
@@ -528,7 +555,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.0.2</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -543,7 +570,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
+          <version>3.0.0</version>
         </plugin>
 
         <plugin>
@@ -555,7 +582,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.5</version>
+          <version>3.6</version>
         </plugin>
 
         <plugin>
@@ -585,7 +612,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>2.10.4</version>
           <configuration>
             <excludePackageNames>org.eclipse.tracecompass.internal.*:*.test*</excludePackageNames>
           </configuration>
@@ -594,13 +621,13 @@
         <plugin>
           <groupId>org.jboss.tools.tycho-plugins</groupId>
           <artifactId>repository-utils</artifactId>
-          <version>0.23.2</version>
+          <version>1.0.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.3.0.603</version>
         </plugin>
 
         <plugin>
@@ -630,6 +657,7 @@
                 <url>${help-docs-eclipserun-repo}</url>
               </repository>
             </repositories>
+            <executionEnvironment>JavaSE-1.8</executionEnvironment>
           </configuration>
           <executions>
             <execution>