[jbosstools-commits] JBoss Tools SVN: r30199 - trunk/build/parent.

Author: nickboldt Date: 2011-04-01 02:19:23 -0400 (Fri, 01 Apr 2011) New Revision: 30199 Modified: trunk/build/parent/pom.xml Log: enable all activeByDefault=true sites to be active w/o needing to specify via -P flag Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-04-01 05:50:34 UTC (rev 30198) +++ trunk/build/parent/pom.xml 2011-04-01 06:19:23 UTC (rev 30199) @@ -23,8 +23,6 @@ <!-- 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 @@ -95,6 +93,16 @@ <configuration> <resolver>p2</resolver> <ignoreTychoRepositories>true</ignoreTychoRepositories> + <target> + <!-- Target platform file pointing at a single update site from which + to resolve. --> + <artifact> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.target.platform</artifactId> + <version>0.0.2-SNAPSHOT</version> + <classifier>${target.platform.classifier.unified}</classifier> + </artifact> + </target> <environments> <environment> <os>macosx</os> @@ -207,91 +215,6 @@ </issueManagement> <profiles> - <profile> - <id>jbosstools-nightly</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>jbosstools-nightly</id> - <url>${jbosstools-nightly}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - <profile> - <id>jbosstools-nightly-staging-composite</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>jbosstools-nightly-staging-composite</id> - <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.... - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - <profile> - <id>jboss-requirements-composite-mirror</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>jboss-requirements-composite-mirror</id> - <url>http://download.jboss.org/jbosstools/updates/indigo/</url> - <layout>p2</layout> - <snapshots> <enabled>true</enabled> </snapshots> - <releases> <enabled>true</enabled> </releases> - </repository> - </repositories> - </profile> - - <!-- Target platform file pointing at a single update site from which to - resolve. See unified.site if you want to resolve against a site w/o using - the unified.target file --> - <profile> - <id>unified.target</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>org.jboss.tools.target.platform</artifactId> - <version>0.0.2-SNAPSHOT</version> - <classifier>${target.platform.classifier.unified}</classifier> - </artifact> - </target> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <!-- To use this profile, must have first created a local.target file, which points to a local repo. You can do this by hand or generate it from multiple.target using: cd ~/trunk/build/target-platform; ant See also the @@ -301,9 +224,6 @@ mvn clean install -Pget.local.target -f /path/to/target-platform/pom.xml --> <profile> <id>local.target</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <build> <plugins> <plugin> @@ -330,9 +250,6 @@ without needing to use a local.site file --> <profile> <id>local.site</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> <repositories> <repository> <id>local.site</id> @@ -348,31 +265,7 @@ </repositories> </profile> - <!-- Time saver: to build everything from scratch from a single repo containing - all deps in unified.target, but without using the target file to filter site - contents (may end up using a different version of a dependency if site contains - multiple versions) --> <profile> - <id>unified.site</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>jbosstools-target-site</id> - <url>${jbosstools-target-site}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - - <profile> <id>osx</id> <activation> <property> @@ -630,7 +523,61 @@ </profiles> <repositories> + <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org. + This is the superset of sites from which the TP is created. Should be + disabled closer to GA so we're only using the TP contents exclusively. --> <repository> + <id>jboss-requirements-composite-mirror</id> + <url>http://download.jboss.org/jbosstools/updates/indigo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + <!-- Single repo containing contents of unified.target, but without using the target file --> + <repository> + <id>jbosstools-target-site</id> + <url>${jbosstools-target-site}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + <!-- Latest JBT nightly published update site (nightly builds) --> + <repository> + <id>jbosstools-nightly</id> + <url>${jbosstools-nightly}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + <!-- Latest JBT work-in-progress component builds (CI builds), not yet pushed to the above nightly update site --> + <repository> + <id>jbosstools-nightly-staging-composite</id> + <url>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.... + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + + <repository> <id>jboss-public-repository-group</id> <name>JBoss Public Repository Group</name> <url>http://repository.jboss.org/nexus/content/groups/public/</url>