[savara-commits] savara SVN: r330 - trunk/tools.

Author: objectiser Date: 2010-07-13 14:45:23 -0400 (Tue, 13 Jul 2010) New Revision: 330 Modified: trunk/tools/parent-pom.xml Log: Update parent-pom inline with pi4soa version. Modified: trunk/tools/parent-pom.xml =================================================================== --- trunk/tools/parent-pom.xml 2010-07-13 18:29:14 UTC (rev 329) +++ trunk/tools/parent-pom.xml 2010-07-13 18:45:23 UTC (rev 330) @@ -8,19 +8,29 @@ <packaging>pom</packaging> <properties> - <tychoVersion>0.9.0-SNAPSHOT</tychoVersion> - <!-- <tychoVersion>0.8.0</tychoVersion> --> - <scmBranch>branches/modular_build</scmBranch> + <!-- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> --> + <tychoVersion>0.9.0</tychoVersion> + <scmBranch>trunk</scmBranch> + <BUILD_ALIAS>SNAPSHOT</BUILD_ALIAS> + <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> + <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2> + <systemProperties></systemProperties> + <target.platform>e36-wtp32</target.platform> </properties> <build> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.4</version> + </plugin> + + <plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-packaging-plugin</artifactId> <version>${tychoVersion}</version> <configuration> - <format>'v'yyyyMMdd-HHmm</format> + <format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format> <archiveSite>true</archiveSite> </configuration> </plugin> @@ -38,18 +48,16 @@ <version>${tychoVersion}</version> <configuration> <resolver>p2</resolver> + <ignoreTychoRepositories>true</ignoreTychoRepositories> <environments> <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> </environment> + <!-- <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> + </environment> --> <environment> - <os>macosx</os> - <ws>carbon</ws> - <arch>x86</arch> - </environment> - <environment> <os>win32</os> <ws>win32</ws> <arch>x86</arch> @@ -76,8 +84,13 @@ <artifactId>maven-osgi-test-plugin</artifactId> <version>${tychoVersion}</version> <configuration> + <!-- timeout in seconds --> + <surefire.timeout>1200</surefire.timeout> + <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> + <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} + </argLine> <!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho --> <!-- set useUIThread=true for regular ui tests --> <!-- set useUIThread=false for swtbot tests (?) --> @@ -89,6 +102,17 @@ <artifactId>org.eclipse.sdk.ide</artifactId> <version>0.0.0</version> </dependency> + <!-- http://www.jmock.org/maven.html --> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-legacy</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <version>2.5.1</version> + </dependency> </dependencies> <includes> <include>**/AllTests.class</include> @@ -102,19 +126,59 @@ </plugins> </build> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/savara/${scmBranch} + </connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/savara/${scmBr... + </developerConnection> + <url>http://anonsvn.jboss.org/repos/savara/${scmBranch} + </url> + </scm> + <issueManagement> <system>jira</system> <url>https://jira.jboss.org/jira/secure/</url> </issueManagement> - <profiles> <profile> <id>helios</id> <activation> - <property> - <name>helios</name> - </property> + <activeByDefault>false</activeByDefault> </activation> + <properties> + <target.platform>e36-wtp32</target.platform> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <target> + <artifact> + <groupId>org.jboss.tools</groupId> + <artifactId>target-platform</artifactId> + <version>0.0.1-SNAPSHOT</version> + <classifier>${target.platform}</classifier> + </artifact> + </target> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Time saver: to build everything from scratch (without target platform); + To enable it use -P helios-no-target in command line. + Do not remove repos that contains the same artefacts, it is done for purpose + to make build more stable in case one of the repos is offline. + --> + <profile> + <id>helios-no-target</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <repositories> <repository> <id>helios</id> @@ -128,8 +192,20 @@ </releases> </repository> <repository> + <id>webtools32</id> + <url>http://download.eclipse.org/webtools/repository/helios</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> <id>eclipse36</id> - <url>http://download.eclipse.org/eclipse/updates/3.6/</url> + <url>http://download.eclipse.org/eclipse/updates/3.6/ + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -140,7 +216,8 @@ </repository> <repository> <id>birt26</id> - <url>http://download.eclipse.org/birt/update-site/2.6/</url> + <url>http://download.eclipse.org/birt/update-site/2.6/ + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -151,7 +228,7 @@ </repository> <repository> <id>swtbot-helios</id> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... </url> <layout>p2</layout> <snapshots> @@ -161,15 +238,66 @@ <enabled>true</enabled> </releases> </repository> + <repository> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> </repositories> </profile> <profile> - <id>svn-repos</id> + <id>hudson</id> <activation> <property> - <name>svn</name> + <name>BUILD_NUMBER</name> </property> </activation> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-packaging-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}' + </format> + <archiveSite>true</archiveSite> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>svn-repos</id> <repositories> <repository> <id>svnkit13</id> @@ -217,112 +345,284 @@ <enabled>true</enabled> </releases> </repository> - </repositories> </profile> - </profiles> - - <repositories> - <!-- TODO: add JBT nightly update site so we can build against binaries --> - <repository> + <profile> <id>galileo</id> - <url>http://download.eclipse.org/releases/galileo/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>eclipse35</id> - <url>http://download.eclipse.org/eclipse/updates/3.5/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>birt25r</id> - <url>http://download.eclipse.org/birt/update-site/2.5</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>swtbot-galileo</id> - <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/up... - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> + <repositories> + <repository> + <id>galileo</id> + <url>http://download.eclipse.org/releases/galileo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse35</id> + <url>http://download.eclipse.org/eclipse/updates/3.5/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>birt25r</id> + <url>http://download.eclipse.org/birt/update-site/2.5</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>swtbot-galileo</id> + <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/up... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>webtools</id> + <url>http://download.eclipse.org/webtools/updates/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... + </url> + <layout>p2</layout> + <releases> + <enabled>true</enabled> + </releases> + </repository> - <repository> - <id>webtools</id> - <url>http://download.eclipse.org/webtools/updates/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>m2eclipse</id> - <url>http://m2eclipse.sonatype.org/sites/m2e/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>m2eclipse-extras</id> - <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> + <repository> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </profile> + <profile> + <id>coverage</id> + <activation> + <property> + <name>coverage</name> + </property> + </activation> + <properties> + <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file> + <emma.filter /> + <emma.instrument.bundles /> + </properties> + <build> + <plugins> + <!-- plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${emma.session.out.file}</file> + <type>es</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <file></file> + <groupId></groupId> + <artifactId></artifactId> + <version></version> + <packaging></packaging> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <systemProperties combine.children="append"> + <emma.session.out.file>${emma.session.out.file}</emma.session.out.file> + <emma.filter>${emma.filter}</emma.filter> + <eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles> + </systemProperties> + <frameworkExtensions> + <frameworkExtension> + <groupId>org.eclemma.runtime.equinox</groupId> + <artifactId>org.eclemma.runtime.equinox</artifactId> + <version>1.1.0.200908261008</version> + </frameworkExtension> + </frameworkExtensions> + <application>org.eclipse.ui.ide.workbench</application> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.sdk.ide</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <dependencies> + <dependency> + <groupId>emma</groupId> + <artifactId>emma_ant</artifactId> + <version>2.0.5312</version> + </dependency> + <dependency> + <groupId>emma</groupId> + <artifactId>emma</artifactId> + <version>2.0.5312</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>emma-report</id> + <phase>post-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <taskdef resource="emma_ant.properties" /> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> + <if> + <available file="${project.build.directory}/emma" type="dir" /> + <then> + <echo>Process emma report...</echo> + <!-- emma enabled="true"> + <instr metadatafile="${project.build.directory}/coverage.em" mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes" /> + </emma--> + <emma enabled="true"> + <report> + <infileset dir="${project.build.directory}/emma" includes="*.es,*.em" /> + <txt outfile="${project.build.directory}/emma/coverage.txt" /> + <xml outfile="${project.build.directory}/emma/coverage.xml" /> + </report> + </emma> + <loadfile property="emma.txt" + srcFile="${project.build.directory}/emma/coverage.txt" + failonerror="false" /> + <echo>${emma.txt}</echo> + </then> + </if> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>requirements</id> + <activation> + <file> + <exists>${basedir}/requirements.properties</exists> + </file> + </activation> + <properties> + <requirements.root>${basedir}/../../../requirements</requirements.root> + <requirement.build.root>${requirements.root}/target</requirement.build.root> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>download-plugin-requirements</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property file="requirements.properties" /> + <echo>Requirements build</echo> + <ant dir="${basedir}/../../../requirements" inheritAll="true" > + <property name="requirements" value="${requirements}" /> + <property name="settings.offline" value="${settings.offline}" /> + <property name="skipDownload" value="${skipDownload}" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <pluginRepositories> <pluginRepository> - <id>maven-central</id> - <url>http://repo1.maven.org/maven2/ - </url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - <pluginRepository> <id>sonatype-maven-central</id> <url>http://repository.sonatype.org/content/repositories/central/ </url> <snapshots> - <enabled>true</enabled> + <enabled>false</enabled> </snapshots> <releases> <enabled>true</enabled> @@ -336,7 +636,7 @@ <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> </pluginRepository> <pluginRepository> @@ -347,7 +647,7 @@ <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> </pluginRepository> <pluginRepository> @@ -357,10 +657,9 @@ <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> </pluginRepository> </pluginRepositories> </project> -