[351775] Picking up test bundles from platform 4.2 repositories.
diff --git a/releng/org.eclipse.uml2.releng.buckminster/uml2.rmap b/releng/org.eclipse.uml2.releng.buckminster/uml2.rmap
index dca305c..ebf83bf 100644
--- a/releng/org.eclipse.uml2.releng.buckminster/uml2.rmap
+++ b/releng/org.eclipse.uml2.releng.buckminster/uml2.rmap
@@ -7,10 +7,10 @@
<locator pattern="^org\.eclipse\.emf\.validation(?:\..+)?$" searchPathRef="emf.validation" />
<locator pattern="^org\.eclipse\.emf(?:\..+)?$" searchPathRef="emf" />
- <locator pattern="^org\.eclipse\.test$" searchPathRef="eclipse.test" />
- <locator pattern="^org\.eclipse\.ant\.optional\.junit$" searchPathRef="eclipse.test" />
+ <locator pattern="^org\.eclipse\.test$" searchPathRef="platform42" />
+ <locator pattern="^org\.eclipse\.ant\.optional\.junit$" searchPathRef="platform42" />
- <locator searchPathRef="platform" />
+ <locator searchPathRef="platform35" />
<searchPath name="uml2">
<provider componentTypes="osgi.bundle" readerType="git" source="true">
@@ -134,20 +134,7 @@
</provider>
</searchPath>
- <searchPath name="eclipse.test">
- <provider componentTypes="osgi.bundle" readerType="cvs" source="true" mutable="false">
- <uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,{0}">
- <bc:propertyRef key="buckminster.component" />
- </uri>
- </provider>
- <provider componentTypes="eclipse.feature" readerType="cvs" source="true" mutable="false">
- <uri format=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,{0}-feature">
- <bc:propertyRef key="buckminster.component" />
- </uri>
- </provider>
- </searchPath>
-
- <searchPath name="platform">
+ <searchPath name="platform35">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(&(resolve.target.platform=true)(build.type=N))">
<uri format="{0}/eclipse/updates/3.5">
<bc:propertyRef key="eclipse.download" />
@@ -170,6 +157,29 @@
</provider>
</searchPath>
+ <searchPath name="platform42">
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(&(resolve.target.platform=true)(build.type=N))">
+ <uri format="{0}/eclipse/updates/4.2">
+ <bc:propertyRef key="eclipse.download" />
+ </uri>
+ </provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(&(resolve.target.platform=true)(!(|(build.type=N)(build.type=S)(build.type=R))))">
+ <uri format="{0}/eclipse/updates/4.2">
+ <bc:propertyRef key="eclipse.download" />
+ </uri>
+ </provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(&(resolve.target.platform=true)(build.type=S))">
+ <uri format="{0}/eclipse/updates/4.2">
+ <bc:propertyRef key="eclipse.download" />
+ </uri>
+ </provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(&(resolve.target.platform=true)(build.type=R))">
+ <uri format="{0}/eclipse/updates/4.2">
+ <bc:propertyRef key="eclipse.download" />
+ </uri>
+ </provider>
+ </searchPath>
+
<property key="build.type" value="S" />
<property key="eclipse.download" value="http://download.eclipse.org" />
<property key="git.clones.root" value="${user.home}/git" />