Author: nickboldt Date: 2010-06-02 13:33:05 -0400 (Wed, 02 Jun 2010) New Revision: 22485 Modified: branches/3.2.helios/parent-pom.xml Log: set helios deps as defaults (no profile needed) Modified: branches/3.2.helios/parent-pom.xml =================================================================== --- branches/3.2.helios/parent-pom.xml 2010-06-02 16:27:58 UTC (rev 22484) +++ branches/3.2.helios/parent-pom.xml 2010-06-02 17:33:05 UTC (rev 22485) @@ -9,8 +9,8 @@ <properties> <tychoVersion>0.9.0-SNAPSHOT</tychoVersion> - <!-- <tychoVersion>0.8.0</tychoVersion> --> <scmBranch>trunk</scmBranch> + <BUILD_ALIAS>M1</BUILD_ALIAS> </properties> <build> @@ -20,7 +20,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 +100,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> @@ -155,126 +166,10 @@ <url>https://jira.jboss.org/jira/secure/</url> </issueManagement> - <profiles> - <profile> - <id>helios</id> - <activation> - <property> - <name>helios</name> - </property> - </activation> - <repositories> - <repository> - <id>helios</id> - <url>http://download.eclipse.org/releases/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> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>birt26</id> - <url>http://download.eclipse.org/birt/update-site/2.6/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>swtbot-helios</id> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - <profile> - <id>svn-repos</id> - <activation> - <property> - <name>svn</name> - </property> - </activation> - <repositories> - <repository> - <id>svnkit13</id> - <url>http://eclipse.svnkit.com/1.3.x/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>subclipse16</id> - <url>http://subclipse.tigris.org/update_1.6.x/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>subversive07</id> - <url>http://download.eclipse.org/technology/subversive/0.7/update-site/ - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>subversive20</id> - <url>http://community.polarion.com/projects/subversive/download/eclipse... - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - - </repositories> - </profile> - </profiles> - <repositories> - <!-- TODO: add JBT nightly update site so we can build against binaries --> <repository> - <id>galileo</id> - <url>http://download.eclipse.org/releases/galileo/</url> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -284,8 +179,8 @@ </releases> </repository> <repository> - <id>eclipse35</id> - <url>http://download.eclipse.org/eclipse/updates/3.5/</url> + <id>webtools32</id> + <url>http://download.eclipse.org/webtools/repository/helios</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -295,8 +190,8 @@ </releases> </repository> <repository> - <id>birt25r</id> - <url>http://download.eclipse.org/birt/update-site/2.5</url> + <id>eclipse36</id> + <url>http://download.eclipse.org/eclipse/updates/3.6/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -306,9 +201,8 @@ </releases> </repository> <repository> - <id>swtbot-galileo</id> - <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/up... - </url> + <id>birt26r</id> + <url>http://download.eclipse.org/birt/update-site/2.6/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -317,10 +211,9 @@ <enabled>true</enabled> </releases> </repository> - <repository> - <id>webtools</id> - <url>http://download.eclipse.org/webtools/updates/</url> + <id>birt26i</id> + <url>http://download.eclipse.org/birt/update-site/2.6-interim/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -330,6 +223,18 @@ </releases> </repository> <repository> + <id>swtbot-helios</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + </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> @@ -353,24 +258,96 @@ </repository> </repositories> + <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>svn-repos</id> + <activation> + <property> + <name>svn</name> + </property> + </activation> + <repositories> + <repository> + <id>svnkit13</id> + <url>http://eclipse.svnkit.com/1.3.x/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>subclipse16</id> + <url>http://subclipse.tigris.org/update_1.6.x/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>subversive07</id> + <url>http://download.eclipse.org/technology/subversive/0.7/update-site/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>subversive20</id> + <url>http://community.polarion.com/projects/subversive/download/eclipse... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </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> @@ -384,7 +361,7 @@ <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> </pluginRepository> <pluginRepository> @@ -395,7 +372,7 @@ <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> </pluginRepository> <pluginRepository> @@ -405,29 +382,9 @@ <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> </pluginRepository> </pluginRepositories> - <!-- https://issues.sonatype.org/browse/TYCHO-413: does not work - doesn't - respect username & ssh key --> - <distributionManagement> - <!-- http://download.jboss.org/jbosstools/ --> - <!-- <repository> <id>jbosstools.internal.repo</id> <url> scp://filemgmt.jboss.org/downloads_htdocs/tools/repository/ - </url> </repository> --> - <!-- https://sourceforge.net/projects/jboss/files/JBossTools/JBossTools3.2.x --> - <!-- <repository> <id>jbosstools.external.repo</id> <name>JBoss Developer - Studio Repository</name> <url>scp://nickboldt,jboss@frs.sourceforge.net/home/frs/project/j/jb/jboss/JBossTools/JBossTools3.2.x/</url> - </repository> --> - - <!-- http://reports.qa.atl.jboss.com/binaries/RHDS/ --> - <!-- <repository> <id>jbds.internal.repo</id> <name>JBoss Developer Studio - Repository</name> <url>scp://hudson@localhost/qa/services/http/binaries/RHDS/repository/</url> - </repository> --> - <!-- http://devstudio.jboss.com --> - <!-- <repository> <id>jbds.external.repo</id> <name>JBoss Developer Studio - Repository</name> <url>scp://nboldt@wallace.redhat.com/mnt/devstudio/repository/</url> - </repository> --> - </distributionManagement> </project>