diff options
| author | ptessier | 2014-03-10 14:16:20 +0000 |
|---|---|---|
| committer | ptessier | 2014-03-10 14:16:20 +0000 |
| commit | 1118d9b70850d945c3b0d89919c4100db64b9424 (patch) | |
| tree | 34384ea38c796278ad49226b576db6d7fc8f2c41 /releng | |
| parent | aadd70e59010f365353242f60f7f153d8c19f76d (diff) | |
| parent | e9eb2ae9d1d16b7119826e6bbce5da2955533d99 (diff) | |
| download | org.eclipse.papyrus-1118d9b70850d945c3b0d89919c4100db64b9424.tar.gz org.eclipse.papyrus-1118d9b70850d945c3b0d89919c4100db64b9424.tar.xz org.eclipse.papyrus-1118d9b70850d945c3b0d89919c4100db64b9424.zip | |
Merge branch 'master' into bugs/386118-emf-facet
Conflicts:
plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java
Diffstat (limited to 'releng')
5 files changed, 9 insertions, 4 deletions
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap index b002ca5196b..8aa2f8c8269 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap @@ -182,7 +182,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap index 4611782e890..ac3db8a1754 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap @@ -303,7 +303,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap index 414646c8eb3..7c81a76828c 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap @@ -254,7 +254,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap index 73318474f1b..ad798b3f153 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap @@ -451,7 +451,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml index a6349e58396..94b2523b4d2 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml @@ -40,6 +40,11 @@ <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20140129-1205</url> </repository> <repository> + <id>uml-5</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0-I-builds/I201403011958</url> + </repository> + <repository> <id>eclipse-update</id> <layout>p2</layout> <url>http://download.eclipse.org/eclipse/updates/4.4</url> |