Author: nickboldt Date: 2011-06-10 22:54:32 -0400 (Fri, 10 Jun 2011) New Revision: 32041 Modified: trunk/build/target-platform/jbds.target trunk/build/target-platform/jbds.target.p2mirror.xml 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: remove duplicate entries and add m2e stuff to JBDS target (so it's installable from Extras site) Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2011-06-11 02:08:11 UTC (rev 32040) +++ trunk/build/target-platform/jbds.target 2011-06-11 02:54:32 UTC (rev 32041) @@ -170,6 +170,16 @@ <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/> <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/> <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/> + + <!-- m2e 1.0 / 0.13 --> + <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.201106020304"/> + <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-201106052308"/> </location> </locations> </target> Modified: trunk/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-06-11 02:08:11 UTC (rev 32040) +++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041) @@ -149,6 +149,14 @@ <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=""/> </p2.mirror> </target> </project> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-06-11 02:08:11 UTC (rev 32040) +++ trunk/build/target-platform/multiple.target 2011-06-11 02:54:32 UTC (rev 32041) @@ -20,21 +20,13 @@ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/> <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.201106020304"/> - <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> <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-201106052308"/> - <!-- probably not required per Sneja and Max - <unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/> - <unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/> - <unit id="org.eclipse.epp.mpc.ui" version="1.1.0.I20110316-1744"/> - <unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/> - <unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/> - <unit id="org.eclipse.epp.usagedata.ui" version="1.3.1.R201102081640"/> - --> + <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"/> Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-06-11 02:08:11 UTC (rev 32040) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041) @@ -34,7 +34,6 @@ <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="org.slf4j.api" version=""/> <iu id="ch.qos.logback.classic" version=""/> <iu id="ch.qos.logback.core" version=""/> <iu id="ch.qos.logback.slf4j" version=""/> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2011-06-11 02:08:11 UTC (rev 32040) +++ trunk/build/target-platform/unified.target 2011-06-11 02:54:32 UTC (rev 32041) @@ -20,21 +20,13 @@ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/> <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.201106020304"/> - <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> <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-201106052308"/> - <!-- probably not required per Sneja and Max - <unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/> - <unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/> - <unit id="org.eclipse.epp.mpc.ui" version="1.1.0.I20110316-1744"/> - <unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/> - <unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/> - <unit id="org.eclipse.epp.usagedata.ui" version="1.3.1.R201102081640"/> - --> + <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"/> Modified: trunk/build/target-platform/unified.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/unified.target.p2mirror.xml 2011-06-11 02:08:11 UTC (rev 32040) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041) @@ -34,7 +34,6 @@ <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="org.slf4j.api" version=""/> <iu id="ch.qos.logback.classic" version=""/> <iu id="ch.qos.logback.core" version=""/> <iu id="ch.qos.logback.slf4j" version=""/>