gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1516812 - /gump/metadata/project/forrest.xml
Date Fri, 23 Aug 2013 10:28:52 GMT
Author: bodewig
Date: Fri Aug 23 10:28:52 2013
New Revision: 1516812

URL: http://svn.apache.org/r1516812
Log:
Can forrest use the servlet-api shipping with Tomcat 6?

Modified:
    gump/metadata/project/forrest.xml

Modified: gump/metadata/project/forrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/forrest.xml?rev=1516812&r1=1516811&r2=1516812&view=diff
==============================================================================
--- gump/metadata/project/forrest.xml (original)
+++ gump/metadata/project/forrest.xml Fri Aug 23 10:28:52 2013
@@ -97,6 +97,7 @@
     <ant basedir="main" target="test-basic"/>
     <depend project="forrest-core" inherit="runtime"/>
     <depend project="commons-jxpath"/>
+    <depend project="tomcat-tc6" ids="servlet-api"/>
 <!-- Our own packaged stuff that Gump does not provide: -->
     <work nested="lib/core/cocoon-2.1.12-dev.jar"/>
     <work nested="lib/core/cocoon-asciiart-block.jar"/>
@@ -121,7 +122,7 @@
 
     <work nested="tools/jetty/jetty-6.1.26.jar"/>
     <work nested="tools/jetty/jetty-util-6.1.26.jar"/>
-    <work nested="tools/jetty/servlet-api-2.5-6.1.5.jar"/>
+    <!--work nested="tools/jetty/servlet-api-2.5-6.1.5.jar"/-->
 <!-- FIXME: Temporarily use our packaged batik. -->
     <work nested="lib/core/batik-all-1.6.jar"/>
 
@@ -143,6 +144,7 @@
     <depend project="forrest-core" inherit="runtime"/>
     <depend project="forrest-test-deploy-plugins"/>
     <depend project="commons-jxpath"/>
+    <depend project="tomcat-tc6" ids="servlet-api"/>
 <!-- Our own packaged stuff that Gump does not provide: -->
     <work nested="lib/core/cocoon-2.1.12-dev.jar"/>
     <work nested="lib/core/cocoon-asciiart-block.jar"/>
@@ -168,7 +170,7 @@
 
     <work nested="tools/jetty/jetty-6.1.26.jar"/>
     <work nested="tools/jetty/jetty-util-6.1.26.jar"/>
-    <work nested="tools/jetty/servlet-api-2.5-6.1.5.jar"/>
+    <!--work nested="tools/jetty/servlet-api-2.5-6.1.5.jar"/-->
 <!-- FIXME: Temporarily use our packaged batik. -->
     <work nested="lib/core/batik-all-1.6.jar"/>
 <!-- FIXME: Temporarily use our packaged fop extras until cocoon-2.1.12 -->



Mime
View raw message