You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/08/26 22:16:44 UTC
svn commit: r689200 - in /geronimo/server/branches/2.0: pom.xml
repository/pom.xml
Author: dwoods
Date: Tue Aug 26 13:16:44 2008
New Revision: 689200
URL: http://svn.apache.org/viewvc?rev=689200&view=rev
Log:
GERONIMO-4245 Upgrade to Tomcat 6.0.18 to pickup latest security fixes
Modified:
geronimo/server/branches/2.0/pom.xml
geronimo/server/branches/2.0/repository/pom.xml
Modified: geronimo/server/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/pom.xml?rev=689200&r1=689199&r2=689200&view=diff
==============================================================================
--- geronimo/server/branches/2.0/pom.xml (original)
+++ geronimo/server/branches/2.0/pom.xml Tue Aug 26 13:16:44 2008
@@ -71,7 +71,7 @@
<!--
HACK: Used by jsp and servlet example configs to point to the tomcat deployer
-->
- <tomcatVersion>6.0.14</tomcatVersion>
+ <tomcatVersion>6.0.18</tomcatVersion>
<!--
HACK: Used by uddi-jetty and uddi-tomcat config plans Also this is the one for derby! not anything else
@@ -904,13 +904,13 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.14-G614585</version>
+ <version>6.0.18-G678601</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>${tomcatVersion}</version>
+ <version>6.0.18-G678601</version>
</dependency>
<dependency>
@@ -934,7 +934,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.14-G614585</version>
+ <version>6.0.18-G678601</version>
</dependency>
<dependency>
@@ -1588,7 +1588,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.14-G614585</version>
+ <version>6.0.18-G678601</version>
</dependency>
</dependencies>
</plugin>
Modified: geronimo/server/branches/2.0/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/repository/pom.xml?rev=689200&r1=689199&r2=689200&view=diff
==============================================================================
--- geronimo/server/branches/2.0/repository/pom.xml (original)
+++ geronimo/server/branches/2.0/repository/pom.xml Tue Aug 26 13:16:44 2008
@@ -67,6 +67,11 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
</dependency>
+ <!-- This is an additional patch until 6.0.19 is released -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ </dependency>
<!-- add the following for wsgen -->
<dependency>