Author: nickboldt Date: 2011-03-05 22:36:28 -0500 (Sat, 05 Mar 2011) New Revision: 29539 Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml Log: merge changes from trunk - add missing org.eclipse.datatools.sqldevtools.sqlbuilder; cleanup files Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-03-06 03:32:29 UTC (rev 29538) +++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-03-06 03:36:28 UTC (rev 29539) @@ -26,10 +26,10 @@ <repository location="http://download.eclipse.org/technology/subversive/0.7/week... </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 --> + <!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 --> <!-- <unit id="javax.wsdl" version="1.6.2.v201005080631"/> <unit id="javax.wsdl" version="1.5.1.v201005080630"/> --> - <unit id="javax.wsdl" version="1.6.2.v201005080631"/> + <unit id="javax.wsdl" version="1.6.2.v201005080631"/> <unit id="org.apache.oro" version="2.0.8.v201005080400"/> <unit id="org.jdom" version="1.0.0.v201005080400"/> <repository location="http://download.jboss.org/jbosstools/updates/requirements/... Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-03-06 03:32:29 UTC (rev 29538) +++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-03-06 03:36:28 UTC (rev 29539) @@ -45,10 +45,6 @@ <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... </source> <iu id="org.maven.ide.eclipse.feature.feature.group" version=""/> <iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/> @@ -127,6 +123,7 @@ <iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version=""/> <iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/> <iu id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version=""/> +<iu id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version=""/> <iu id="org.eclipse.draw2d.feature.group" version=""/> <iu id="org.eclipse.gef.feature.group" version=""/> <iu id="org.eclipse.zest.feature.group" version=""/>