Author: nickboldt Date: 2011-04-01 10:07:40 -0400 (Fri, 01 Apr 2011) New Revision: 30213 Modified: trunk/build/parent/pom.xml Log: revert previous changes to pom.xml - nightly, staging, indigo, and TP site shouldn't be on by default so that people can use -Plocal.site w/o pulling remote URLs Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-04-01 13:41:44 UTC (rev 30212) +++ trunk/build/parent/pom.xml 2011-04-01 14:07:40 UTC (rev 30213) @@ -93,16 +93,6 @@ <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> @@ -215,6 +205,98 @@ </issueManagement> <profiles> + <!-- Latest JBT nightly published update site (nightly builds) --> + <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> + + <!-- Latest JBT work-in-progress component builds (CI builds), not yet pushed to the above nightly update site --> + <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> + + <!-- 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. --> + <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.3-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 @@ -265,7 +347,28 @@ </repositories> </profile> + <!-- Single repo containing contents of unified.target, but without using the target file --> <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> @@ -523,61 +626,7 @@ </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>