Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-06-03 08:18:28 -0400
committerCamille Letavernier2014-06-03 08:18:28 -0400
commit9106a526ad2524cab169c67e72aebe5c983fd8d9 (patch)
treeab7be8805e3ca9ac3de7df6eb525d647bbc30315
parentac84aa7e39e56bbbaeb60f40e6aa3183f81b2df9 (diff)
downloadorg.eclipse.papyrus-9106a526ad2524cab169c67e72aebe5c983fd8d9.tar.gz
org.eclipse.papyrus-9106a526ad2524cab169c67e72aebe5c983fd8d9.tar.xz
org.eclipse.papyrus-9106a526ad2524cab169c67e72aebe5c983fd8d9.zip
- [Releng] Update rmaps (Luna RC3)
- [Releng - TMP] Force inclusion of Guava 12 in the extra-tests, to be compatible with EMF Compare and Acceleo (Temporary workaround, until RC3 extends the compatibility range)
-rw-r--r--features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml80
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap4
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap4
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap4
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap4
5 files changed, 50 insertions, 46 deletions
diff --git a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
index 80f0e1b3018..294b9ff700b 100644
--- a/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
+++ b/features/papyrus-tests-extra-features/org.eclipse.papyrus.tests.extra.feature/feature.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.papyrus.tests.extra.feature"
- label="Papyrus extra-plugins tests Feature"
- version="1.0.0.qualifier"
- provider-name="Eclipse Modeling Project">
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.tests.extra.feature"
+ label="Papyrus extra-plugins tests Feature"
+ version="1.0.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
Copyright (c) 2011 CEA LIST
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License
v1.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="license.html">
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="license.html">
Eclipse Foundation Software User Agreement
March 17, 2005
@@ -52,29 +52,33 @@ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country&apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
- </license>
-
- <includes
- id="org.eclipse.papyrus.tests.extra.cdo.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.papyrus.tests.extra.codegen.cpp.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.papyrus.tests.extra"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.papyrus.bundles.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+ </license>
+
+ <includes
+ id="org.eclipse.papyrus.tests.extra.cdo.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.tests.extra.codegen.cpp.feature"
+ version="0.0.0"/>
+
+ <requires>
+ <import plugin="com.google.guava" version="12.0.0" match="compatible"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.papyrus.tests.extra"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.bundles.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
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 27004a5c844..4feb7d2abfb 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
@@ -189,7 +189,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/S201405261444">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201406021209">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -221,7 +221,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/S201405200738/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/releases/R201406030414/">
<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 9dbb0f31caf..eaabe4dfe14 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/S201405261444">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201406021209">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -335,7 +335,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/S201405200738/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/releases/R201406030414/">
<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 29ca01a9cc2..0580c55e7f5 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/S201405261444">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201406021209">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -278,7 +278,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/S201405200738/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/releases/R201406030414/">
<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 fcb4077864c..d0e6d7700ce 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
@@ -457,7 +457,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/S201405261444">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201406021209">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -481,7 +481,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/S201405200738/">
+ <rm:uri format="{0}/modeling/m2t/xpand/updates/releases/R201406030414/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>

Back to the top