Updated Guava and javax.servlet dependencies

.gitignore

@@ -28,4 +28,5 @@ gwt-2.9.0/
 # TODO remove the others, some of these have been committed
 .project
 .settings
-.classpath
+.classpath
+/.metadata/

features/com.gwtplugins.eclipse.suite.v3.feature/feature.xml

@@ -51,7 +51,6 @@
       <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.wst.css.core"/>
       <import plugin="org.eclipse.wst.css.ui"/>
-      <import plugin="javax.servlet"/>
       <import plugin="org.eclipse.pde.core"/>
       <import plugin="org.eclipse.ui.browser"/>
       <import plugin="org.eclipse.wst.jsdt.core"/>
@@ -101,6 +100,7 @@
       <import plugin="org.eclipse.equinox.p2.ui.sdk"/>
       <import plugin="org.eclipse.team.core"/>
       <import plugin="org.eclipse.core.runtime" version="3.9.0" match="greaterOrEqual"/>
+      <import plugin="jakarta.servlet-api"/>
    </requires>
 
    <plugin

plugins/com.gwtplugins.gcp.eclipse.testing/META-INF/MANIFEST.MF

@@ -18,4 +18,5 @@ Require-Bundle:
  org.eclipse.jdt.ui,
  org.eclipse.jface.text,
  org.eclipse.swt,
- org.eclipse.m2e.maven.runtime
+ org.eclipse.m2e.maven.runtime,
+ com.google.guava

plugins/com.gwtplugins.gdt.eclipse.apiclientlib/.classpath

@@ -18,7 +18,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-jetty-1.16.0-rc.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/google-oauth-client-servlet-1.16.0-rc.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gson-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-jdk5-13.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.1.3.jar"/>

plugins/com.gwtplugins.gdt.eclipse.apiclientlib/META-INF/MANIFEST.MF

@@ -16,7 +16,6 @@ Bundle-ClassPath: .,
  lib/google-oauth-client-jetty-1.16.0-rc.jar,
  lib/google-oauth-client-servlet-1.16.0-rc.jar,
  lib/gson-2.1.jar,
- lib/guava-jdk5-13.0.jar,
  lib/httpclient-4.0.1.jar,
  lib/httpcore-4.0.1.jar,
  lib/jackson-core-2.1.3.jar,

plugins/com.gwtplugins.gdt.eclipse.apiclientlib/build.properties

@@ -17,7 +17,6 @@ bin.includes = META-INF/,\
                lib/google-oauth-client-jetty-1.16.0-rc.jar,\
                lib/google-oauth-client-servlet-1.16.0-rc.jar,\
                lib/gson-2.1.jar,\
-               lib/guava-jdk5-13.0.jar,\
                lib/httpclient-4.0.1.jar,\
                lib/httpcore-4.0.1.jar,\
                lib/jackson-core-2.1.3.jar,\

plugins/com.gwtplugins.gdt.eclipse.core/.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr305-1.3.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-11.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gson-2.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/com.gwtplugins.gdt.eclipse.core/META-INF/MANIFEST.MF

@@ -3,7 +3,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.google.gdt.eclipse.core.CorePlugin
 Bundle-ClassPath: .,
  lib/jsr305-1.3.9.jar,
- lib/guava-11.0.1.jar,
  lib/gson-2.1.jar
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
@@ -12,19 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-SymbolicName: com.gwtplugins.gdt.eclipse.core;singleton:=true
 Bundle-Vendor: %providerName
 Bundle-Version: 3.0.0.qualifier
-Export-Package: com.google.common.annotations,
- com.google.common.base,
- com.google.common.base.internal,
- com.google.common.cache,
- com.google.common.collect,
- com.google.common.eventbus,
- com.google.common.hash,
- com.google.common.io,
- com.google.common.math,
- com.google.common.net,
- com.google.common.primitives,
- com.google.common.util.concurrent,
- com.google.gdt.eclipse.core,
+Export-Package: com.google.gdt.eclipse.core,
  com.google.gdt.eclipse.core.actions,
  com.google.gdt.eclipse.core.browser,
  com.google.gdt.eclipse.core.collections,
@@ -83,8 +70,8 @@ Require-Bundle: com.gwtplugins.gdt.eclipse.platform,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.sse.ui,
  org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui
-
+ org.eclipse.wst.xml.ui,
+ com.google.guava
 
 
 

plugins/com.gwtplugins.gwt.eclipse.core/META-INF/MANIFEST.MF

@@ -72,7 +72,6 @@ Export-Package: com.google.gwt.eclipse.core,
  com.google.gwt.eclipse.core.wizards.rpc
 Require-Bundle: com.gwtplugins.gdt.eclipse.core;visibility:=reexport,
  com.gwtplugins.gdt.eclipse.platform,
- javax.servlet,
  org.eclipse.core.expressions,
  org.eclipse.core.filesystem,
  org.eclipse.core.runtime,
@@ -103,4 +102,6 @@ Require-Bundle: com.gwtplugins.gdt.eclipse.core;visibility:=reexport,
  org.eclipse.wst.validation,
  org.eclipse.wst.xml.core,
  org.eclipse.wst.xml.ui,
- org.eclipse.wst.common.project.facet.core
+ org.eclipse.wst.common.project.facet.core,
+ com.google.guava,
+ jakarta.servlet-api