diff options
6 files changed, 38 insertions, 52 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 d081f48e7a5..54b4e7356bc 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 @@ -158,7 +158,7 @@ <!-- EMFT MWE -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMFT MWE",0) -->
- <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">
+ <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201401280349/mwe">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -166,7 +166,7 @@ <!-- M2M QVT-OML -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("QVT Operational",0) -->
- <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">
+ <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201401290240">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -174,7 +174,7 @@ <!-- M2T Acceleo -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T ACCELEO",0) -->
- <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">
+ <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201401281458">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -190,7 +190,7 @@ <!-- EMF Facet -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201401091028/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -198,7 +198,7 @@ <!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MoDisco",0) -->
- <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">
+ <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201401201815/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -222,7 +222,7 @@ <!-- M2T Xpand -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T XPAND",0) -->
- <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201401280744/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -230,7 +230,7 @@ <!-- TMF Xtext, Xtend -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("TMF Xtext, Tools Xtend",0) -->
- <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">
+ <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201401280830/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -246,7 +246,7 @@ <!-- EMF Compare -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF COMPARE",0) -->
- <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">
+ <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201401281325">
<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 922c3bc9c11..eee1a2398f1 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 @@ -272,7 +272,7 @@ <!-- EMFT MWE -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMFT MWE",0) -->
- <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">
+ <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201401280349/mwe">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -280,7 +280,7 @@ <!-- M2M QVT-OML -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("QVT Operational",0) -->
- <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">
+ <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201401290240">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -295,7 +295,7 @@ <!-- M2T Acceleo -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T ACCELEO",0) -->
- <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">
+ <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201401281458">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -311,7 +311,7 @@ <!-- EMF Facet -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201401091028/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -319,7 +319,7 @@ <!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MoDisco",0) -->
- <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">
+ <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201401201815/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -343,7 +343,7 @@ <!-- M2T Xpand -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T XPAND",0) -->
- <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201401280744/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -351,7 +351,7 @@ <!-- TMF Xtext, Xtend -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("TMF Xtext, Tools Xtend",0) -->
- <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">
+ <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201401280830/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -367,7 +367,7 @@ <!-- EMF Compare -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF COMPARE",0) -->
- <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">
+ <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201401281325">
<!-- rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.0" -->
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
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 f2b487b62e6..b2878030faf 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 @@ -208,7 +208,7 @@ <!-- EMFT MWE -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMFT MWE",0) -->
- <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">
+ <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201401280349/mwe">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -216,7 +216,7 @@ <!-- M2M QVT-OML -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("QVT Operational",0) -->
- <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">
+ <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201401290240">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -232,7 +232,7 @@ <!-- M2T Acceleo -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T ACCELEO",0) -->
- <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">
+ <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201401281458">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -248,7 +248,7 @@ <!-- EMF Facet -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201401091028/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -256,7 +256,7 @@ <!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MoDisco",0) -->
- <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">
+ <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201401201815/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -280,7 +280,7 @@ <!-- M2T Xpand -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T XPAND",0) -->
- <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201401280744/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -288,7 +288,7 @@ <!-- TMF Xtext, Xtend -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("TMF Xtext, Tools Xtend",0) -->
- <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">
+ <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201401280830/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -304,7 +304,7 @@ <!-- EMF Compare -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF COMPARE",0) -->
- <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">
+ <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201401281325">
<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 ec849cfc1ef..5167609cf1a 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 @@ -412,7 +412,7 @@ <!-- EMFT MWE -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMFT MWE",0) -->
- <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">
+ <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201401280349/mwe">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -420,7 +420,7 @@ <!-- M2M QVT-OML -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("QVT Operational",0) -->
- <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">
+ <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201401290240">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -436,7 +436,7 @@ <!-- M2T Acceleo -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T ACCELEO",0) -->
- <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">
+ <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201401281458">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -452,7 +452,7 @@ <!-- EMF Facet -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201401091028/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -460,7 +460,7 @@ <!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MoDisco",0) -->
- <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">
+ <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201401201815/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -484,7 +484,7 @@ <!-- M2T Xpand -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("M2T XPAND",0) -->
- <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201401280744/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -492,7 +492,7 @@ <!-- TMF Xtext, Xtend -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("TMF Xtext, Tools Xtend",0) -->
- <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">
+ <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201401280830/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -508,7 +508,7 @@ <!-- EMF Compare -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF COMPARE",0) -->
- <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">
+ <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201401281325">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml index 37af39613b7..1ce8d4a8c48 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml @@ -61,7 +61,7 @@ http://www.eclipse.org/legal/epl-v10.html <import feature="org.eclipse.mylyn_feature"/>
<import feature="org.eclipse.ocl.all.sdk"/>
<import feature="org.eclipse.emf.cdo.dawn.sdk"/>
- <import feature="org.eclipse.papyrus.sdk.feature"/>
+ <import feature="org.eclipse.papyrus.sdk.sources.feature"/>
<import feature="org.eclipse.papyrus.extra.sources.feature"/>
<import feature="org.eclipse.pde"/>
<import feature="org.eclipse.rcp"/>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml index 5f7aec84040..2c0ac3b2be5 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml @@ -50,15 +50,15 @@ <url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201312170329</url> </repository> <repository> + <id>uml-5.0</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0milestone</url> + </repository> + <repository> <id>eclipse-update</id> <layout>p2</layout> <url>http://download.eclipse.org/eclipse/updates/4.4</url> </repository> - <!-- <repository> --> - <!-- <id>subversive 0.7</id> --> - <!-- <layout>p2</layout> --> - <!-- <url>http://download.eclipse.org/technology/subversive/0.7/update-site/</url> --> - <!-- </repository> --> </repositories> <build> <plugins> @@ -100,11 +100,6 @@ <ws>win32</ws> <arch>x86</arch> </environment> - <!-- <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> --> </environments> </configuration> </plugin> @@ -122,15 +117,6 @@ </execution> </executions> </plugin> - <!-- <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-compiler-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <compilerArgument>-err:-forbidden</compilerArgument> - <compilerArgument>-warn:+forbidden</compilerArgument> - </configuration> - </plugin> --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> |