You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2005/07/10 11:01:02 UTC
svn commit: r209998 - in /geronimo/trunk: etc/project.properties
modules/assembly/project.xml
modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
Author: jsisson
Date: Sun Jul 10 02:01:00 2005
New Revision: 209998
URL: http://svn.apache.org/viewcvs?rev=209998&view=rev
Log:
GERONIMO-732 Change Geronimo Build to use correct version of Tomcat AJP JAR
Modified:
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=209998&r1=209997&r2=209998&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sun Jul 10 02:01:00 2005
@@ -159,7 +159,7 @@
spring_version=1.1.3
stax_version=1.1.1-dev
stax_api_version=1.0
-tomcat_jk2_version=5.0.18
+tomcat_ajp_version=5.5.9
tomcat_version=5.5.9
velocity_version=1.4
wsdl4j_version=PATCH-1193602
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=209998&r1=209997&r2=209998&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Sun Jul 10 02:01:00 2005
@@ -919,8 +919,8 @@
</dependency>
<dependency>
<groupId>tomcat</groupId>
- <artifactId>tomcat-jk2</artifactId>
- <version>${tomcat_jk2_version}</version>
+ <artifactId>tomcat-ajp</artifactId>
+ <version>${tomcat_ajp_version}</version>
<url>http://jakarta.apache.org/tomcat/</url>
<properties>
<repository>true</repository>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml?rev=209998&r1=209997&r2=209998&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml Sun Jul 10 02:01:00 2005
@@ -97,7 +97,7 @@
<uri>tomcat/jars/jasper-runtime-${jasper_version}.jar</uri>
</dependency>
<dependency>
- <uri>tomcat/jars/tomcat-jk2-${tomcat_jk2_version}.jar</uri>
+ <uri>tomcat/jars/tomcat-ajp-${tomcat_ajp_version}.jar</uri>
</dependency>
<dependency>
<uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>