geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
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 GMT
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>



Mime
View raw message