Fix Guava and Gson version (#1398)

GoogleCloudPlatform · Feb 13, 2017 · 440280b · 440280b
1 parent 5bdf0c1
commit 440280b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.compat/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.compat/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.google.cloud.tools.eclipse.appengine.compat
 Import-Package: com.google.cloud.tools.eclipse.util,
- com.google.common.annotations,
- com.google.common.collect;version="20.0.0",
+ com.google.common.annotations;version="[20.0.0,21.0.0)",
+ com.google.common.collect;version="[20.0.0,21.0.0)",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",
  org.eclipse.jdt.core,

diff --git a/...om/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanelTest.java b/...om/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanelTest.java
@@ -36,7 +36,6 @@
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
 import com.google.cloud.tools.login.Account;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import org.eclipse.core.databinding.ValidationStatusProvider;
 import org.eclipse.core.resources.IProject;

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.deploy/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.google.cloud.tools.appengine,
  com.google.cloud.tools.eclipse.util,
- com.google.gson,
+ com.google.gson;bundle-version="[2.7,3.0)",
  com.google.guava;bundle-version="[20.0.0,21.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.jobs,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.validation/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.validation/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.resources,
  javax.servlet.jsp;bundle-version="2.2.0";visibility:=reexport
 Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.util,
- com.google.common.annotations,
- com.google.common.base,
- com.google.common.collect,
- com.google.common.io,
+ com.google.common.annotations;version="[20.0.0,21.0.0)",
+ com.google.common.base;version="[20.0.0,21.0.0)",
+ com.google.common.collect;version="[20.0.0,21.0.0)",
+ com.google.common.io;version="[20.0.0,21.0.0)",
  org.eclipse.core.databinding.validation,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,