Make Maven build possible with the new repo

This required:
- Importing some settings from Linux Tools's top-level pom.xml
- Maven'ifying our target plugin, and adding some missing elements
  (Wikitext, Antlr sources)

Change-Id: Id3db846ad90f1e6cfec97fe3a5189d41ae9b1b27
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

diff --git a/org.eclipse.linuxtools.lttng.releng-site/pom.xml b/org.eclipse.linuxtools.lttng.releng-site/pom.xml
index 8d0fa30b457df952ff70055ee70ff61a291adb93..24f21ede464d9644b72bba742547f3135903f18a 100644 (file)
--- a/org.eclipse.linuxtools.lttng.releng-site/pom.xml
+++ b/org.eclipse.linuxtools.lttng.releng-site/pom.xml
@@ -27,37 +27,45 @@
   <name>Linux Tools LTTng Repository</name>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy</id>
-            <phase>install</phase>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <configuration>
-              <target>
-                <delete includeemptydirs="false">
-                  <fileset
-                    dir="${lttngPackageDestination}">
-                    <include name="**" />
-                  </fileset>
-                </delete>
-                <copy includeemptydirs="false"
-                  todir="${lttngPackageDestination}">
-                  <fileset dir="target/repository">
-                    <include name="**" />
-                  </fileset>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+<profiles>
+  <profile>
+    <id>buildUpdateSite</id>
+    <properties>
+      <siteDestination>/var/www/tools/tracecompass/nightly/</siteDestination>
+    </properties>
+    <build>
+      <plugins>
+        <plugin>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>deploy</id>
+              <phase>install</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                <target>
+                  <delete includeemptydirs="false">
+                    <fileset
+                      dir="${siteDestination}">
+                      <include name="**" />
+                    </fileset>
+                  </delete>
+                  <copy includeemptydirs="false"
+                    todir="${siteDestination}">
+                    <fileset dir="target/repository">
+                      <include name="**" />
+                    </fileset>
+                  </copy>
+                </target>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+  </profile>
+</profiles>
 
 </project>

diff --git a/org.eclipse.linuxtools.lttng.target/lttng-e4.4.target b/org.eclipse.linuxtools.lttng.target/lttng-e4.4.target
index 95d21e84bb659ba9d9f3252e79a8e2ad7a3db96e..b2b5d26d281c23269d632c64ed84e952468ade64 100644 (file)
--- a/org.eclipse.linuxtools.lttng.target/lttng-e4.4.target
+++ b/org.eclipse.linuxtools.lttng.target/lttng-e4.4.target
@@ -3,6 +3,7 @@
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+<unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
 <unit id="org.swtchart" version="0.0.0"/>
 <unit id="com.google.guava" version="15.0.0.v201403281430"/>
 <unit id="org.apache.derby" version="0.0.0"/>
@@ -11,7 +12,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/8.4"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/8.5"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rse.sdk.feature.group" version="0.0.0"/>
@@ -20,6 +21,7 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.jdt.annotation" version="1.1.0.v20140129-1625"/>
 <unit id="org.eclipse.pde.runtime" version="0.0.0"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.4/"/>
@@ -33,6 +35,10 @@
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/releases/3.12/"/>
+</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <launcherArgs>

diff --git a/org.eclipse.linuxtools.lttng.target/lttng-eStaging.target b/org.eclipse.linuxtools.lttng.target/lttng-eStaging.target
index a50dd1941e6ff2c5f1cb8cc831b5cbfe012fcd0a..ba029224e7347830054f0dc2d38d06fe98c83c8b 100644 (file)
--- a/org.eclipse.linuxtools.lttng.target/lttng-eStaging.target
+++ b/org.eclipse.linuxtools.lttng.target/lttng-eStaging.target
@@ -3,6 +3,7 @@
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+<unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
 <unit id="org.swtchart" version="0.0.0"/>
 <unit id="com.google.guava" version="15.0.0.v201403281430"/>
 <unit id="org.apache.derby" version="0.0.0"/>
@@ -12,6 +13,7 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.pde.runtime" version="0.0.0"/>
 <repository location="http://download.eclipse.org/releases/staging"/>
 </location>
@@ -33,6 +35,10 @@
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/mylyn/releases/3.12/"/>
+</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <launcherArgs>

diff --git a/org.eclipse.linuxtools.lttng.target/pom.xml b/org.eclipse.linuxtools.lttng.target/pom.xml
new file mode 100644 (file)
index 0000000..7b180b2
--- /dev/null
+++ b/org.eclipse.linuxtools.lttng.target/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+      <groupId>org.eclipse.linuxtools.lttng</groupId>
+      <artifactId>linuxtools-lttng-parent</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.eclipse.linuxtools.lttng</groupId>
+    <artifactId>org.eclipse.linuxtools.lttng.target</artifactId>
+    <name>Linux Tools LTTng Target Platform</name>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.9</version>
+          <executions>
+            <execution>
+              <id>attach-artifacts</id>
+              <phase>package</phase>
+              <goals>
+                <goal>attach-artifact</goal>
+              </goals>
+              <configuration>
+                <artifacts>
+                  <artifact>
+                    <file>lttng-eStaging.target</file>
+                    <type>target</type>
+                    <classifier>lttng-eStaging</classifier>
+                  </artifact>
+                  <artifact>
+                    <file>lttng-e4.4.target</file>
+                    <type>target</type>
+                    <classifier>lttng-e4.4</classifier>
+                  </artifact>
+                  <!-- More targets could be added here -->
+                </artifacts>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>

diff --git a/pom.xml b/pom.xml
index 15c21dcf342b28d4d568c45415bfe31c8e1c33f7..d9a490e29afe4c758d31a1dab5b04d9165eae391 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,6 @@
     <maven>3.0</maven>
   </prerequisites>
 
-  <parent>
-    <groupId>org.eclipse.linuxtools</groupId>
-    <artifactId>linuxtools-parent</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
-  </parent>
-
   <groupId>org.eclipse.linuxtools.lttng</groupId>
   <artifactId>linuxtools-lttng-parent</artifactId>
   <version>3.2.0-SNAPSHOT</version>
@@ -46,8 +40,26 @@
 
 <properties>
   <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
+  <tycho-version>0.21.0</tycho-version>
+  <target-platform>lttng-e4.4</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>
+  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 </properties>
 
+<pluginRepositories>
+  <pluginRepository>
+    <id>repo.eclipse.org</id>
+    <url>https://repo.eclipse.org/content/groups/releases/</url>
+  </pluginRepository>
+  <pluginRepository>
+    <id>tycho-snapshots</id>
+    <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+  </pluginRepository>
+</pluginRepositories>
+
 <profiles>
   <profile>
     <id>tracingRcp</id>
@@ -55,15 +67,6 @@
         <module>org.eclipse.linuxtools.tracing.rcp.product</module>
       </modules>
   </profile>
-  <profile>
-    <id>lttngPackage</id>
-      <properties>
-          <lttngPackageDestination>/var/www/tools/linuxtools/lttng/update-nightly/</lttngPackageDestination>
-      </properties>
-      <modules>
-        <module>org.eclipse.linuxtools.lttng.releng-site</module>
-      </modules>
-  </profile>
   <profile>
     <id>performance</id>
     <modules>
@@ -138,6 +141,8 @@
     <module>org.eclipse.linuxtools.tmf.analysis.xml.ui.tests</module>
 
     <module>org.eclipse.linuxtools.lttng.help</module>
+    <module>org.eclipse.linuxtools.lttng.releng-site</module>
+    <module>org.eclipse.linuxtools.lttng.target</module>
     <module>org.eclipse.linuxtools.lttng.testing</module>
 
     <module>org.eclipse.linuxtools.lttng2.control</module>
@@ -209,6 +214,14 @@
                             <arch>x86_64</arch>
                         </environment>
                     </environments>
+                    <target>
+                      <artifact>
+                        <groupId>org.eclipse.linuxtools.lttng</groupId>
+                        <artifactId>org.eclipse.linuxtools.lttng.target</artifactId>
+                        <classifier>${target-platform}</classifier>
+                        <version>1.0.0</version>
+                      </artifact>
+                    </target>
                     <filters>
                       <filter>
                         <type>eclipse-plugin</type>
@@ -226,7 +239,137 @@
                 <version>${tycho-version}</version>
                 <extensions>true</extensions>
             </plugin>
-        </plugins>
-    </build>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-source-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <executions>
+            <execution>
+              <id>plugin-source</id>
+              <goals>
+                <goal>plugin-source</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-source-feature-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <includeBinaryFeature>false</includeBinaryFeature>
+          </configuration>
+          <executions>
+            <execution>
+              <id>source-feature</id>
+              <phase>package</phase>
+              <goals>
+                <goal>source-feature</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.7.2.201409121644</version>
+          <executions>
+            <execution>
+             <id>pre-test</id>
+             <goals>
+               <goal>prepare-agent</goal>
+             </goals>
+             <configuration>
+                <!-- Where to put jacoco coverage report -->
+                <destFile>${sonar.jacoco.reportPath}</destFile>
+                <includes>
+                  <include>org.eclipse.linuxtools.*</include>
+                </includes>
+                <append>true</append>
+              </configuration>
+            </execution>
+            <execution>
+              <id>post-test</id>
+              <phase>post-integration-test</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+              <configuration>
+                <dataFile>${sonar.jacoco.reportPath}</dataFile>
+              </configuration>
+            </execution>
+          </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-compiler-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <encoding>UTF-8</encoding>
+            <compilerArguments>
+              <properties>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</properties>
+            </compilerArguments>
+          </configuration>
+        </plugin>
+       <plugin>
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>tycho-surefire-plugin</artifactId>
+         <version>${tycho-version}</version>
+         <configuration>
+           <useUIHarness>true</useUIHarness>
+           <useUIThread>true</useUIThread>
+            <dependencies>
+               <dependency>
+                 <type>p2-installable-unit</type>
+                 <artifactId>org.eclipse.platform.feature.group</artifactId>
+                 <version>${sdk-version}</version>
+               </dependency>
+            </dependencies>
+            <product>org.eclipse.platform.ide</product>
+           <argLine>${tycho.testArgLine} -Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m</argLine>
+         </configuration>
+       </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-versions-plugin</artifactId>
+          <version>${tycho-version}</version>
+        </plugin>
+       <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+          <configuration>
+            <encoding>UTF-8</encoding>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9.1</version>
+          <configuration>
+            <excludePackageNames>org.eclipse.linuxtools.internal.*:*.test*</excludePackageNames>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
 </project>