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/08/11 20:27:30 UTC
svn commit: r984517 - in /gump/metadata: project/cocoon22.xml
project/jakarta-bsf3.xml project/rhino.xml testbase/ant.xml
Author: bodewig
Date: Wed Aug 11 18:27:29 2010
New Revision: 984517
URL: http://svn.apache.org/viewvc?rev=984517&view=rev
Log:
shake up the whole dependency tree in order to build flowscript before building rhino
Modified:
gump/metadata/project/cocoon22.xml
gump/metadata/project/jakarta-bsf3.xml
gump/metadata/project/rhino.xml
gump/metadata/testbase/ant.xml
Modified: gump/metadata/project/cocoon22.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/cocoon22.xml?rev=984517&r1=984516&r2=984517&view=diff
==============================================================================
--- gump/metadata/project/cocoon22.xml (original)
+++ gump/metadata/project/cocoon22.xml Wed Aug 11 18:27:29 2010
@@ -66,7 +66,9 @@
goal="install"/>
<depend project="cocoon22-core"/>
<option project="cocoon22-expression-language-api"/>
+ <!-- rhino has broken its continuation API and flowscript hasn't adapted
<option project="rhino"/>
+ -->
<jar name="blocks/cocoon-flowscript/cocoon-flowscript-impl/target/cocoon-flowscript-impl-*[0-9T].jar"
id="cocoon-flowscript-impl"/>
</project>
@@ -237,7 +239,10 @@
<option project="commons-jxpath"/>
<option project="commons-lang"/>
<option project="junit"/>
+ <!-- removed to avoid a circular dependency as long as
+ cocoon22-flowscript-impl cannot build against rhino's trunk
<option project="rhino"/>
+ -->
<option project="xmlunit"/>
<jar name="core/cocoon-expression-language/cocoon-expression-language-impl/target/cocoon-expression-language-impl-*[0-9T].jar"
id="cocoon-expression-language-impl"/>
Modified: gump/metadata/project/jakarta-bsf3.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-bsf3.xml?rev=984517&r1=984516&r2=984517&view=diff
==============================================================================
--- gump/metadata/project/jakarta-bsf3.xml (original)
+++ gump/metadata/project/jakarta-bsf3.xml Wed Aug 11 18:27:29 2010
@@ -34,7 +34,10 @@
<!-- downloaded by mvn -->
<option project="commons-collections"/>
+ <!-- removed to avoid a circular dependency as long as
+ cocoon22-flowscript-impl cannot build against rhino's trunk
<option project="rhino"/>
+ -->
<option project="velocity-engine"/>
</project>
Modified: gump/metadata/project/rhino.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/rhino.xml?rev=984517&r1=984516&r2=984517&view=diff
==============================================================================
--- gump/metadata/project/rhino.xml (original)
+++ gump/metadata/project/rhino.xml Wed Aug 11 18:27:29 2010
@@ -52,6 +52,9 @@
<license name="README.html"/>
<javadoc nested="build/rhino_@@DATE@@/docs/apidocs"/>
+
+ <!-- rhino has broken its continuation API and flowscript hasn't adapted -->
+ <option project="cocoon22-flowscript-impl"/>
</project>
</module>
Modified: gump/metadata/testbase/ant.xml
URL: http://svn.apache.org/viewvc/gump/metadata/testbase/ant.xml?rev=984517&r1=984516&r2=984517&view=diff
==============================================================================
--- gump/metadata/testbase/ant.xml (original)
+++ gump/metadata/testbase/ant.xml Wed Aug 11 18:27:29 2010
@@ -33,7 +33,6 @@
<pom name="../src/etc/poms/pom.xml" id="ant-parent"/>
<pom name="../src/etc/poms/ant/pom.xml" id="ant"/>
<pom name="../src/etc/poms/ant-launcher/pom.xml" id="ant-launcher"/>
-
</project>
<project name="ant">