Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2017-03-22 10:13:48 -0400
committerGerrit Code Review @ Eclipse.org2017-03-24 06:55:32 -0400
commit172c9b0b63ba3be2c93ff710a8b7b4d288db633e (patch)
tree6eb2a5d47555479616ed503c322554f1ef9d6c6b /tests/junit/plugins/editor
parent28f1f7a11c28f8e416afdc7bac212f2275d0c85f (diff)
downloadorg.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.gz
org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.xz
org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.zip
[releng] [oxygen] Update guava dependencies to 21.0.0
- Update target definitions to the latest orbit repository and set guava dependecy to 21.0.0 - Update MANIFEST.MF guava version references to 21.0.0 throughout the repository - regenerate the target platforms - update the sdk feature.xml to point on guava 21.0.0.v20170206-1425 from guava 15.0.0.v201403281430 - modified manifests and java classes to fit the new API - ameneded the tests on guava version targets in the manifests Change-Id: I7d15679cd28585f6ea517466e70bc0848dd3179d Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'tests/junit/plugins/editor')
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java4
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
index 0ab3387c0db..f827b91b90e 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="3.6.0";resolution:=optional,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.resources;visibility:=reexport
Import-Package: com.ibm.icu.text;resolution:=optional,
org.eclipse.emf.ecore;version="2.10.0"
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
index bbf4199d68b..b21b030ff26 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
@@ -72,7 +72,7 @@ public class ManifestEditorTest {
assertThat(one(manifest, "org.eclipse.jface"), not(containsString(";")));
// And still just the one one Guava with its version
- assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"15.0.0\""));
+ assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"21.0.0\""));
}
@WithResource("manifest_project/META-INF/MANIFEST.MF")
@@ -434,7 +434,7 @@ public class ManifestEditorTest {
assertThat(manifest, hasItem(" org.eclipse.papyrus.eclipse.project.editors;bundle-version=\"[2.0.0,3.0.0)\","));
// This is now the last one (no trailing comma)
- assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"15.0.0\""));
+ assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"21.0.0\""));
}
@WithResource("manifest_project/META-INF/MANIFEST.MF")
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 1ba9ca7d298..f4e4a3a353a 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.navigator;bundle-version="3.5.0",
org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.2.0",

Back to the top