Author: nickboldt Date: 2010-05-20 15:12:52 -0400 (Thu, 20 May 2010) New Revision: 22220 Modified: trunk/parent-pom.xml Log: add profile to add Hudson BUILD_NUMBER into plugin ID; also add M1 suffix for first milestone Modified: trunk/parent-pom.xml =================================================================== --- trunk/parent-pom.xml 2010-05-20 18:06:30 UTC (rev 22219) +++ trunk/parent-pom.xml 2010-05-20 19:12:52 UTC (rev 22220) @@ -11,6 +11,7 @@ <tychoVersion>0.9.0-SNAPSHOT</tychoVersion> <!-- <tychoVersion>0.8.0</tychoVersion> --> <scmBranch>trunk</scmBranch> + <BUILD_ALIAS>M1</BUILD_ALIAS> </properties> <build> @@ -20,7 +21,7 @@ <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> @@ -100,6 +101,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> @@ -156,7 +168,30 @@ </issueManagement> <profiles> + <!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER is + set (by a Hudson job) --> <profile> + <id>hudson</id> + <activation> + <property> + <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>helios</id> <activation> <property>