11:11 p.m.
Author: nickboldt
Date: 2011-07-15 00:11:56 -0400 (Fri, 15 Jul 2011)
New Revision: 32933
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
add missing orbit and m2e deps to TPs; merge changes from trunk to 32x branch
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 03:59:42 UTC
(rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 04:11:56 UTC
(rev 32933)
@@ -12,25 +12,25 @@
<repository
location="http://download.jboss.org/jbosstools/updates/helios/"...
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group"
version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.0.201106052308"/>
+ <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.0.201106061504"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group"
version="0.13.0.20110623-0455"/>
<unit id="ch.qos.logback.classic"
version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core"
version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j"
version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client"
version="1.6.3.201106052308"/>
+ <unit id="com.ning.async-http-client"
version="1.6.3.201106061504"/>
<unit id="org.jboss.netty"
version="3.2.4.Final-201106061504"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility"
version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery"
version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery"
version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api"
version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility"
version="1.0.1.v20110204-1323"/>
+ <unit id="org.eclipse.equinox.p2.discovery"
version="1.0.0.v20100503"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery"
version="1.0.0.v20100519"/>
+ <unit id="org.eclipse.net4j.jms.api"
version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201005080630"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.apache.commons.codec"
version="1.3.0.v201101211617"/>
- <unit id="org.apache.commons.httpclient"
version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec"
version="1.3.0.v20100518-1140"/>
+ <unit id="org.apache.commons.httpclient"
version="3.1.0.v201005080502"/>
<unit id="org.apache.commons.io"
version="2.0.1.v201101200200"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core"
version="1.1.0.v20090501071000"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15
03:59:42 UTC (rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15
04:11:56 UTC (rev 32933)
@@ -30,6 +30,19 @@
<source>
<repository
location="http://download.jboss.org/jbosstools/updates/helios/"...
</source>
+<iu id="org.eclipse.m2e.sdk.feature.feature.group"
version=""/>
+<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
+<iu id="org.maven.ide.eclipse.wtp.feature.feature.group"
version=""/>
+<iu id="ch.qos.logback.classic" version=""/>
+<iu id="ch.qos.logback.core" version=""/>
+<iu id="ch.qos.logback.slf4j" version=""/>
+<iu id="org.slf4j.api" version=""/>
+<iu id="com.ning.async-http-client" version=""/>
+<iu id="org.jboss.netty" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery.compatibility"
version=""/>
+<iu id="org.eclipse.equinox.p2.discovery" version=""/>
+<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
+<iu id="org.eclipse.net4j.jms.api" version=""/>
<iu id="javax.wsdl" version=""/>
<iu id="org.jdom" version=""/>
<iu id="org.apache.oro" version=""/>
@@ -154,18 +167,6 @@
<iu id="org.eclipse.tm.terminal.view.feature.group"
version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group"
version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group"
version=""/>
-<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
-<iu id="org.maven.ide.eclipse.wtp.feature.feature.group"
version=""/>
-<iu id="ch.qos.logback.classic" version=""/>
-<iu id="ch.qos.logback.core" version=""/>
-<iu id="ch.qos.logback.slf4j" version=""/>
-<iu id="org.slf4j.api" version=""/>
-<iu id="com.ning.async-http-client" version=""/>
-<iu id="org.jboss.netty" version=""/>
-<iu id="org.eclipse.equinox.p2.discovery.compatibility"
version=""/>
-<iu id="org.eclipse.equinox.p2.discovery" version=""/>
-<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
-<iu id="org.eclipse.net4j.jms.api" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 03:59:42
UTC (rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 04:11:56
UTC (rev 32933)
@@ -15,25 +15,25 @@
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group"
version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group"
version="0.13.0.20110623-0455"/>
+ <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.0.201106061504"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group"
version="0.11.1.20101108-1810"/>
<unit id="ch.qos.logback.classic"
version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core"
version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j"
version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client"
version="1.6.3.201106052308"/>
+ <unit id="com.ning.async-http-client"
version="1.6.3.201106061504"/>
<unit id="org.jboss.netty"
version="3.2.4.Final-201106061504"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility"
version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery"
version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery"
version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api"
version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility"
version="1.0.1.v20110204-1323"/>
+ <unit id="org.eclipse.equinox.p2.discovery"
version="1.0.0.v20100503"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery"
version="1.0.0.v20100519"/>
+ <unit id="org.eclipse.net4j.jms.api"
version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.apache.commons.codec"
version="1.3.0.v201101211617"/>
- <unit id="org.apache.commons.httpclient"
version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec"
version="1.3.0.v20100518-1140"/>
+ <unit id="org.apache.commons.httpclient"
version="3.1.0.v201005080502"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core"
version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text"
version="1.1.0.v20090501071000"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 03:59:42 UTC
(rev 32932)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 04:11:56 UTC
(rev 32933)
@@ -13,26 +13,27 @@
<location includeAllPlatforms="false" includeMode="planner"
type="InstallableUnit">
<repository
location="http://download.jboss.org/jbosstools/updates/target-platfo...
+ <!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group"
version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.0.201106052308"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group"
version="0.13.0.20110623-0455"/>
+ <unit id="org.eclipse.m2e.feature.feature.group"
version="1.0.0.201106061504"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group"
version="0.11.1.20101108-1810"/>
<unit id="ch.qos.logback.classic"
version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core"
version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j"
version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
- <unit id="com.ning.async-http-client"
version="1.6.3.201106052308"/>
+ <unit id="com.ning.async-http-client"
version="1.6.3.201106061504"/>
<unit id="org.jboss.netty"
version="3.2.4.Final-201106061504"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility"
version="1.0.1.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.discovery"
version="1.0.100.v20110502-1955"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery"
version="1.0.0.v20110502-1955"/>
- <unit id="org.eclipse.net4j.jms.api"
version="3.0.0.v20110516-1727"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility"
version="1.0.1.v20110204-1323"/>
+ <unit id="org.eclipse.equinox.p2.discovery"
version="1.0.0.v20100503"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery"
version="1.0.0.v20100519"/>
+ <unit id="org.eclipse.net4j.jms.api"
version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.apache.commons.codec"
version="1.3.0.v201101211617"/>
- <unit id="org.apache.commons.httpclient"
version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec"
version="1.3.0.v20100518-1140"/>
+ <unit id="org.apache.commons.httpclient"
version="3.1.0.v201005080502"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core"
version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text"
version="1.1.0.v20090501071000"/>