diff --git a/core/pom.xml b/core/pom.xml
index 420b1baa5..17d57ea02 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -213,7 +213,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 4c6c04b33..f229e8bd9 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -69,7 +69,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 00b651db1..72804ed58 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -55,7 +55,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index ef2dcdd6e..f2d4d21f1 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -62,7 +62,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 82d4385e7..9caa9423d 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -65,7 +65,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 95be40f10..f41e243fb 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -50,7 +50,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 70fed8d45..9c7ba3792 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -45,7 +45,7 @@
             <artifactId>tiles-request-portlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 492015e7f..f58469d34 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 6044e246f..0f433b95d 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index d396a0a0c..7a2106707 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index e6410375c..2507ee7a6 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -78,7 +78,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 20bd5e49f..e66c475cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,7 +706,7 @@
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
-                <version>2.4</version>
+                <version>2.5</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -794,9 +794,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.servlet</groupId>
+                <groupId>javax.servlet.jsp</groupId>
                 <artifactId>jsp-api</artifactId>
-                <version>2.0</version>
+                <version>2.1</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -807,13 +807,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>javax.servlet.jsp</groupId>
-                <artifactId>jsp-api</artifactId>
-                <version>2.1</version>
-                <scope>test</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>juli</artifactId>