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 2009/09/01 09:34:55 UTC
svn commit: r809865 - in /gump/metadata/project: commons-proper.xml
portals-pluto.xml
Author: bodewig
Date: Tue Sep 1 07:34:55 2009
New Revision: 809865
URL: http://svn.apache.org/viewvc?rev=809865&view=rev
Log:
Revert changes that worked around a now-fixed bug in Ant trunk
Modified:
gump/metadata/project/commons-proper.xml
gump/metadata/project/portals-pluto.xml
Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=809865&r1=809864&r2=809865&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Tue Sep 1 07:34:55 2009
@@ -32,11 +32,6 @@
value="commons-attributes-api-@@DATE@@"/>
<property name="final.name.compiler"
value="commons-attributes-compiler-@@DATE@@"/>
- <property name="classesdir" value="target/classes" />
- <property name="testclassesdir" value="target/test-classes" />
- <property name="distdir" value="dist" />
- <property name="defaulttargetdir" value="target" />
- <property name="plugindir" value="plugin" />
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="qdox" runtime="true"/>
@@ -97,9 +92,6 @@
<property name="final.name" value="commons-betwixt-@@DATE@@"/>
<property name="resourcedir" path="betwixt"/>
<sysproperty name="ant.build.clonevm" value="true"/>
- <property name="classesdir" value="target/classes" />
- <property name="testclassesdir" value="target/test-classes" />
- <property name="defaulttargetdir" value="target" />
</ant>
<!-- All Maven projects need Ant and Xerces to build. -->
@@ -152,10 +144,6 @@
<ant basedir="chain" buildfile="build.xml" target="jar">
<property name="final.name" value="commons-chain-@@DATE@@"/>
- <property name="classesdir" value="target/classes" />
- <property name="testclassesdir" value="target/test-classes" />
- <property name="distdir" value="dist" />
- <property name="defaulttargetdir" value="target" />
</ant>
<depend project="jsfri" ids="jsf-api"/>
@@ -567,9 +555,6 @@
<mkdir dir="jexl/target/test-classes"/>
<ant basedir="jexl" target="dist">
<property name="final.name" value="commons-jexl-@@DATE@@"/>
- <property name="classesdir" value="target/classes" />
- <property name="testclassesdir" value="target/test-classes" />
- <property name="distdir" value="dist" />
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
@@ -588,15 +573,11 @@
<package>org.apache.commons.jxpath</package>
<description>XPath traversal of JavaBeans</description>
<ant basedir="jxpath" target="dist">
- <property name="final.name" value="commons-jxpath"/>
+ <property name="component.version" value="@@DATE@@"/>
<depend property="junit.jar" project="junit"/>
<depend property="j2ee.jar" project="jakarta-servletapi-5-servlet"/>
<depend property="jaxp.jaxp.jar" project="xml-apis" id="xml-apis"/>
<depend property="jaxp.xslt.jar" project="xalan" id="xalan"/>
- <property name="classesdir" value="target/classes" />
- <property name="testclassesdir" value="target/test-classes" />
- <property name="distdir" value="dist" />
- <property name="defaulttargetdir" value="target" />
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="anakia" inherit="runtime"/>
@@ -790,9 +771,6 @@
<ant basedir="net" target="dist">
<property name="final.name" value="commons-net-@@DATE@@" />
<sysproperty name="ant.build.clonevm" value="true"/>
- <property name="classesdir" value="target/classes" />
- <property name="testclassesdir" value="target/test-classes" />
- <property name="distdir" value="dist" />
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
Modified: gump/metadata/project/portals-pluto.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/portals-pluto.xml?rev=809865&r1=809864&r2=809865&view=diff
==============================================================================
--- gump/metadata/project/portals-pluto.xml (original)
+++ gump/metadata/project/portals-pluto.xml Tue Sep 1 07:34:55 2009
@@ -29,7 +29,7 @@
<ant target="api">
<property name="env.ANT_HOME" reference="home" project="ant"/>
- <property name="final.name" value="portlet-api-1.0"/>
+ <property name="final.api.name" value="portlet-api-@@DATE@@"/>
<property name="version" value="@@DATE@@"/>
</ant>
@@ -65,7 +65,6 @@
<ant target="container">
<property name="env.ANT_HOME" reference="home" project="ant"/>
<property name="version" value="@@DATE@@"/>
- <property name="final.name" value="pluto-1.0"/>
</ant>
<depend project="ant" inherit="runtime"/>
@@ -101,7 +100,6 @@
<ant target="descriptors">
<property name="env.ANT_HOME" reference="home" project="ant"/>
<property name="version" value="@@DATE@@"/>
- <property name="final.name" value="pluto-descriptors-1.0"/>
</ant>
<depend project="ant" inherit="runtime"/>
@@ -136,7 +134,7 @@
<ant target="all">
<property name="env.ANT_HOME" reference="home" project="ant"/>
- <property name="final.name" value="pluto-portal-1.0"/>
+ <property name="final.portal.name" value="pluto-portal-impl-@@DATE@@"/>
<property name="version" value="@@DATE@@"/>
</ant>