--- /var/portage/dev-java/groovy/groovy-1.8.5.ebuild	2012-01-28 11:43:04.000000000 +0200
+++ groovy-1.8.8-r1.ebuild	2012-09-26 15:35:36.873605965 +0300
@@ -40,7 +40,7 @@
 	dev-java/jline
 	dev-java/commons-cli
 	dev-java/jansi
-	java-virtuals/servlet-api:2.4
+	java-virtuals/servlet-api:3.0
 	>=dev-java/bsf-2.4
 	java-virtuals/jmx"
 
@@ -82,7 +82,7 @@
 	cd compile
 
 	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
-	java-pkg_jar-from jline,junit,servlet-api-2.4,bsf-2.3
+	java-pkg_jar-from jline,junit-4,servlet-api-3.0,bsf-2.3
 	java-pkg_jar-from --virtual jmx
 	java-pkg_jar-from --build-only ant-ivy:2
 	use doc && java-pkg_jar-from --build-only qdox-1.12,ant-antlr,commons-logging