Author: nickboldt Date: 2011-07-14 23:59:42 -0400 (Thu, 14 Jul 2011) New Revision: 32932 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/multiple.target.p2mirror.xml branches/jbosstools-3.2.x/build/target-platform/unified.target branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 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:53:51 UTC (rev 32931) +++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-07-15 03:59:42 UTC (rev 32932) @@ -1,15 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?> -<target includeMode="feature" name="jbds"> +<target includeMode="feature" name="jbds4"> <locations> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> - <!-- Pro tip: to convert - from org.eclipse.tptp.platform.xerces_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar - to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/> - using vi, apply this transform: - :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g - --> + <!-- Pro tip: to convert + from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar + to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/> + using vi, apply this transform: + :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g + --> - <!-- Orbit bundles --> + <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.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="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"/> + + <!-- 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.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"/> <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> @@ -155,10 +177,6 @@ <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/> <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/> - <unit id="org.apache.commons.io" version="2.0.1.v201101200200"/> - - <repository location="http://download.jboss.org/jbosstools/updates/helios/"... </location> </locations> - <!-- <includeBundles><plugin id="org.apache.commons.io"/></includeBundles> --> </target> \ No newline at end of file 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:53:51 UTC (rev 32931) +++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932) @@ -30,6 +30,12 @@ <source> <repository location="http://download.jboss.org/jbosstools/updates/helios/"... </source> +<iu id="javax.wsdl" version=""/> +<iu id="org.jdom" version=""/> +<iu id="org.apache.oro" version=""/> +<iu id="org.apache.commons.codec" version=""/> +<iu id="org.apache.commons.httpclient" version=""/> +<iu id="org.apache.commons.io" version=""/> <iu id="org.hamcrest" version=""/> <iu id="org.hamcrest.core" version=""/> <iu id="org.hamcrest.text" version=""/> @@ -148,7 +154,18 @@ <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.apache.commons.io" 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:53:51 UTC (rev 32931) +++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-07-15 03:59:42 UTC (rev 32932) @@ -13,6 +13,7 @@ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <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.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/> @@ -27,13 +28,17 @@ <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"/> - <!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 --> - <!-- - <unit id="javax.wsdl" version="1.6.2.v201005080631"/> - --> + <!-- 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.jdom" version="1.0.0.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.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"/> + <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/> <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/> <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/> Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-07-15 03:53:51 UTC (rev 32931) +++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932) @@ -31,8 +31,6 @@ <repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... <repository location="http://download.jboss.org/jbosstools/updates/helios/"... </source> -<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/> -<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/> <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=""/> @@ -47,8 +45,15 @@ <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=""/> -<iu id="org.jdom" version=""/> +<iu id="org.apache.commons.codec" version=""/> +<iu id="org.apache.commons.httpclient" version=""/> +<iu id="org.hamcrest" version=""/> +<iu id="org.hamcrest.core" version=""/> +<iu id="org.hamcrest.text" version=""/> +<iu id="org.hamcrest.library" version=""/> +<iu id="org.hamcrest.integration" 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.x/build/target-platform/unified.target =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 03:53:51 UTC (rev 32931) +++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-15 03:59:42 UTC (rev 32932) @@ -27,13 +27,17 @@ <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"/> - <!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 --> - <!-- - <unit id="javax.wsdl" version="1.6.2.v201005080631"/> - --> + <!-- 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.jdom" version="1.0.0.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.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"/> + <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/> + <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/> <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/> <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/> 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-07-15 03:53:51 UTC (rev 32931) +++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-07-15 03:59:42 UTC (rev 32932) @@ -31,8 +31,6 @@ <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=""/> <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=""/> @@ -47,8 +45,14 @@ <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=""/> -<iu id="org.jdom" version=""/> +<iu id="org.apache.commons.codec" version=""/> +<iu id="org.apache.commons.httpclient" version=""/> +<iu id="org.hamcrest" version=""/> +<iu id="org.hamcrest.core" version=""/> +<iu id="org.hamcrest.library" version=""/> +<iu id="org.hamcrest.integration" 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=""/>