Author: nickboldt
Date: 2011-11-07 19:14:18 -0500 (Mon, 07 Nov 2011)
New Revision: 36211
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
Log:
reorder target platforms to be more consistent between jbt and jbds; also add mylyn and
jira support per JBIDE-9351, JBIDE-10094
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-11-08 00:14:10 UTC (rev 36210)
+++ trunk/build/target-platform/multiple.target 2011-11-08 00:14:18 UTC (rev 36211)
@@ -57,7 +57,7 @@
<!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group"
version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group"
version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group"
version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group"
version="0.8.0.v20111101-1551-H90-CI"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group"
version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
@@ -265,20 +265,20 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui"
version="3.0.1.v20110812"/>
<unit id="com.atlassian.connector.eclipse.ui"
version="3.0.1.v20110812"/>
<unit id="com.thoughtworks.xstream"
version="1.3.0.v20100826-1640"/>
- <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110602-0100"/>
<unit id="org.eclipse.core.runtime"
version="3.7.0.v20110110"/>
<unit id="org.eclipse.core.resources"
version="3.7.100.v20110125b"/>
- <unit id="org.eclipse.ui.ide"
version="3.7.0.I20110519-0100"/>
- <unit id="org.eclipse.ui.workbench.texteditor"
version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.ui.ide"
version="3.7.0.v20110809-1737"/>
+ <unit id="org.eclipse.ui.workbench.texteditor"
version="3.7.0.v20110306-1700"/>
<unit id="org.eclipse.jface.text"
version="3.7.0.v20110505-0800"/>
<unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
<unit id="org.eclipse.core.filesystem"
version="1.3.100.v20110117"/>
- <unit id="org.eclipse.ui.forms"
version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.forms"
version="3.5.100.v20110221"/>
<unit id="org.eclipse.ui.editors"
version="3.7.0.v20110517-0800"/>
<unit id="org.eclipse.team.core"
version="3.6.0.I20110125-0640"/>
<unit id="org.eclipse.team.ui"
version="3.6.100.I20110525-0800"/>
<unit id="org.eclipse.jface"
version="3.7.0.I20110522-1430"/>
- <unit id="org.eclipse.compare"
version="3.5.200.I20101206-1300"/>
+ <unit id="org.eclipse.compare"
version="3.5.200.I20110208-0800"/>
<unit id="org.apache.axis" version="1.4.0.v201005080400"/>
<unit id="org.apache.commons.logging"
version="1.0.4.v201101211617"/>
<unit id="org.apache.commons.io"
version="2.0.1.v201105210651"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-11-08 00:14:10 UTC (rev
36210)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-11-08 00:14:18 UTC (rev
36211)
@@ -56,26 +56,6 @@
<iu id="org.hamcrest.text" version=""/>
<iu id="org.hamcrest.library" version=""/>
<iu id="org.hamcrest.integration" version=""/>
-<iu id="com.sun.syndication" version=""/>
-<iu id="org.eclipse.mylyn.commons.core" version=""/>
-<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
-<iu id="org.eclipse.mylyn.discovery.core" version=""/>
-<iu id="org.eclipse.mylyn.commons.ui" version=""/>
-<iu id="org.eclipse.mylyn.commons.net" version=""/>
-<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
-<iu id="org.apache.commons.lang" version=""/>
-<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group"
version=""/>
-<iu id="org.eclipse.mylyn.ide_feature.feature.group"
version=""/>
-<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.java_feature.feature.group"
version=""/>
-<iu id="org.eclipse.mylyn.context_feature.feature.group"
version=""/>
-<iu id="org.eclipse.mylyn.pde_feature.feature.group"
version=""/>
-<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.team_feature.feature.group"
version=""/>
-<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
-<iu id="org.eclipse.mylyn.wikitext_feature.feature.group"
version=""/>
<iu id="org.apache.lucene.highlighter" version=""/>
<iu id="org.apache.lucene.memory" version=""/>
<iu id="org.apache.lucene.misc" version=""/>
@@ -85,7 +65,6 @@
<iu id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group"
version=""/>
<iu id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group"
version=""/>
<iu id="org.eclipse.bpel.feature.feature.group" version=""/>
-<iu id="org.eclipse.graphiti.feature.feature.group"
version=""/>
<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
<iu id="org.eclipse.emf.validation.feature.group" version=""/>
<iu id="org.eclipse.emf.transaction.feature.group"
version=""/>
@@ -101,31 +80,24 @@
<iu id="org.eclipse.emf.edit.feature.group" version=""/>
<iu id="org.eclipse.xsd.edit.feature.group" version=""/>
<iu id="org.eclipse.xsd.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.eclipse.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.eclipse.gef.feature.group"
version=""/>
-<iu id="org.eclipse.swtbot.ide.feature.group" version=""/>
-<iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group"
version=""/>
-<iu id="org.eclipse.swtbot.feature.group" version=""/>
-<iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group"
version=""/>
-<iu id="org.eclipse.birt.feature.group" version=""/>
-<iu id="org.eclipse.birt.integration.wtp.feature.group"
version=""/>
-<iu id="org.eclipse.birt.chart.feature.group" version=""/>
-<iu id="org.eclipse.birt.chart.integration.wtp.feature.group"
version=""/>
+<iu id="org.eclipse.graphiti.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=""/>
+<iu id="org.eclipse.uml2.feature.group" version=""/>
<iu id="com.ibm.icu.base.feature.group" version=""/>
-<iu id="org.eclipse.equinox.server.core.feature.group"
version=""/>
-<iu id="org.eclipse.cvs.feature.group" version=""/>
-<iu id="org.eclipse.help.feature.group" version=""/>
-<iu id="org.eclipse.jdt.feature.group" version=""/>
<iu id="org.eclipse.platform.feature.group" version=""/>
<iu id="org.eclipse.platform.ide" version=""/>
-<iu id="org.eclipse.equinox.executable.feature.group"
version=""/>
<iu id="org.eclipse.platform.sdk" version=""/>
-<iu id="org.eclipse.pde.feature.group" version=""/>
<iu id="org.eclipse.sdk.feature.group" version=""/>
<iu id="org.eclipse.releng.tools.feature.group" version=""/>
<iu id="org.eclipse.sdk.ide" version=""/>
<iu id="org.eclipse.sdk.examples.feature.group" version=""/>
<iu id="org.eclipse.sdk.examples.source.feature.group"
version=""/>
+<iu id="org.eclipse.cvs.feature.group" version=""/>
+<iu id="org.eclipse.jdt.feature.group" version=""/>
+<iu id="org.eclipse.equinox.server.core.feature.group"
version=""/>
+<iu id="org.eclipse.equinox.executable.feature.group"
version=""/>
<iu id="org.eclipse.equinox.compendium.sdk.feature.group"
version=""/>
<iu id="org.eclipse.equinox.core.sdk.feature.group"
version=""/>
<iu id="org.eclipse.equinox.p2.discovery.feature.feature.group"
version=""/>
@@ -136,10 +108,12 @@
<iu id="org.eclipse.equinox.weaving.sdk.feature.group"
version=""/>
<iu id="org.eclipse.equinox.server.jetty.feature.group"
version=""/>
<iu id="org.eclipse.equinox.server.p2.feature.group"
version=""/>
-<iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group"
version=""/>
<iu id="org.eclipse.equinox.server.servletbridge.feature.group"
version=""/>
<iu id="org.eclipse.equinox.server.simple.feature.group"
version=""/>
<iu id="org.eclipse.rcp.feature.group" version=""/>
+<iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group"
version=""/>
+<iu id="org.eclipse.pde.feature.group" version=""/>
+<iu id="org.eclipse.help.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group"
version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group"
version=""/>
<iu id="org.eclipse.datatools.connectivity.oda.feature.feature.group"
version=""/>
@@ -174,10 +148,6 @@
<iu id="org.eclipse.datatools.common.doc.user.feature.group"
version=""/>
<iu id="org.eclipse.datatools.connectivity.doc.user.feature.group"
version=""/>
<iu id="org.eclipse.datatools.sqltools.doc.user.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=""/>
-<iu id="org.eclipse.uml2.feature.group" version=""/>
<iu id="org.eclipse.rse.feature.group" version=""/>
<iu id="org.eclipse.rse.ssh.feature.group" version=""/>
<iu id="org.eclipse.rse.terminals.feature.group" version=""/>
@@ -236,6 +206,91 @@
<iu id="org.eclipse.egit.feature.group" version=""/>
<iu id="org.eclipse.egit.mylyn.feature.group" version=""/>
<iu id="org.eclipse.mylyn.github.feature.feature.group"
version=""/>
+<iu id="com.sun.syndication" version=""/>
+<iu id="org.eclipse.mylyn.commons.core" version=""/>
+<iu id="org.eclipse.mylyn.discovery.ui" version=""/>
+<iu id="org.eclipse.mylyn.discovery.core" version=""/>
+<iu id="org.eclipse.mylyn.commons.ui" version=""/>
+<iu id="org.eclipse.mylyn.commons.net" version=""/>
+<iu id="org.eclipse.mylyn.commons.screenshots" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
+<iu id="org.eclipse.mylyn_feature.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.ide_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.commons.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.context_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.bugzilla_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.java_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.pde_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.team_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.wikitext_feature.feature.group"
version=""/>
+<iu id="org.eclipse.mylyn.cvs.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.git.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.versions.feature.group" version=""/>
+<iu id="org.eclipse.mylyn.tasks.ui" version=""/>
+<iu id="org.eclipse.mylyn.tasks.core" version=""/>
+<iu id="org.eclipse.mylyn.tasks.bugs" version=""/>
+<iu id="com.atlassian.connector.commons" version=""/>
+<iu id="com.atlassian.connector.eclipse.bamboo.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.bamboo.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.branding.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.commons.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.commons.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.crucible.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.crucible.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.cvs.core" version=""/>
+<iu id="com.atlassian.connector.eclipse.cvs.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.directclickthrough.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.fisheye.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.fisheye.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.help" version=""/>
+<iu id="com.atlassian.connector.eclipse.jira.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.jira.ui" version=""/>
+<iu id="com.atlassian.connector.eclipse.monitor.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.monitor.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.subclipse.core"
version=""/>
+<iu id="com.atlassian.connector.eclipse.subclipse.ui"
version=""/>
+<iu id="com.atlassian.connector.eclipse.ui" version=""/>
+<iu id="com.thoughtworks.xstream" version=""/>
+<iu id="org.eclipse.ui" version=""/>
+<iu id="org.eclipse.core.runtime" version=""/>
+<iu id="org.eclipse.core.resources" version=""/>
+<iu id="org.eclipse.ui.ide" version=""/>
+<iu id="org.eclipse.ui.workbench.texteditor" version=""/>
+<iu id="org.eclipse.jface.text" version=""/>
+<iu id="org.eclipse.osgi" version=""/>
+<iu id="org.eclipse.core.filesystem" version=""/>
+<iu id="org.eclipse.ui.forms" version=""/>
+<iu id="org.eclipse.ui.editors" version=""/>
+<iu id="org.eclipse.team.core" version=""/>
+<iu id="org.eclipse.team.ui" version=""/>
+<iu id="org.eclipse.jface" version=""/>
+<iu id="org.eclipse.compare" version=""/>
+<iu id="org.apache.axis" version=""/>
+<iu id="org.apache.commons.logging" version=""/>
+<iu id="org.apache.commons.io" version=""/>
+<iu id="org.apache.commons.httpclient" version=""/>
+<iu id="org.apache.commons.lang" version=""/>
+<iu id="org.apache.commons.codec" version=""/>
+<iu id="org.jdom_jaxen" version=""/>
+<iu id="org.mortbay.jetty.server" version=""/>
+<iu id="org.mortbay.jetty.util" version=""/>
+<iu id="org.apache.jasper" version=""/>
+<iu id="org.joda.time" version=""/>
+<iu id="javax.servlet" version=""/>
+<iu id="javax.servlet.jsp" version=""/>
+<iu id="javax.xml.rpc" version=""/>
+<iu id="javax.el" version=""/>
+<iu id="org.eclipse.swtbot.eclipse.feature.group" version=""/>
+<iu id="org.eclipse.swtbot.eclipse.gef.feature.group"
version=""/>
+<iu id="org.eclipse.swtbot.ide.feature.group" version=""/>
+<iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group"
version=""/>
+<iu id="org.eclipse.swtbot.feature.group" version=""/>
+<iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group"
version=""/>
+<iu id="org.eclipse.birt.feature.group" version=""/>
+<iu id="org.eclipse.birt.integration.wtp.feature.group"
version=""/>
+<iu id="org.eclipse.birt.chart.feature.group" version=""/>
+<iu id="org.eclipse.birt.chart.integration.wtp.feature.group"
version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group"
version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-11-08 00:14:10 UTC (rev 36210)
+++ trunk/build/target-platform/unified.target 2011-11-08 00:14:18 UTC (rev 36211)
@@ -57,7 +57,7 @@
<!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group"
version="0.5.0.v20110915-1141-H87-CI"/>
<unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group"
version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group"
version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group"
version="0.8.0.v20111101-1551-H90-CI"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group"
version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
@@ -265,20 +265,20 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui"
version="3.0.1.v20110812"/>
<unit id="com.atlassian.connector.eclipse.ui"
version="3.0.1.v20110812"/>
<unit id="com.thoughtworks.xstream"
version="1.3.0.v20100826-1640"/>
- <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.ui" version="3.7.0.I20110602-0100"/>
<unit id="org.eclipse.core.runtime"
version="3.7.0.v20110110"/>
<unit id="org.eclipse.core.resources"
version="3.7.100.v20110125b"/>
- <unit id="org.eclipse.ui.ide"
version="3.7.0.I20110519-0100"/>
- <unit id="org.eclipse.ui.workbench.texteditor"
version="3.7.0.v20110124-0100"/>
+ <unit id="org.eclipse.ui.ide"
version="3.7.0.v20110809-1737"/>
+ <unit id="org.eclipse.ui.workbench.texteditor"
version="3.7.0.v20110306-1700"/>
<unit id="org.eclipse.jface.text"
version="3.7.0.v20110505-0800"/>
<unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
<unit id="org.eclipse.core.filesystem"
version="1.3.100.v20110117"/>
- <unit id="org.eclipse.ui.forms"
version="3.5.100.v20101220"/>
+ <unit id="org.eclipse.ui.forms"
version="3.5.100.v20110221"/>
<unit id="org.eclipse.ui.editors"
version="3.7.0.v20110517-0800"/>
<unit id="org.eclipse.team.core"
version="3.6.0.I20110125-0640"/>
<unit id="org.eclipse.team.ui"
version="3.6.100.I20110525-0800"/>
<unit id="org.eclipse.jface"
version="3.7.0.I20110522-1430"/>
- <unit id="org.eclipse.compare"
version="3.5.200.I20101206-1300"/>
+ <unit id="org.eclipse.compare"
version="3.5.200.I20110208-0800"/>
<unit id="org.apache.axis" version="1.4.0.v201005080400"/>
<unit id="org.apache.commons.logging"
version="1.0.4.v201101211617"/>
<unit id="org.apache.commons.io"
version="2.0.1.v201105210651"/>