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/06/28 09:07:41 UTC
svn commit: r958477 - in /gump/metadata/project: commons-jelly.xml
tomcat-taglibs.xml
Author: bodewig
Date: Mon Jun 28 07:07:41 2010
New Revision: 958477
URL: http://svn.apache.org/viewvc?rev=958477&view=rev
Log:
make sure Taglib's parent has been installed before building standard taglib - fix mvn ids while I'm at it
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=958477&r1=958476&r2=958477&view=diff
==============================================================================
--- gump/metadata/project/commons-jelly.xml (original)
+++ gump/metadata/project/commons-jelly.xml Mon Jun 28 07:07:41 2010
@@ -40,7 +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="jstl" />
+ <property project="tomcat-taglibs-standard" name="maven.jar.jstl"
+ reference="jarpath" id="taglibs-standard-spec" />
<property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
<property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath" />
</maven>
@@ -55,7 +56,7 @@
<depend project="dom4j" />
<depend project="forehead" />
<depend project="jakarta-servletapi-5-servlet" />
- <depend project="tomcat-taglibs-standard" ids="jstl" />
+ <depend project="tomcat-taglibs-standard" ids="taglibs-standard-spec" />
<depend project="jaxen" />
<depend project="junit" />
<depend project="xml-apis" />
@@ -76,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="jstl" />
+ <property project="tomcat-taglibs-standard" name="maven.jar.jstl" reference="jarpath" id="taglibs-standard-spec" />
<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=958477&r1=958476&r2=958477&view=diff
==============================================================================
--- gump/metadata/project/tomcat-taglibs.xml (original)
+++ gump/metadata/project/tomcat-taglibs.xml Mon Jun 28 07:07:41 2010
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module name="tomcat-taglibs">
+<module name="tomcat-taglibs" groupId="org.apache.taglibs">
<url href="http://tomcat.apache.org/taglibs/index.html"/>
<description>
@@ -25,7 +25,7 @@
<svn repository="asf" dir="tomcat/taglibs/trunks"/>
<!-- Parent POM -->
- <project name="tomcat-taglibs-parent">
+ <project name="taglibs-parent">
<description>Taglib Parent POM</description>
<mvn basedir="taglibs-parent" goal="install"/>
<option project="velocity-engine"/>
@@ -34,6 +34,7 @@
<option project="commons-io"/>
<option project="jakarta-servletapi-5-servlet"/>
<option project="jakarta-servletapi-5-jsp"/>
+ <jar name="pom.xml"/>
<nag to="dev@tomcat.apache.org" from="Gump <bayard@tomcat.apache.org>"/>
</project>
@@ -42,13 +43,14 @@
<description>Standard Taglib</description>
<mvn basedir="standard" goal="install"/>
- <!--<option project="tomcat-tc6"/>-->
-
+ <depend project="taglibs-parent"/>
<depend project="xalan"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
- <jar name="standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar" id="jstl" />
- <jar name="standard/impl/target/taglibs-standard-impl-1.2-SNAPSHOT.jar" id="standard" />
+ <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@tomcat.apache.org>"/>
</project>