Return-Path: 
 <scm-return-39888-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 34985 invoked from network); 15 Jan 2010 17:36:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 15 Jan 2010 17:36:18 -0000
Received: (qmail 72138 invoked by uid 500); 15 Jan 2010 17:36:18 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 72081 invoked by uid 500); 15 Jan 2010 17:36:18 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 72072 invoked by uid 99); 15 Jan 2010 17:36:17 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 17:36:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 17:36:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C10012388978; Fri, 15 Jan 2010 17:35:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r899728 - in /geronimo/server/trunk:
 plugins/jasper/jasper/src/main/history/dependencies.xml
 plugins/tomcat/tomcat7/src/main/history/dependencies.xml pom.xml
Date: Fri, 15 Jan 2010 17:35:53 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100115173553.C10012388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Fri Jan 15 17:35:53 2010
New Revision: 899728

URL: http://svn.apache.org/viewvc?rev=899728&view=rev
Log:
fix jsp compilation and update some dependencies.xml

Modified:
    geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=899728&r1=899727&r2=899728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml Fri Jan 15 17:35:53 2010
@@ -58,21 +58,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-el_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-el_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jsp_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=899728&r1=899727&r2=899728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Fri Jan 15 17:35:53 2010
@@ -68,7 +68,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        <artifactId>geronimo-annotation_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=899728&r1=899727&r2=899728&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Jan 15 17:35:53 2010
@@ -2056,6 +2056,12 @@
                     <!-- Use the Tomcat 6 JSP compiler, but with our custom Jasper version -->
                     <dependencies>
                         <dependency>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-el_2.2_spec</artifactId>
+                            <version>1.0-SNAPSHOT</version>
+                        </dependency>
+
+                        <dependency>
                             <groupId>org.codehaus.mojo.jspc</groupId>
                             <artifactId>jspc-compiler-tomcat6</artifactId>
                             <version>2.0-alpha-2</version>