Bug 325776 - [releng] S-4.1M2-201009161954 doesn't include eclipse 3.7 M2
Trying a merge from 3.7
diff --git a/org.eclipse.e4.sdk/maps/feature.map b/org.eclipse.e4.sdk/maps/feature.map
index 35aedf5..bb0f8d4 100755
--- a/org.eclipse.e4.sdk/maps/feature.map
+++ b/org.eclipse.e4.sdk/maps/feature.map
@@ -2,9 +2,9 @@
feature@org.eclipse.sdk=v20100726,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
plugin@org.eclipse.sdk=v20100816-1230,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-feature@org.eclipse.jdt=v20100526-0800,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature@org.eclipse.jdt=v20100824-0800,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
-feature@org.eclipse.pde=v20100525,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature@org.eclipse.pde=v20100803,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
feature@org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20091027-1300,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature
feature@org.eclipse.pde.api.tools.ee.cdcfoundation11_feature=v20091027-1300,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature
feature@org.eclipse.pde.api.tools.ee.j2se12_feature=v20091027-1300,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
@@ -26,18 +26,17 @@
feature@org.eclipse.sdk.tests=v20100608,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
plugin@org.eclipse.sdk.tests=v20060605,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-feature@org.eclipse.equinox.sdk=v20100608,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+feature@org.eclipse.equinox.sdk=v20100910,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
feature@org.eclipse.cvs=v20100427,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
-plugin@org.eclipse.cvs=v20100608,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
+plugin@org.eclipse.cvs=v20100414,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
-feature@org.eclipse.help=v20100608,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
-
+feature@org.eclipse.help=v20100427,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
feature@org.eclipse.equinox.p2.user.ui=v20100503,:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
feature@org.eclipse.equinox.p2.sdk=CVS,tag=v20100503,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
feature@org.eclipse.equinox.p2.discovery.feature=CVS,tag=v20100510,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
-feature@org.eclipse.equinox.core.sdk=CVS,tag=v20100503,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
+feature@org.eclipse.equinox.core.sdk=CVS,tag=v20100707,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
feature@org.eclipse.equinox.compendium.sdk=CVS,tag=v20100421,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
feature@org.eclipse.equinox.serverside.sdk=CVS,tag=v20100421,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
@@ -49,4 +48,7 @@
feature@org.eclipse.equinox.weaving.sdk=CVS,tag=v20100421,cvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/weaving/features/org.eclipse.equinox.weaving.sdk
-feature@org.eclipse.pde.api.tools.ee.fragments=v20100608,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
\ No newline at end of file
+feature@org.eclipse.pde.api.tools.ee.fragments=v20100427,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
+
+feature@org.eclipse.pde.junit.runtime.addon=v20100913,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.junit.runtime.addon
+feature@org.eclipse.pde.junit.runtime.standalone=v20100913,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.junit.runtime.standalone
\ No newline at end of file
