[312486] Build against the latest dependencies.
diff --git a/releng/org.eclipse.emf.ecoretools.releng.buckminster/promoter.ant b/releng/org.eclipse.emf.ecoretools.releng.buckminster/promoter.ant
index cde7d26..9e398b4 100644
--- a/releng/org.eclipse.emf.ecoretools.releng.buckminster/promoter.ant
+++ b/releng/org.eclipse.emf.ecoretools.releng.buckminster/promoter.ant
@@ -19,11 +19,6 @@
<entry key="build.id" value="${build.id}" />
<entry key="hudson.build.id" value="${hudson.build.id}" />
</propertyfile>
-
- <!-- diagnostics
- <property environment="env." />
- <echoproperties destfile="${promoter.setup.directory}/all.properties" />
- -->
</target>
<target name="-locate.launcher.jar" unless="launcher.jar">
@@ -209,6 +204,8 @@
</target>
<target name="-publish.build.repository" if="composite.repository.base">
+ <fail message="repository.base property must be defined" unless="repository.base" />
+
<property name="composite.repository.directory" location="${downloads.area}/updates/${composite.repository.base}" />
<property name="composite.repository.url" value="file:/${composite.repository.directory}" />
<property name="build.repository.directory" location="${composite.repository.directory}/${saved.build.id}" />
@@ -216,11 +213,9 @@
<delete dir="${build.repository.directory}" />
<mkdir dir="${build.repository.directory}" />
- <unzip dest="${build.repository.directory}">
- <fileset dir="${packages.directory}">
- <filename name="emf-xsd-Update*.zip" />
- </fileset>
- </unzip>
+ <copy todir="${build.repository.directory}">
+ <fileset dir="${build.root}/archive/${repository.base}" />
+ </copy>
<p2.composite.repository destination="${composite.repository.url}">
<add>
diff --git a/releng/org.eclipse.emf.ecoretools.releng.buckminster/releng/ecoretools-platform.rmap b/releng/org.eclipse.emf.ecoretools.releng.buckminster/releng/ecoretools-platform.rmap
index f1dffbf..40a54cf 100644
--- a/releng/org.eclipse.emf.ecoretools.releng.buckminster/releng/ecoretools-platform.rmap
+++ b/releng/org.eclipse.emf.ecoretools.releng.buckminster/releng/ecoretools-platform.rmap
@@ -4,8 +4,16 @@
>
<locator pattern="^org\.eclipse\.emf\.ecoretools\.releng\.buckminster$" searchPathRef="local.releng" />
<locator pattern="^org\.eclipse\.emf(?:\..+)?$" searchPathRef="emf" failOnError="false" />
+ <locator pattern="^org\.eclipse\.emf(?:\..+)?$" searchPathRef="modeling" />
+ <locator pattern="^org\.eclipse\.gef(?:\..+)?$" searchPathRef="gef" />
<locator pattern="^org\.eclipse\.gmf(?:\..+)?$" searchPathRef="gmf" />
- <locator searchPathRef="eclipse.helios" />
+ <locator pattern="^org\.eclipse\.ocl(?:\..+)?$" searchPathRef="ocl" />
+ <locator pattern="^org\.eclipse\.draw2d$" searchPathRef="gef" />
+ <locator pattern="^org\.w3c(?:\..+)?$" searchPathRef="gmf" />
+ <locator pattern="^javax\.xml$" searchPathRef="gmf" />
+ <locator pattern="^lpg\.runtime\.java$" searchPathRef="ocl" />
+ <locator pattern="^org\.apache(?:\..+)?$" searchPathRef="gmf" failOnError="false" />
+ <locator searchPathRef="platform" />
<searchPath name="local.releng">
<provider componentTypes="buckminster" readerType="local" source="true" mutable="false">
@@ -24,6 +32,23 @@
</provider>
</searchPath>
+ <searchPath name="modeling">
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <uri format="{0}/modeling/emf/updates/milestones">
+ <bc:propertyRef key="eclipse.download" />
+ </uri>
+ </provider>
+ </searchPath>
+
+
+ <searchPath name="gef">
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+ <uri format="{0}/tools/gef/updates/milestones">
+ <bc:propertyRef key="eclipse.download" />
+ </uri>
+ </provider>
+ </searchPath>
+
<searchPath name="gmf">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<uri format="{0}/modeling/gmf/updates/milestones">
@@ -32,14 +57,17 @@
</provider>
</searchPath>
- <searchPath name="eclipse.helios">
+ <searchPath name="ocl">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <uri format="{0}/eclipse/updates/3.6milestones">
+ <uri format="{0}/modeling/mdt/ocl/3_0/updates/milestones">
<bc:propertyRef key="eclipse.download" />
</uri>
</provider>
+ </searchPath>
+
+ <searchPath name="platform">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <uri format="{0}/releases/helios">
+ <uri format="{0}/eclipse/updates/3.6milestones">
<bc:propertyRef key="eclipse.download" />
</uri>
</provider>
