Merge "Bug 396457 - [Releng][Maven] Create a build based on tycho Hook the following features in the build: * org.eclipse.ecf.sharedobject.feature * org.eclipse.ecf.provider.generic.feature * org.eclipse.ecf.docshare.feature * org.eclipse.ecf.datashare.feature * org.eclipse.ecf.presence.feature"
diff --git a/releng/org.eclipse.ecf.releng.bm/ECF3-12Baseline.target b/releng/org.eclipse.ecf.releng.bm/ECF3-12Baseline.target
index 0eeb022..2f19bf9 100644
--- a/releng/org.eclipse.ecf.releng.bm/ECF3-12Baseline.target
+++ b/releng/org.eclipse.ecf.releng.bm/ECF3-12Baseline.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="ECF3-12Baseline" sequenceNumber="6">
+<?pde version="3.8"?><target includeMode="feature" name="ECF3-12Baseline" sequenceNumber="8">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.ecf.core.feature.group" version="3.12.0.v20151130-0157"/>
diff --git a/releng/org.eclipse.ecf.releng.bm/ecf.rmap b/releng/org.eclipse.ecf.releng.bm/ecf.rmap
index b34f15e..3c8f241 100644
--- a/releng/org.eclipse.ecf.releng.bm/ecf.rmap
+++ b/releng/org.eclipse.ecf.releng.bm/ecf.rmap
@@ -10,6 +10,7 @@
<rm:locator pattern="^org\.eclipse\.emf(\..+)?" searchPathRef="org.eclipse.emf"/>
<rm:locator pattern="^org\.eclipse\.net4j(\..+)?" searchPathRef="org.eclipse.emf"/>
<rm:locator pattern="^org\.eclipse\.xsd(\..+)?" searchPathRef="org.eclipse.emf"/>
+ <rm:locator pattern="^org\.eclipse\.paho(\..+)?" searchPathRef="org.eclipse.paho"/>
<rm:locator pattern="^org\.eclipse\.swtbot(\..+)?" searchPathRef="org.eclipse.swtbot"/>
<rm:locator pattern="^com\.mountainminds\.eclemma(\..+)?" searchPathRef="com.mountainminds.eclemma"/>
<rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="org.eclipse"/>
@@ -117,6 +118,14 @@
-->
</rm:searchPath>
+ <rm:searchPath name="org.eclipse.paho">
+ <rm:provider componentTypes="osgi.bundle,eclipse.feature,buckminster" readerType="p2" source="false" mutable="false">
+ <rm:property key="buckminster.source" value="false"/>
+ <rm:property key="buckminster.mutable" value="false"/>
+ <rm:uri format="http://download.eclipse.org/paho/releases/1.1.0/Java/"/>
+ </rm:provider>
+ </rm:searchPath>
+
<rm:searchPath name="org.pluginbuilder">
<rm:provider componentTypes="osgi.bundle,eclipse.feature,buckminster" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
@@ -154,6 +163,11 @@
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
+ <rm:uri format="http://download.eclipse.org/paho/releases/1.1.0/Java/"/>
+ </rm:provider>
+ <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
+ <rm:property key="buckminster.source" value="false"/>
+ <rm:property key="buckminster.mutable" value="false"/>
<rm:uri format="http://ftp.osuosl.org/pub/eclipse/tools/orbit/downloads/drops/R20120526062928/repository/"/>
</rm:provider>
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
