diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index e9d7cc0..694f078 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -19,6 +19,6 @@
 cp $SRC/org.eclipse.gemini.web.core-2.1.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-2.1.0.jar
 cp $SRC/org.eclipse.gemini.web.extender-2.1.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-2.1.0.jar
 cp $SRC/org.eclipse.gemini.web.tomcat-2.1.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-2.1.0.jar
-cp $SRC/com.springsource.org.eclipse.jdt.core.compiler.batch-3.6.1.jar $REPO/com.springsource.org.eclipse.jdt.core.compiler.batch/com.springsource.org.eclipse.jdt.core.compiler.batch-3.6.1.jar
+cp $SRC/org.eclipse.jdt.core.compiler.batch-3.7.0.M20120208-0800.jar $REPO/org.eclipse.jdt.core.compiler.batch/com.springsource.org.eclipse.jdt.core.compiler.batch-3.7.0.M20120208-0800.jar
 cp $SRC/com.springsource.slf4j.api-1.6.1.jar $REPO/com.springsource.slf4j.api/com.springsource.slf4j.api-1.6.1.jar
 cp $SRC/com.springsource.slf4j.nop-1.6.1.jar $REPO/com.springsource.slf4j.nop/com.springsource.slf4j.nop-1.6.1.jar
diff --git a/build-web-container/dependencies-ivy.xml b/build-web-container/dependencies-ivy.xml
index b3de31f..d73496b 100644
--- a/build-web-container/dependencies-ivy.xml
+++ b/build-web-container/dependencies-ivy.xml
@@ -28,7 +28,7 @@
 		<dependency org="org.apache.tomcat" name="com.springsource.org.apache.tomcat.api" rev="${org.apache.tomcat}" conf="dep->runtime"/>
 		<dependency org="org.apache.tomcat" name="com.springsource.org.apache.tomcat.util" rev="${org.apache.tomcat}" conf="dep->runtime"/>
 		
-		<dependency org="org.eclipse.jdt" name="com.springsource.org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt}" conf="dep->runtime"/>
+		<dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt}" conf="dep->runtime"/>
 		
 		<dependency org="javax.activation" name="com.springsource.javax.activation" rev="${javax.activation}" conf="dep->runtime"/>
 		<dependency org="javax.annotation" name="javax.annotation" rev="${javax.annotation}" conf="dep->runtime"/>
diff --git a/build.versions b/build.versions
index ebbc115..0df28d7 100644
--- a/build.versions
+++ b/build.versions
@@ -29,5 +29,5 @@
 org.eclipse.equinox.cm=1.0.300.v20101204
 org.eclipse.equinox.event=1.2.100.v20110110
 org.apache.tomcat=7.0.26
-org.eclipse.jdt=3.6.1
+org.eclipse.jdt=3.7.0.M20120208-0800
 org.slf4j=1.6.1
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
index 2c6bc5b..88344c2 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
@@ -24,7 +24,7 @@
 file:../ivy-cache/repository/org.apache.jasper/com.springsource.org.apache.jasper/${org.apache.tomcat}/com.springsource.org.apache.jasper-${org.apache.tomcat}.jar,\
 file:../ivy-cache/repository/org.apache.tomcat/com.springsource.org.apache.tomcat.api/${org.apache.tomcat}/com.springsource.org.apache.tomcat.api-${org.apache.tomcat}.jar,\
 file:../ivy-cache/repository/org.apache.tomcat/com.springsource.org.apache.tomcat.util/${org.apache.tomcat}/com.springsource.org.apache.tomcat.util-${org.apache.tomcat}.jar,\
-file:../ivy-cache/repository/org.eclipse.jdt/com.springsource.org.eclipse.jdt.core.compiler.batch/${org.eclipse.jdt}/com.springsource.org.eclipse.jdt.core.compiler.batch-${org.eclipse.jdt}.jar,\
+file:../ivy-cache/repository/org.eclipse.jdt/org.eclipse.jdt.core.compiler.batch/${org.eclipse.jdt}/org.eclipse.jdt.core.compiler.batch-${org.eclipse.jdt}.jar,\
 file:../ivy-cache/repository/org.apache.juli/com.springsource.org.apache.juli.extras/${org.apache.tomcat}/com.springsource.org.apache.juli.extras-${org.apache.tomcat}.jar@start,\
 file:../ivy-cache/repository/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/${org.apache.taglibs}/com.springsource.org.apache.taglibs.standard-${org.apache.taglibs}.jar,\
 file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/${org.slf4j}/com.springsource.slf4j.api-${org.slf4j}.jar@start,\
diff --git a/org.eclipse.gemini.web.tomcat/ivy.xml b/org.eclipse.gemini.web.tomcat/ivy.xml
index ec852ee..1c089d9 100644
--- a/org.eclipse.gemini.web.tomcat/ivy.xml
+++ b/org.eclipse.gemini.web.tomcat/ivy.xml
@@ -37,7 +37,7 @@
             <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="${javax.xml.rpc}" />
             <dependency org="org.apache.jasper" name="com.springsource.org.apache.jasper" rev="${org.apache.tomcat}" conf="compile->runtime"/>
             <dependency org="org.apache.el" name="com.springsource.org.apache.el" rev="${org.apache.tomcat}" conf="compile->runtime"/>
-            <dependency org="org.eclipse.jdt" name="com.springsource.org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt}" conf="compile->runtime"/>
+            <dependency org="org.eclipse.jdt" name="org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt}" conf="compile->runtime"/>
             <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="${org.apache.tomcat}" conf="compile->runtime"/>
             <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina.ha" rev="${org.apache.tomcat}" conf="compile->runtime"/>
             <dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina.tribes" rev="${org.apache.tomcat}" conf="compile->runtime"/>