You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/07/10 07:27:03 UTC
svn commit: r962762 - in /gump/metadata/project: commons-jelly.xml
tomcat-taglibs.xml
Author: bodewig
Date: Sat Jul 10 05:27:03 2010
New Revision: 962762
URL: http://svn.apache.org/viewvc?rev=962762&view=rev
Log:
build the taglibs spec jar separately and use that for Jelly
Modified:
gump/metadata/project/commons-jelly.xml
gump/metadata/project/tomcat-taglibs.xml
Modified: gump/metadata/project/commons-jelly.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-jelly.xml?rev=962762&r1=962761&r2=962762&view=diff
==============================================================================
--- gump/metadata/project/commons-jelly.xml (original)
+++ gump/metadata/project/commons-jelly.xml Sat Jul 10 05:27:03 2010
@@ -40,8 +40,8 @@
<property name="maven.final.name" value="commons-jelly-@@DATE@@"/>
<property project="jakarta-servletapi-5-servlet" name="maven.jar.servletapi" reference="jarpath" />
- <property project="tomcat-taglibs-standard" name="maven.jar.jstl"
- reference="jarpath" id="taglibs-standard-spec" />
+ <property project="taglibs-standard-spec" name="maven.jar.jstl"
+ reference="jarpath" />
<property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
<property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath" />
</maven>
@@ -56,7 +56,7 @@
<depend project="dom4j" />
<depend project="forehead" />
<depend project="jakarta-servletapi-5-servlet" />
- <depend project="tomcat-taglibs-standard" ids="taglibs-standard-spec" />
+ <depend project="taglibs-standard-spec"/>
<depend project="jaxen" />
<depend project="junit" />
<depend project="xml-apis" />
@@ -77,7 +77,7 @@
<property name="maven.final.name" value="commons-jelly-@@DATE@@"/>
<property project="jakarta-servletapi-5-servlet" name="maven.jar.servletapi" reference="jarpath" />
- <property project="tomcat-taglibs-standard" name="maven.jar.jstl" reference="jarpath" id="taglibs-standard-spec" />
+ <property project="taglibs-standard-spec" name="maven.jar.jstl" reference="jarpath" />
<property project="xml-xerces" name="maven.jar.xerces" reference="jarpath"/>
<property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath" />
</maven>
Modified: gump/metadata/project/tomcat-taglibs.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-taglibs.xml?rev=962762&r1=962761&r2=962762&view=diff
==============================================================================
--- gump/metadata/project/tomcat-taglibs.xml (original)
+++ gump/metadata/project/tomcat-taglibs.xml Sat Jul 10 05:27:03 2010
@@ -38,6 +38,12 @@
<nag to="dev@tomcat.apache.org" from="Gump <bayard@apache.org>"/>
</project>
+ <project name="taglibs-standard-spec">
+ <mvn basedir="standard/spec" goal="install"/>
+ <depend project="taglibs-parent"/>
+ <jar name="standard/spec/target/taglibs-standard-spec-*[0-9T].jar"/>
+ </project>
+
<project name="tomcat-taglibs-standard">
<package>org.apache.taglibs.standard</package>
<description>Standard Taglib</description>
@@ -48,12 +54,11 @@
<depend project="taglibs-parent"/>
<option project="cactus"/>
<option project="httpunit"/>
+ <option project="taglibs-standard-spec"/>
<option project="xalan"/>
<option project="xml-apis"/>
<option project="xml-xerces"/>
<option project="xstream"/>
- <jar name="standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar"
- id="taglibs-standard-spec" />
<jar name="standard/impl/target/taglibs-standard-impl-1.2-SNAPSHOT.jar"
id="taglibs-standard-impl" />
<nag to="dev@tomcat.apache.org" from="Gump <bayard@apache.org>"/>