Author: nickboldt Date: 2010-11-25 12:47:12 -0500 (Thu, 25 Nov 2010) New Revision: 26946 Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml Log: switch to using http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta2/ instead of 8 different sites Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-11-25 17:34:37 UTC (rev 26945) +++ branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-11-25 17:47:12 UTC (rev 26946) @@ -16,7 +16,7 @@ <properties> <!-- add more inputRepo# here, then reference below; need variables so that these can be referred to in Ant script later --> - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <!-- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbossto... <inputRepo2>http://download.jboss.org/jbosstools/builds/staging/pi4soa-... <inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbossto... <inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbossto... @@ -24,7 +24,10 @@ <inputRepo6>http://download.jboss.org/jbosstools/builds/staging/jbossto... <inputRepo7>http://download.jboss.org/jbosstools/builds/staging/jbossto... <inputRepo8>http://download.jboss.org/jbosstools/builds/staging/jbossto... - <inputRepos>1,2,3,4,5,6,7,8</inputRepos> + <inputRepos>1,2,3,4,5,6,7,8</inputRepos> --> + <!-- use a single composite site so adding more jobs' output is easier --> + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos... + <inputRepos>1</inputRepos> </properties> <build> @@ -41,13 +44,13 @@ <quiet>true</quiet> <tasks> <property name="inputRepo1" value="${inputRepo1}" /> - <property name="inputRepo2" value="${inputRepo2}" /> + <!-- <property name="inputRepo2" value="${inputRepo2}" /> <property name="inputRepo3" value="${inputRepo3}" /> <property name="inputRepo4" value="${inputRepo4}" /> <property name="inputRepo5" value="${inputRepo5}" /> <property name="inputRepo6" value="${inputRepo6}" /> <property name="inputRepo7" value="${inputRepo7}" /> - <property name="inputRepo8" value="${inputRepo8}" /> + <property name="inputRepo8" value="${inputRepo8}" /> --> <property name="inputRepos" value="${inputRepos}" /> <!-- called AFTER generating update site + zip to add in extra content --> @@ -91,6 +94,14 @@ can be referred to in Ant script later --> <repository> <id>inputRepo1</id> + <url>${inputRepo1}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <!-- <repository> + <id>inputRepo1</id> <url>${inputRepo1}/all/repo/</url> <layout>p2</layout> <snapshots> @@ -152,137 +163,6 @@ <snapshots> <enabled>true</enabled> </snapshots> - </repository> + </repository> --> </repositories> - - <profiles> - <profile> - <id>helios-no-target</id> - <activation> - <activeByDefault>true</activeByDefault> - </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>jboss-helios</id> - <url>http://download.jboss.org/jbosstools/updates/requirements/helios/ - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <!--repository> <id>webtools32</id> <url>http://download.eclipse.org/webtools/repository/helios</url> - <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases> - <enabled>true</enabled> </releases> </repository --> - <repository> - <id>jboss-webtools32</id> - <url>http://download.jboss.org/jbosstools/updates/requirements/webtools... - </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 --> - <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</id> - <url>http://m2eclipse.sonatype.org/sites/m2e/</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-orbit</id> <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R2... - </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> - <releases> <enabled>true</enabled> </releases> </repository --> - <repository> - <id>jboss-thirdparty</id> - <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/ - </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>jboss-xulrunner-1.9.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>