Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcdamus2013-03-01 13:46:59 +0000
committercdamus2013-03-01 13:46:59 +0000
commitb9498eb507a9d6ebae71d3d39e08ae213b765be4 (patch)
treec00dda5440770ef78da9f86c030036f6881d65ac
parent9e12335f38763e87a68e44b579bea7e9acadd5cf (diff)
downloadorg.eclipse.papyrus-b9498eb507a9d6ebae71d3d39e08ae213b765be4.tar.gz
org.eclipse.papyrus-b9498eb507a9d6ebae71d3d39e08ae213b765be4.tar.xz
org.eclipse.papyrus-b9498eb507a9d6ebae71d3d39e08ae213b765be4.zip
Import specifically the Guava package version for which Papyrus has a CQ.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=290952
-rw-r--r--plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF8
-rw-r--r--plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF2
-rw-r--r--tests/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF6
-rw-r--r--tests/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF6
5 files changed, 12 insertions, 12 deletions
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index e563622e6f4..68c062f11f5 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -22,10 +22,10 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Import-Package: com.google.common.base;version="10.0.0",
- com.google.common.cache;version="10.0.0",
- com.google.common.collect;version="10.0.0",
- com.google.common.eventbus;version="10.0.0"
+Import-Package: com.google.common.base;version="10.0.1",
+ com.google.common.cache;version="10.0.1",
+ com.google.common.collect;version="10.0.1",
+ com.google.common.eventbus;version="10.0.1"
Export-Package: org.eclipse.papyrus.cdo.internal.ui,
org.eclipse.papyrus.cdo.internal.ui.actions,
org.eclipse.papyrus.cdo.internal.ui.adapters,
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
index d9ac409ef60..5957e72d83e 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Bundle-Localization: plugin
Export-Package: org.eclipse.papyrus.cdo.uml.diagram.internal.ui,
org.eclipse.papyrus.cdo.uml.diagram.internal.ui.handlers,
org.eclipse.papyrus.cdo.uml.diagram.internal.ui.wizards
-Import-Package: com.google.common.base,
+Import-Package: com.google.common.base;version="10.0.1",
com.google.common.eventbus;version="10.0.1"
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 79222a204d7..0fb3d17fb4d 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Import-Package: com.google.common.collect;version="10.0.0"
+Import-Package: com.google.common.collect;version="10.0.1"
diff --git a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index 48883e0d5da..492f100c10a 100644
--- a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="0.10.0";visibility:
org.eclipse.emf.cdo.server.net4j;bundle-version="[4.1.0,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)"
-Import-Package: com.google.common.base;version="10.0.0",
- com.google.common.collect;version="10.0.0",
- com.google.common.io;version="10.0.0"
+Import-Package: com.google.common.base;version="10.0.1",
+ com.google.common.collect;version="10.0.1",
+ com.google.common.io;version="10.0.1"
Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,
org.eclipse.papyrus.cdo.core.tests,
org.eclipse.papyrus.cdo.internal.core.tests
diff --git a/tests/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/tests/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
index fe863b80e25..9fd2f4af786 100644
--- a/tests/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Import-Package: com.google.common.base;version="10.0.0",
- com.google.common.cache;version="10.0.0",
- com.google.common.collect;version="10.0.0"
+Import-Package: com.google.common.base;version="10.0.1",
+ com.google.common.cache;version="10.0.1",
+ com.google.common.collect;version="10.0.1"

Back to the top