releng: Transition to jdt.annotation 2.0

[deliverable/tracecompass.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 0d2ab16bb04bf51c19e67a4c5d07d9acac8a161b..1674eb44a741b71624e52073121d634141cc5aa4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,14 +39,14 @@
 
 <properties>
   <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
-  <tycho-version>0.23.0</tycho-version>
-  <tycho-extras-version>0.23.0</tycho-extras-version>
+  <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.java.source>1.7</sonar.java.source>
+  <sonar.java.source>1.8</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) -->
@@ -164,7 +164,6 @@
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>target-platform-configuration</artifactId>
-                <version>${tycho-version}</version>
                 <configuration>
                     <includePackedArtifacts>true</includePackedArtifacts>
                     <environments>
@@ -202,15 +201,6 @@
                         <version>2.0.0</version>
                       </artifact>
                     </target>
-                    <filters>
-                      <filter>
-                        <type>eclipse-plugin</type>
-                        <id>org.eclipse.jdt.annotation</id>
-                        <restrictTo>
-                          <versionRange>[1.0,2.0)</versionRange>
-                        </restrictTo>
-                      </filter>
-                    </filters>
                 </configuration>
             </plugin>
             <plugin>
@@ -297,7 +287,6 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho-version}</version>
         <executions>
           <execution>
             <id>p2-metadata</id>
@@ -321,6 +310,9 @@
           <configuration>
             <encoding>UTF-8</encoding>
             <useProjectSettings>true</useProjectSettings>
+            <compilerArguments>
+              <annotationpath>common/org.eclipse.tracecompass.common.core/annotations</annotationpath>
+            </compilerArguments>
           </configuration>
         </plugin>
         <plugin>
@@ -432,7 +424,12 @@
         <plugin>
           <groupId>org.jboss.tools.tycho-plugins</groupId>
           <artifactId>repository-utils</artifactId>
-          <version>0.22.0</version>
+          <version>0.23.2</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>