X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=pom.xml;h=af01e48ac488c4a04955edb2ae84a48c8b201ddb;hb=6b8f960db5d8f31b6aa646610cbf8ac42db0db08;hp=84d0ea0080ff01b306386b4789c67691c3ed8d4d;hpb=6614e1962e8b007a8a1da9424f3f97b3dd216ba5;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index 84d0ea0080..af01e48ac4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>org.eclipse.tracecompass</groupId>
   <artifactId>org.eclipse.tracecompass</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Trace Compass Parent</name>
 
@@ -39,16 +39,35 @@
 
 <properties>
   <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
-  <tycho-version>0.22.0</tycho-version>
-  <tycho-extras-version>0.22.0</tycho-extras-version>
+  <tycho-version>0.24.0</tycho-version>
+  <tycho-extras-version>0.24.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>
+  <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.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
+  <sonar.java.source>1.8</sonar.java.source>
+  <sonar.exclusions>**/tests/**,**/test/**,**/stubs/**,**/Messages*,**/alltests/**</sonar.exclusions>
+  <sonar.skippedModules>org.eclipse.tracecompass.ctf.parser,org.eclipse.tracecompass.examples</sonar.skippedModules>
+  <!-- Sonar rule exclusions -->
+  <sonar.issue.ignore.multicriteria>e1,e2,e3,e4,e5,e6</sonar.issue.ignore.multicriteria>
+  <sonar.issue.ignore.multicriteria.e1.ruleKey>findbugs:NP_STORE_INTO_NONNULL_FIELD</sonar.issue.ignore.multicriteria.e1.ruleKey>
+  <sonar.issue.ignore.multicriteria.e1.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e1.resourceKey>
+  <sonar.issue.ignore.multicriteria.e2.ruleKey>findbugs:RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE</sonar.issue.ignore.multicriteria.e2.ruleKey>
+  <sonar.issue.ignore.multicriteria.e2.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e2.resourceKey>
+  <sonar.issue.ignore.multicriteria.e3.ruleKey>findbugs:NP_NONNULL_PARAM_VIOLATION</sonar.issue.ignore.multicriteria.e3.ruleKey>
+  <sonar.issue.ignore.multicriteria.e3.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e3.resourceKey>
+  <sonar.issue.ignore.multicriteria.e4.ruleKey>findbugs:NP_NULL_PARAM_DEREF_NONVIRTUAL</sonar.issue.ignore.multicriteria.e4.ruleKey>
+  <sonar.issue.ignore.multicriteria.e4.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e4.resourceKey>
+  <sonar.issue.ignore.multicriteria.e5.ruleKey>findbugs:NP_NONNULL_RETURN_VIOLATION</sonar.issue.ignore.multicriteria.e5.ruleKey>
+  <sonar.issue.ignore.multicriteria.e5.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e5.resourceKey>
+  <sonar.issue.ignore.multicriteria.e6.ruleKey>findbugs:NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR</sonar.issue.ignore.multicriteria.e6.ruleKey>
+  <sonar.issue.ignore.multicriteria.e6.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e6.resourceKey>
+
   <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4</help-docs-eclipserun-repo>
+  <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) -->
+  <SWT_GTK3>0</SWT_GTK3>
 </properties>
 
 <pluginRepositories>
@@ -68,12 +87,6 @@
 </pluginRepositories>
 
 <profiles>
-  <profile>
-    <id>build-rcp</id>
-      <modules>
-        <module>org.eclipse.tracecompass.rcp.product</module>
-      </modules>
-  </profile>
   <profile>
     <id>sign-update-site</id>
     <build>
@@ -95,7 +108,7 @@
         <plugin>
           <groupId>org.eclipse.cbi.maven.plugins</groupId>
           <artifactId>eclipse-jarsigner-plugin</artifactId>
-          <version>1.1.1</version>
+          <version>1.1.2</version>
           <executions>
             <execution>
               <id>sign</id>
@@ -123,12 +136,6 @@
       </plugins>
     </build>
   </profile>
-  <profile>
-    <id>performance</id>
-    <modules>
-      <module>org.eclipse.tracecompass.alltests</module>
-    </modules>
-  </profile>
   <profile>
     <id>macosx</id>
     <activation>
@@ -137,7 +144,7 @@
       </os>
     </activation>
     <properties>
-      <base.ui.test.vmargs>${base.test.vmargs} -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</base.ui.test.vmargs>
+      <base.ui.test.vmargs>${base.test.vmargs} -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Djava.awt.headless=false</base.ui.test.vmargs>
     </properties>
   </profile>
   <profile>
@@ -155,103 +162,50 @@
 </profiles>
 
   <modules>
+    <module>analysis</module>
+    <module>btf</module>
+    <module>common</module>
+    <module>ctf</module>
     <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>
-
-    <module>org.eclipse.tracecompass.ctf</module>
-    <module>org.eclipse.tracecompass.ctf.core</module>
-    <module>org.eclipse.tracecompass.ctf.core.tests</module>
-    <module>org.eclipse.tracecompass.ctf.parser</module>
-    <module>org.eclipse.tracecompass.ctf.parser.tests</module>
-
-    <module>org.eclipse.tracecompass.pcap.core</module>
-    <module>org.eclipse.tracecompass.pcap.core.tests</module>
-
-    <module>org.eclipse.tracecompass.statesystem.core</module>
-    <module>org.eclipse.tracecompass.statesystem.core.tests</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.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.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.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.tracecompass.tmf.remote</module>
-    <module>org.eclipse.tracecompass.tmf.remote.core</module>
-    <module>org.eclipse.tracecompass.tmf.remote.core.tests</module>
-    <module>org.eclipse.tracecompass.tmf.remote.ui</module>
-    <module>org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests</module>
-
-    <module>org.eclipse.tracecompass.tmf.remote.ui.tests</module>
-
-    <module>org.eclipse.tracecompass.releng-site</module>
-    <module>org.eclipse.tracecompass.target</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.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.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.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.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.tracecompass.examples</module>
+    <module>gdbtrace</module>
+    <module>lttng</module>
+    <module>pcap</module>
+    <module>rcp</module>
+    <module>releng</module>
+    <module>statesystem</module>
+    <module>tmf</module>
   </modules>
 
-    <build>
-        <plugins>
+  <build>
+    <plugins>
+      <plugin>
+        <inherited>true</inherited>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.4.1</version>
+        <executions>
+          <execution>
+            <id>enforce-maven-version</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.0</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>1.8</version>
+                </requireJavaVersion>
+              </rules>
+              <fail>true</fail>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>target-platform-configuration</artifactId>
-                <version>${tycho-version}</version>
                 <configuration>
                     <includePackedArtifacts>true</includePackedArtifacts>
                     <environments>
@@ -286,18 +240,9 @@
                         <groupId>org.eclipse.tracecompass</groupId>
                         <artifactId>org.eclipse.tracecompass.target</artifactId>
                         <classifier>${target-platform}</classifier>
-                        <version>1.0.0</version>
+                        <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>
@@ -384,7 +329,6 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho-version}</version>
         <executions>
           <execution>
             <id>p2-metadata</id>
@@ -406,8 +350,13 @@
           <artifactId>tycho-compiler-plugin</artifactId>
           <version>${tycho-version}</version>
           <configuration>
+            <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>
           </configuration>
         </plugin>
         <plugin>
@@ -519,7 +468,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>