Author: nickboldt Date: 2010-11-05 06:04:41 -0400 (Fri, 05 Nov 2010) New Revision: 26278 Modified: trunk/build/parent/pom.xml Log: bump up to antrun 1.6; add new profiles for .target files; purge dgolovin profile; refactoring Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2010-11-05 09:53:45 UTC (rev 26277) +++ trunk/build/parent/pom.xml 2010-11-05 10:04:41 UTC (rev 26278) @@ -18,17 +18,22 @@ <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2> <systemProperties></systemProperties> - <target.platform>e36-wtp32</target.platform> - <!-- could also use http://download.jboss.org/jbosstools/updates/target-platform/latest/ --> - <target.platform.URL>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/ - </target.platform.URL> + + <!-- target files available for building: multiple sites, 1 unified site, 1 local mirrored site --> + <target.platform.classifier.multiple>mutiple</target.platform.classifier.multiple> + <target.platform.classifier.unified>unified</target.platform.classifier.unified> + <target.platform.classifier.local>local</target.platform.classifier.local> + + <!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/ --> + <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/ + </target.platform.site> </properties> <build> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> + <version>1.6</version> </plugin> <plugin> @@ -176,6 +181,8 @@ <url>https://jira.jboss.org/jira/secure/</url> </issueManagement> <profiles> + + <!-- TODO: remove this when no one depends on it --> <profile> <id>helios</id> <activation> @@ -195,7 +202,7 @@ <groupId>org.jboss.tools</groupId> <artifactId>target-platform</artifactId> <version>0.0.1-SNAPSHOT</version> - <classifier>${target.platform}</classifier> + <classifier>${target.platform.classifier.multiple}</classifier> </artifact> </target> </configuration> @@ -203,9 +210,61 @@ </plugins> </build> </profile> + <profile> + <id>unified</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + </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.unified}</classifier> + </artifact> + </target> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>local</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <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.local}</classifier> + </artifact> + </target> + </configuration> + </plugin> + </plugins> + </build> + </profile> <!-- Time saver: to build everything from scratch from a single local repo - on Hudson cluster --> + on Hudson cluster or on local machine. Use -Dtarget.platform.site=file://path/to/your/own/repo --> <profile> <id>helios-local-target</id> <activation> @@ -214,7 +273,7 @@ <repositories> <repository> <id>jbosstools-target-platform-repo</id> - <url>${target.platform.URL}</url> + <url>${target.platform.site}</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -480,8 +539,7 @@ </property> </activation> <properties> - <emma.session.out.file>${project.build.directory}/emma/coverage.es - </emma.session.out.file> + <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file> <emma.filter /> <emma.instrument.bundles /> </properties> @@ -536,7 +594,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> + <version>1.6</version> <dependencies> <dependency> <groupId>emma</groupId> @@ -632,7 +690,7 @@ </dependency> </dependencies> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> + <version>1.6</version> <executions> <execution> <id>download-plugin-requirements</id> @@ -681,84 +739,5 @@ </repository> </repositories> </profile> - - <!-- TODO: remove this --> - <profile> - <id>dgolovin</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <repositories> - <repository> - <id>helios</id> - <url>file:///media/Data/updates/helios-sp1</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>jboss-swtbot-helios</id> - <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-h... - </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>jboss-xulrunner-1.9.1.2</id> - <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunne... - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>google eclipse plugins</id> - <url>http://dl.google.com/eclipse/plugin/3.6</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> </profiles> </project>