X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=pom.xml;h=7c3f4343c09274715b910c777ebe06b7a3d758b9;hb=976af99f412987fd0bf96dc36644ed2dadef9bdf;hp=693bcb8dc90da771fba3a6eaa0f2127a49b27635;hpb=b68eec3c17defb940f0618490d9aa0c865935c7a;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index 693bcb8dc9..7c3f4343c0 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>2.1.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>0.26.0</tycho-version>
+    <tycho-extras-version>0.26.0</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>
+    <cbi-plugins.version>1.1.3</cbi-plugins.version>
+    <target-platform>tracecompass-e4.6</target-platform>
     <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5</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.7.201606060606</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>2.1.0-SNAPSHOT</version>
             </artifact>
           </target>
         </configuration>
@@ -479,6 +493,9 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-p2-repository-plugin</artifactId>
           <version>${tycho-version}</version>
+          <configuration>
+            <skipArchive>true</skipArchive>
+          </configuration>
         </plugin>
 
         <plugin>
@@ -528,7 +545,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.0.1</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -555,7 +572,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.5</version>
+          <version>3.5.1</version>
         </plugin>
 
         <plugin>
@@ -585,7 +602,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 +611,13 @@
         <plugin>
           <groupId>org.jboss.tools.tycho-plugins</groupId>
           <artifactId>repository-utils</artifactId>
-          <version>0.23.2</version>
+          <version>0.23.3</version>
         </plugin>
 
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.2</version>
         </plugin>
 
         <plugin>