[jbosstools-commits] JBoss Tools SVN: r24058 - in trunk: build/parent and 1 other directories.

Author: nickboldt Date: 2010-08-11 11:59:15 -0400 (Wed, 11 Aug 2010) New Revision: 24058 Modified: trunk/build/parent/pom.xml trunk/build/target-platform/e36-wtp32.target trunk/parent-pom.xml Log: move mirrors down one dir; add new swtbot + webtools mirrors; remove galileo target Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2010-08-11 15:44:19 UTC (rev 24057) +++ trunk/build/parent/pom.xml 2010-08-11 15:59:15 UTC (rev 24058) @@ -184,9 +184,9 @@ <activeByDefault>false</activeByDefault> </activation> <repositories> - <repository> - <id>helios-jboss-mirror</id> - <url>http://download.jboss.org/jbosstools/updates/helios/</url> + <!--repository> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -194,10 +194,10 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>helios</id> - <url>http://download.eclipse.org/releases/helios/</url> + <id>jboss-helios</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/helios/&... <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -206,7 +206,7 @@ <enabled>true</enabled> </releases> </repository> - <repository> + <!--repository> <id>webtools32</id> <url>http://download.eclipse.org/webtools/repository/helios</url> <layout>p2</layout> @@ -216,11 +216,10 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>birt26</id> - <url>http://download.eclipse.org/birt/update-site/2.6/ - </url> + <id>jboss-webtools32</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/webtools... <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -230,8 +229,8 @@ </releases> </repository> <repository> - <id>swtbot-helios</id> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + <id>birt26</id> + <url>http://download.eclipse.org/birt/update-site/2.6/ </url> <layout>p2</layout> <snapshots> @@ -241,9 +240,10 @@ <enabled>true</enabled> </releases> </repository> - <repository> - <id>m2eclipse</id> - <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <!--repository> + <id>swtbot-helios</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -251,10 +251,11 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>m2eclipse-extras</id> - <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <id>jboss-swtbot-helios</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-h... + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -264,9 +265,8 @@ </releases> </repository> <repository> - <id>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... - </url> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -276,9 +276,8 @@ </releases> </repository> <repository> - <id>jboss-xulrunner-1.9.1.2</id> - <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.1.2/ - </url> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -288,8 +287,8 @@ </releases> </repository> <!--repository> - <id>jboss-xulrunner-1.9.2</id> - <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/ + <id>jboss-orbit</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R2... </url> <layout>p2</layout> <snapshots> @@ -300,61 +299,8 @@ </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> - - <profile> - <id>helios-sp1-no-target</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <repositories> - <repository> - <id>helios-jboss-mirror</id> - <url>http://download.jboss.org/jbosstools/updates/helios/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <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>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>eclipse36</id> - <url>http://download.eclipse.org/eclipse/updates/3.6.x/ + <id>jboss-thirdparty</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/ </url> <layout>p2</layout> <snapshots> @@ -365,8 +311,8 @@ </releases> </repository> <repository> - <id>birt26</id> - <url>http://download.eclipse.org/birt/update-site/2.6/ + <id>jboss-xulrunner-1.9.1.2</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunne... </url> <layout>p2</layout> <snapshots> @@ -376,9 +322,9 @@ <enabled>true</enabled> </releases> </repository> - <repository> - <id>swtbot-helios</id> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + <!--repository> + <id>jboss-xulrunner-1.9.2</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunne... </url> <layout>p2</layout> <snapshots> @@ -387,10 +333,10 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>m2eclipse</id> - <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <id>google eclipse plugins</id> + <url>http://dl.google.com/eclipse/plugin/3.6</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -399,20 +345,18 @@ <enabled>true</enabled> </releases> </repository> + </repositories> + </profile> + + <profile> + <id>helios-maintenance-no-target</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <repositories> <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>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... + <id>eclipse36x</id> + <url>http://download.eclipse.org/eclipse/updates/3.6.x/ </url> <layout>p2</layout> <snapshots> @@ -422,17 +366,6 @@ <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> @@ -510,99 +443,6 @@ </repositories> </profile> <profile> - <id>galileo</id> - <repositories> - <repository> - <id>galileo</id> - <url>http://download.eclipse.org/releases/galileo/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>eclipse35</id> - <url>http://download.eclipse.org/eclipse/updates/3.5/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>birt25r</id> - <url>http://download.eclipse.org/birt/update-site/2.5</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>swtbot-galileo</id> - <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/up... - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>webtools</id> - <url>http://download.eclipse.org/webtools/updates/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... - </url> - <layout>p2</layout> - <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> - </repositories> - </profile> - <profile> <id>coverage</id> <activation> <property> Modified: trunk/build/target-platform/e36-wtp32.target =================================================================== --- trunk/build/target-platform/e36-wtp32.target 2010-08-11 15:44:19 UTC (rev 24057) +++ trunk/build/target-platform/e36-wtp32.target 2010-08-11 15:59:15 UTC (rev 24058) @@ -23,22 +23,22 @@ <!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="javax.wsdl" version="1.6.2.v201005080631"/> <unit id="org.apache.oro" version="2.0.8.v201005080400"/> -<repository location="http://download.jboss.org/jbosstools/updates/orbit/R201005... +<repository location="http://download.jboss.org/jbosstools/updates/requirements/... </location> --> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="javax.wsdl" version="1.6.2.v201005080631"/> <unit id="org.apache.oro" version="2.0.8.v201005080400"/> -<repository location="http://download.jboss.org/jbosstools/updates/thirdparty/&q... +<repository location="http://download.jboss.org/jbosstools/updates/requirements/... </location> <!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.2"/> <unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.2"/> -<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9... +<repository location="http://download.jboss.org/jbosstools/updates/requirements/... </location> --> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.1.2"/> <unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.1.2a"/> -<repository location="http://download.jboss.org/jbosstools/updates/xulrunner-1.9... +<repository location="http://download.jboss.org/jbosstools/updates/requirements/... </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/> @@ -120,7 +120,7 @@ <unit id="org.eclipse.draw2d.feature.group" version="3.6.0.v20100519-2050-45-7w3121163602336"/> <unit id="org.eclipse.gef.feature.group" version="3.6.0.v20100519-2050-777B-81A2Bz-69793A8B83447"/> <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-678-8yE4F-8HAH4DFEF3447"/> -<repository location="http://download.jboss.org/jbosstools/updates/helios/"... +<repository location="http://download.jboss.org/jbosstools/updates/requirements/... </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit id="org.eclipse.jst.jee" version="1.0.300.v201005191301"/> @@ -160,7 +160,8 @@ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.0.v201005241510-7E7AFHkAJrn5NL_6wTQDqKL5RwiQ"/> <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.0.v201005241510-7I78FXbEtEoKvbtBtJ4fGNrH2oBH"/> <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.0.v201005241510-7C7OFXTF7RZHQHHxO4IuKe"/> -<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.... +<!--repository location="http://download.eclipse.org/webtools/downloads/drops/R3.2.... --> +<repository location="http://download.jboss.org/jbosstools/updates/requirements/... </location> </locations> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> Modified: trunk/parent-pom.xml =================================================================== --- trunk/parent-pom.xml 2010-08-11 15:44:19 UTC (rev 24057) +++ trunk/parent-pom.xml 2010-08-11 15:59:15 UTC (rev 24058) @@ -184,9 +184,9 @@ <activeByDefault>false</activeByDefault> </activation> <repositories> - <repository> - <id>helios-jboss-mirror</id> - <url>http://download.jboss.org/jbosstools/updates/helios/</url> + <!--repository> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -194,10 +194,10 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>helios</id> - <url>http://download.eclipse.org/releases/helios/</url> + <id>jboss-helios</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/helios/&... <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -206,7 +206,7 @@ <enabled>true</enabled> </releases> </repository> - <repository> + <!--repository> <id>webtools32</id> <url>http://download.eclipse.org/webtools/repository/helios</url> <layout>p2</layout> @@ -216,11 +216,10 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>birt26</id> - <url>http://download.eclipse.org/birt/update-site/2.6/ - </url> + <id>jboss-webtools32</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/webtools... <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -230,8 +229,8 @@ </releases> </repository> <repository> - <id>swtbot-helios</id> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + <id>birt26</id> + <url>http://download.eclipse.org/birt/update-site/2.6/ </url> <layout>p2</layout> <snapshots> @@ -241,9 +240,10 @@ <enabled>true</enabled> </releases> </repository> - <repository> - <id>m2eclipse</id> - <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <!--repository> + <id>swtbot-helios</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -251,10 +251,11 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>m2eclipse-extras</id> - <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <id>jboss-swtbot-helios</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/swtbot-h... + </url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -264,9 +265,8 @@ </releases> </repository> <repository> - <id>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... - </url> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -276,9 +276,8 @@ </releases> </repository> <repository> - <id>jboss-xulrunner-1.9.1.2</id> - <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.1.2/ - </url> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -288,8 +287,8 @@ </releases> </repository> <!--repository> - <id>jboss-xulrunner-1.9.2</id> - <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/ + <id>jboss-orbit</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R2... </url> <layout>p2</layout> <snapshots> @@ -300,61 +299,8 @@ </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> - - <profile> - <id>helios-sp1-no-target</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <repositories> - <repository> - <id>helios-jboss-mirror</id> - <url>http://download.jboss.org/jbosstools/updates/helios/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <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>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>eclipse36</id> - <url>http://download.eclipse.org/eclipse/updates/3.6.x/ + <id>jboss-thirdparty</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/thirdparty/ </url> <layout>p2</layout> <snapshots> @@ -365,8 +311,8 @@ </releases> </repository> <repository> - <id>birt26</id> - <url>http://download.eclipse.org/birt/update-site/2.6/ + <id>jboss-xulrunner-1.9.1.2</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunne... </url> <layout>p2</layout> <snapshots> @@ -376,9 +322,9 @@ <enabled>true</enabled> </releases> </repository> - <repository> - <id>swtbot-helios</id> - <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + <!--repository> + <id>jboss-xulrunner-1.9.2</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunne... </url> <layout>p2</layout> <snapshots> @@ -387,10 +333,10 @@ <releases> <enabled>true</enabled> </releases> - </repository> + </repository--> <repository> - <id>m2eclipse</id> - <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <id>google eclipse plugins</id> + <url>http://dl.google.com/eclipse/plugin/3.6</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -399,20 +345,18 @@ <enabled>true</enabled> </releases> </repository> + </repositories> + </profile> + + <profile> + <id>helios-maintenance-no-target</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <repositories> <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>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... + <id>eclipse36x</id> + <url>http://download.eclipse.org/eclipse/updates/3.6.x/ </url> <layout>p2</layout> <snapshots> @@ -422,17 +366,6 @@ <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> @@ -510,99 +443,6 @@ </repositories> </profile> <profile> - <id>galileo</id> - <repositories> - <repository> - <id>galileo</id> - <url>http://download.eclipse.org/releases/galileo/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>eclipse35</id> - <url>http://download.eclipse.org/eclipse/updates/3.5/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>birt25r</id> - <url>http://download.eclipse.org/birt/update-site/2.5</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>swtbot-galileo</id> - <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/up... - </url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>webtools</id> - <url>http://download.eclipse.org/webtools/updates/</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... - </url> - <layout>p2</layout> - <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> - </repositories> - </profile> - <profile> <id>coverage</id> <activation> <property>