Merge branch 'master' into lttng-luna

[deliverable/tracecompass.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 40080154dcd05898a76ddab045b6958d7df5aa36..956158924d3ec7564d4e7ea0ddb7eeab3a43ab71 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.lttng</groupId>
@@ -48,6 +48,8 @@
   <profile>
     <id>tracingRcp</id>
       <modules>
+        <module>org.eclipse.linuxtools.tracing.rcp.branding</module>
+        <module>org.eclipse.linuxtools.tracing.rcp.branding.feature</module>
         <module>org.eclipse.linuxtools.tracing.rcp</module>
         <module>org.eclipse.linuxtools.tracing.rcp.help</module>
         <module>org.eclipse.linuxtools.tracing.rcp.ui</module>
@@ -129,16 +131,6 @@
                             <ws>cocoa</ws>
                             <arch>x86_64</arch>
                         </environment>
-                        <environment>
-                            <os>solaris</os>
-                            <ws>gtk</ws>
-                            <arch>x86</arch>
-                        </environment>
-                        <environment>
-                            <os>solaris</os>
-                            <ws>gtk</ws>
-                            <arch>sparc</arch>
-                        </environment>
                         <environment>
                             <os>linux</os>
                             <ws>gtk</ws>
@@ -149,16 +141,6 @@
                             <ws>gtk</ws>
                             <arch>x86_64</arch>
                         </environment>
-                        <environment>
-                            <os>linux</os>
-                            <ws>gtk</ws>
-                            <arch>ppc</arch>
-                        </environment>
-                        <environment>
-                            <os>linux</os>
-                            <ws>gtk</ws>
-                            <arch>ppc64</arch>
-                        </environment>
                     </environments>
                 </configuration>
             </plugin>
@@ -171,5 +153,4 @@
         </plugins>
     </build>
 
-
 </project>