Author: nickboldt Date: 2011-03-05 22:37:37 -0500 (Sat, 05 Mar 2011) New Revision: 29540 Modified: trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.xml trunk/build/target-platform/unified.target trunk/build/target-platform/unified.target.p2mirror.xml Log: merge changes from 3.2.x branch - add missing org.eclipse.datatools.sqldevtools.sqlbuilder; cleanup files Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-03-06 03:36:28 UTC (rev 29539) +++ trunk/build/target-platform/multiple.target 2011-03-06 03:37:37 UTC (rev 29540) @@ -26,6 +26,9 @@ <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 --> + <!-- <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="org.apache.oro" version="2.0.8.v201005080400"/> <unit id="org.jdom" version="1.0.0.v201005080400"/> @@ -125,6 +128,8 @@ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/> <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/> <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/> + <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.8.2.v201010181125-79-4EVVFJoFwKcN-L_"/> + <unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/> <unit id="org.eclipse.gef.feature.group" version="3.6.2.v20110128-0100-777B381A4Bz06565376E32322"/> <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/> Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-03-06 03:36:28 UTC (rev 29539) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-03-06 03:37:37 UTC (rev 29540) @@ -123,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=""/> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2011-03-06 03:36:28 UTC (rev 29539) +++ trunk/build/target-platform/unified.target 2011-03-06 03:37:37 UTC (rev 29540) @@ -26,6 +26,9 @@ <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> + <!-- 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="org.apache.oro" version="2.0.8.v201005080400"/> <unit id="org.jdom" version="1.0.0.v201005080400"/> @@ -125,6 +128,8 @@ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/> <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/> <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/> + <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.8.2.v201010181125-79-4EVVFJoFwKcN-L_"/> + <unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/> <unit id="org.eclipse.gef.feature.group" version="3.6.2.v20110128-0100-777B381A4Bz06565376E32322"/> <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/> @@ -219,4 +224,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> \ No newline at end of file +</target> Modified: trunk/build/target-platform/unified.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/unified.target.p2mirror.xml 2011-03-06 03:36:28 UTC (rev 29539) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-03-06 03:37:37 UTC (rev 29540) @@ -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=""/>