geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r483773 - in /geronimo/server/trunk: ./ applications/console/geronimo-console-standard/ applications/geronimo-examples/geronimo-jsp-examples/ configs/webconsole-jetty6/ configs/webconsole-jetty6/src/plan/ configs/webconsole-tomcat/ configs/...
Date Fri, 08 Dec 2006 01:53:34 GMT
Author: jbohn
Date: Thu Dec  7 17:53:34 2006
New Revision: 483773

URL: http://svn.apache.org/viewvc?view=rev&rev=483773
Log:
GERONIMO-2536 Update jetty6 and tomcat jee5 assemblies to include jstl 1.2 from glassfish
Also update jspc-maven-plugin to 1.4.7-SNAPSHOT to pick up jgenender's inclusion of jasper
6 (Thanks Jeff)

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Thu Dec 
7 17:53:34 2006
@@ -131,7 +131,7 @@
         </dependency>
         
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Thu
Dec  7 17:53:34 2006
@@ -53,7 +53,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
         

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Thu Dec  7 17:53:34 2006
@@ -181,7 +181,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Thu Dec  7 17:53:34
2006
@@ -75,7 +75,7 @@
                     <type>jar</type>
                 </dependency>
                 <dependency>
-                    <groupId>javax.servlet</groupId>
+                    <groupId>jstl</groupId>
                     <artifactId>jstl</artifactId>
                     <type>jar</type>
                 </dependency>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Thu Dec  7 17:53:34 2006
@@ -182,7 +182,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Thu Dec  7 17:53:34
2006
@@ -91,7 +91,7 @@
                     <type>jar</type>
                 </dependency>
                 <dependency>
-                    <groupId>javax.servlet</groupId>
+                    <groupId>jstl</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?view=diff&rev=483773&r1=483772&r2=483773
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Dec  7 17:53:34 2006
@@ -674,6 +674,12 @@
             </dependency>
 
             <dependency>
+                <groupId>jstl</groupId>
+                <artifactId>jstl</artifactId>
+                <version>1.2</version>
+            </dependency>
+
+            <dependency>
                 <groupId>dwr</groupId>
                 <artifactId>dwr</artifactId>
                 <version>1.1.1</version>
@@ -1191,7 +1197,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jspc-maven-plugin</artifactId>
-                    <version>1.4.6</version>
+                    <version>1.4.7-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <id>jspc</id>
@@ -1373,6 +1379,11 @@
               specify where Genesis lives to pick it up + any additional repositories.
         -->
 
+        <repository>
+            <id>java.net</id>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </repository>
         <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>



Mime
View raw message