Index: ../magnolia-git/magnolia_main/magnolia-core/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../magnolia-git/magnolia_main/magnolia-core/pom.xml	(revision 570ec54)
+++ ../magnolia-git/magnolia_main/magnolia-core/pom.xml	(revision 0e9af2850082ba17eb6c3687652fe0a932ddf425)
@@ -157,7 +157,7 @@
       <artifactId>commons-httpclient</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
       <scope>provided</scope>
     </dependency>
Index: ../magnolia-git/magnolia_main/magnolia-rendering/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../magnolia-git/magnolia_main/magnolia-rendering/pom.xml	(revision 570ec54)
+++ ../magnolia-git/magnolia_main/magnolia-rendering/pom.xml	(revision 0e9af2850082ba17eb6c3687652fe0a932ddf425)
@@ -36,7 +36,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
       <scope>provided</scope>
     </dependency>
Index: ../magnolia-git/magnolia_main/magnolia-templating-jsp/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../magnolia-git/magnolia_main/magnolia-templating-jsp/pom.xml	(revision 570ec54)
+++ ../magnolia-git/magnolia_main/magnolia-templating-jsp/pom.xml	(revision 0e9af2850082ba17eb6c3687652fe0a932ddf425)
@@ -29,9 +29,14 @@
           <artifactId>imageinfo</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
+          <artifactId>jsp-api</artifactId>
+          <scope>provided</scope>
         </dependency>
         <!-- TLDGEN -->
         <dependency>
@@ -83,15 +88,19 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>net.sourceforge.openutils</groupId>
-            <artifactId>openutils-testing4web</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
+          <groupId>net.sourceforge.openutils</groupId>
+          <artifactId>openutils-testing4web</artifactId>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>commons-logging</groupId>
+              <artifactId>commons-logging</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.servlet</groupId>
+              <artifactId>jsp-api</artifactId>
+            </exclusion>
-            </exclusions>
+          </exclusions>
         </dependency>
     </dependencies>
 
@@ -135,9 +144,9 @@
                             <version>1.1.1</version>
                         </docletArtifact>
                         <docletArtifact>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                            <version>1.0.1</version>
+                            <groupId>javax.servlet.jsp</groupId>
+                            <artifactId>jsp-api</artifactId>
+                            <version>2.1</version>
                         </docletArtifact>
                         <docletArtifact>
                             <groupId>log4j</groupId>
Index: ../magnolia-git/magnolia_main/magnolia-templating/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../magnolia-git/magnolia_main/magnolia-templating/pom.xml	(revision 570ec54)
+++ ../magnolia-git/magnolia_main/magnolia-templating/pom.xml	(revision 0e9af2850082ba17eb6c3687652fe0a932ddf425)
@@ -55,6 +55,11 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -93,6 +98,10 @@
         <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
Index: ../magnolia-git/magnolia_main/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../magnolia-git/magnolia_main/pom.xml	(revision 570ec54)
+++ ../magnolia-git/magnolia_main/pom.xml	(revision 0e9af2850082ba17eb6c3687652fe0a932ddf425)
@@ -206,7 +206,7 @@
                           <!-- let's only generate for sources here, not the dependencies : -->
                           <restrictedpath>file://${settings.localRepository}</restrictedpath>
                           <validate>false</validate>
-                          <jspversion>2.0</jspversion>
+                          <jspversion>2.1</jspversion>
                           <!-- this will only work if we don't validate: -->
                           <taglibversion>${project.version}</taglibversion>
                           <shortname>${taglib.shortname}</shortname>
@@ -542,22 +542,17 @@
         </exclusions>
       </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>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
-        <version>1.1.2</version>
+        <version>1.2</version>
       </dependency>
       <dependency>
-        <groupId>taglibs</groupId>
-        <artifactId>standard</artifactId>
-        <version>1.1.2</version>
-      </dependency>
-      <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
         <version>1.4.1</version>
@@ -774,6 +769,12 @@
         <artifactId>openutils-testing4web</artifactId>
         <version>1.2</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.htmlunit</groupId>