- [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)

1 files changed, 42 insertions, 38 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>