You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/06/23 06:01:11 UTC

svn commit: r787533 - in /geronimo/server/trunk: framework/configs/jee-specs/pom.xml framework/configs/jee-specs/src/main/history/dependencies.xml pom.xml repository/pom.xml testsuite/web-testsuite/test-2.1-jsps/pom.xml

Author: djencks
Date: Tue Jun 23 04:01:11 2009
New Revision: 787533

URL: http://svn.apache.org/viewvc?rev=787533&view=rev
Log:
GERONIMO-4705 use sun jstl from maven central

Modified:
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/repository/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml

Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=787533&r1=787532&r2=787533&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Tue Jun 23 04:01:11 2009
@@ -176,7 +176,7 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
+            <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=787533&r1=787532&r2=787533&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml Tue Jun 23 04:01:11 2009
@@ -7,7 +7,7 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>jstl</groupId>
+        <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=787533&r1=787532&r2=787533&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jun 23 04:01:11 2009
@@ -1044,7 +1044,7 @@
 
             <!-- Need a non-Sun RI version for Apache Harmony and IBM SDK -->
             <dependency>
-                <groupId>jstl</groupId>
+                <groupId>javax.servlet</groupId>
                 <artifactId>jstl</artifactId>
                 <version>1.2</version>
             </dependency>

Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=787533&r1=787532&r2=787533&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Tue Jun 23 04:01:11 2009
@@ -43,11 +43,11 @@
             <!--<artifactId>juddi</artifactId>-->
         <!--</dependency>-->
 
-        <dependency>
-            <groupId>jstl</groupId>
+<!--        <dependency>
+            <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
-
+-->
         <dependency>
             <groupId>org.dojotoolkit</groupId>
             <artifactId>dojo-ajax</artifactId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=787533&r1=787532&r2=787533&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Tue Jun 23 04:01:11 2009
@@ -42,7 +42,7 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
+            <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>