X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=pom.xml;h=af0389e65fcadb63d687f3268a1a01961098d325;hb=664a3a815e6d8a698a5d78b63f8535771eabe8d0;hp=02eae8b1ed040fd343686bc2ba046b02696a2e67;hpb=617a130cbc51aa8bd3c8615a2e9c1de4c03aa73d;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index 02eae8b1ed..af0389e65f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <prerequisites>
-    <maven>3.3</maven>
+    <maven>${required-maven-version}</maven>
   </prerequisites>
 
   <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>
 
@@ -38,16 +38,19 @@
   </licenses>
 
   <properties>
+    <required-maven-version>3.3</required-maven-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <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</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>
 
@@ -91,6 +94,16 @@
       <name>JBoss Public Repository Group</name>
       <url>http://repository.jboss.org/nexus/content/groups/public/</url>
     </pluginRepository>
+    <pluginRepository>
+      <id>rcptt-snapshots</id>
+      <name>RCPTT Maven Snapshots repository</name>
+      <url>https://repo.eclipse.org/content/repositories/rcptt-snapshots/</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>rcptt-releases</id>
+      <name>RCPTT Maven repository</name>
+      <url>https://repo.eclipse.org/content/repositories/rcptt-releases/</url>
+    </pluginRepository>
   </pluginRepositories>
 
   <profiles>
@@ -117,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>
@@ -162,7 +175,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.7.4.201502262128</version>
+            <version>0.7.7.201606060606</version>
             <executions>
               <execution>
                 <id>pre-test</id>
@@ -268,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>
@@ -301,7 +327,7 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>3.3</version>
+                  <version>${required-maven-version}</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
                   <version>1.8</version>
@@ -350,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>
@@ -467,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>
@@ -516,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>
@@ -528,16 +557,28 @@
           <version>1.8</version>
         </plugin>
 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.10</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.eclipse.rcptt</groupId>
+          <artifactId>rcptt-maven-plugin</artifactId>
+          <version>${rcptt-version}</version>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.4</version>
+          <version>3.5.1</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.6.1</version>
+          <version>3.0.0</version>
         </plugin>
 
         <plugin>
@@ -555,13 +596,13 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.9</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.1</version>
+          <version>2.10.4</version>
           <configuration>
             <excludePackageNames>org.eclipse.tracecompass.internal.*:*.test*</excludePackageNames>
           </configuration>
@@ -570,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>2.7.1</version>
+          <version>3.2</version>
         </plugin>
 
         <plugin>