Author: nickboldt
Date: 2011-01-13 18:05:01 -0500 (Thu, 13 Jan 2011)
New Revision: 28211
Modified:
branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target
branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target
branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target
branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml
Log:
merge changes from trunk into branch
Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target 2011-01-13 23:01:51
UTC (rev 28210)
+++ branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target 2011-01-13 23:05:01
UTC (rev 28211)
@@ -130,7 +130,6 @@
<unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ"
id="org.eclipse.pde.feature.group"/>
<!-- TPTP -->
- <unit version="4.3.1.v201009092123-794F9x8s73533H3I6A56"
id="org.eclipse.tptp.trace.feature.group"/>
<unit version="4.5.0.v201005032111-2-37w312116191612"
id="org.eclipse.tptp.platform.commons.logging.feature.group"/>
<unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"
id="org.eclipse.tptp.platform.core.feature.group"/>
<unit version="4.3.1.v201009092123-797908s73533D4H6D56"
id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml
===================================================================
---
branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml 2011-01-13
23:01:51 UTC (rev 28210)
+++
branches/jbosstools-3.2.0.CR1/build/target-platform/jbds.target.p2mirror.xml 2011-01-13
23:05:01 UTC (rev 28211)
@@ -128,7 +128,6 @@
<iu version="" id="org.eclipse.uml2.feature.group"/>
<iu version="" id="org.eclipse.uml2.doc.feature.group"/>
<iu version="" id="org.eclipse.pde.feature.group"/>
-<iu version="" id="org.eclipse.tptp.trace.feature.group"/>
<iu version=""
id="org.eclipse.tptp.platform.commons.logging.feature.group"/>
<iu version=""
id="org.eclipse.tptp.platform.core.feature.group"/>
<iu version=""
id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target 2011-01-13
23:01:51 UTC (rev 28210)
+++ branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target 2011-01-13
23:05:01 UTC (rev 28211)
@@ -54,7 +54,6 @@
<repository
location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
</location>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
- <unit id="org.eclipse.tptp.trace.feature.group"
version="4.3.1.v201009092123-794F9x8s73533H3I6A56"/>
<unit id="org.eclipse.tptp.platform.profile.server.feature.group"
version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"
version="4.3.1.v201009092123-797908s73533D4H6D56"/>
<unit id="org.eclipse.tptp.platform.core.feature.group"
version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/>
Modified:
branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml
===================================================================
---
branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml 2011-01-13
23:01:51 UTC (rev 28210)
+++
branches/jbosstools-3.2.0.CR1/build/target-platform/multiple.target.p2mirror.xml 2011-01-13
23:05:01 UTC (rev 28211)
@@ -57,7 +57,6 @@
<iu id="org.jdom.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group"
version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
-<iu id="org.eclipse.tptp.trace.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.profile.server.feature.group"
version=""/>
<iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"
version=""/>
<iu id="org.eclipse.tptp.platform.core.feature.group"
version=""/>
Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target 2011-01-13 23:01:51
UTC (rev 28210)
+++ branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target 2011-01-13 23:05:01
UTC (rev 28211)
@@ -54,7 +54,6 @@
<repository
location="http://download.jboss.org/jbosstools/updates/target-platfo...
</location>
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
- <unit id="org.eclipse.tptp.trace.feature.group"
version="4.3.1.v201009092123-794F9x8s73533H3I6A56"/>
<unit id="org.eclipse.tptp.platform.profile.server.feature.group"
version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"
version="4.3.1.v201009092123-797908s73533D4H6D56"/>
<unit id="org.eclipse.tptp.platform.core.feature.group"
version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/>
Modified: branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml
===================================================================
---
branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml 2011-01-13
23:01:51 UTC (rev 28210)
+++
branches/jbosstools-3.2.0.CR1/build/target-platform/unified.target.p2mirror.xml 2011-01-13
23:05:01 UTC (rev 28211)
@@ -57,7 +57,6 @@
<iu id="org.jdom.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group"
version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
-<iu id="org.eclipse.tptp.trace.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.profile.server.feature.group"
version=""/>
<iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"
version=""/>
<iu id="org.eclipse.tptp.platform.core.feature.group"
version=""/>