diff --git a/java/com.google.gwt.osgi/META-INF/MANIFEST.MF b/java/com.google.gwt.osgi/META-INF/MANIFEST.MF
index cb85f9ff759..8827322a846 100644
--- a/java/com.google.gwt.osgi/META-INF/MANIFEST.MF
+++ b/java/com.google.gwt.osgi/META-INF/MANIFEST.MF
@@ -187,7 +187,7 @@ Import-Package: com.gargoylesoftware.htmlunit;resolution:=optional,
  com.google.gwt.junit;resolution:=optional,
  com.google.gwt.thirdparty.guava.common.collect;resolution:=optional,
  com.google.gwt.util.tools;resolution:=optional,
- javax.servlet;version="2.6.0",
- javax.servlet.http;version="2.6.0",
+ javax.servlet;version="2.6.0";resolution:=optional,
+ javax.servlet.http;version="2.6.0";resolution:=optional,
  org.eclipse.jetty.server;resolution:=optional,
  org.eclipse.jetty.webapp;resolution:=optional
diff --git a/java/pom.xml b/java/pom.xml
index 8748125cac6..f027f41b003 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -261,6 +261,15 @@
         <version>${tycho-version}</version>
         <configuration>
           <resolver>p2</resolver>
+	  <dependency-resolution>
+	    <extraRequirements>
+	      <requirement>
+	        <type>eclipse-plugin</type>
+		<id>com.google.gwt.dev</id>
+                <versionRange>0.0.0</versionRange>
+	      </requirement>
+	    </extraRequirements>
+	  </dependency-resolution>
           <target>
             <artifact>
               <groupId>${project.groupId}</groupId>