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 2005/09/09 21:02:44 UTC
svn commit: r279843 - in /gump/metadata/project: cocoon/module.xml
directory-authx.xml groovy.xml
Author: bodewig
Date: Fri Sep 9 12:02:39 2005
New Revision: 279843
URL: http://svn.apache.org/viewcvs?rev=279843&view=rev
Log:
jmock won't compile against either asm or JUnit HEAD
Modified:
gump/metadata/project/cocoon/module.xml
gump/metadata/project/directory-authx.xml
gump/metadata/project/groovy.xml
Modified: gump/metadata/project/cocoon/module.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/cocoon/module.xml?rev=279843&r1=279842&r2=279843&view=diff
==============================================================================
--- gump/metadata/project/cocoon/module.xml (original)
+++ gump/metadata/project/cocoon/module.xml Fri Sep 9 12:02:39 2005
@@ -139,7 +139,7 @@
<depend project="jing"/>
<depend project="junit"
groupId="junit" artifactId="junit" version="3.8.1"/>
- <depend project="jmock"
+ <depend project="packaged-jmock"
groupId="jmock" artifactId="jmock" version="1.0.1"/>
<depend project="easymock"
groupId="easymock" artifactId="easymock" version="1.1"/>
@@ -1539,5 +1539,10 @@
<!-- It would be better to *build* Garbage actually. -->
<package>org.apache.garbage</package>
<jar name="lib/optional/apache-garbage-0.0.jar"/>
+ </project>
+
+ <!-- jmock doesn't compile against JUnit or ASM HEAD -->
+ <project name="packaged-jmock">
+ <jar name="tools/lib/jmock-1.0.1.jar"/>
</project>
</module>
Modified: gump/metadata/project/directory-authx.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/directory-authx.xml?rev=279843&r1=279842&r2=279843&view=diff
==============================================================================
--- gump/metadata/project/directory-authx.xml (original)
+++ gump/metadata/project/directory-authx.xml Fri Sep 9 12:02:39 2005
@@ -42,7 +42,7 @@
</maven>
<depend project="commons-collections" />
- <depend project="jmock" />
+ <depend project="packaged-jmock" />
<home nested="core" />
@@ -66,7 +66,7 @@
<depend project="authx-core" />
<depend project="dom4j" />
<depend project="groovy" />
- <depend project="jmock" />
+ <depend project="packaged-jmock" />
<depend project="picocontainer" />
<depend project="xml-apis" />
<depend project="xml-xerces" />
@@ -100,7 +100,7 @@
<depend project="jakarta-servletapi-5-servlet" />
<depend project="jakarta-velocity" ids="velocity" />
<depend project="jakarta-velocity-tools" ids="velocity-tools-view" />
- <depend project="jmock" />
+ <depend project="packaged-jmock" />
<depend project="nanocontainer" />
<depend project="nanocontainer-nanowar" />
<depend project="ognl" />
@@ -126,7 +126,7 @@
<depend project="authx-core" />
<depend project="hsqldb" />
- <depend project="jmock" />
+ <depend project="packaged-jmock" />
<home nested="jdbc" />
Modified: gump/metadata/project/groovy.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/groovy.xml?rev=279843&r1=279842&r2=279843&view=diff
==============================================================================
--- gump/metadata/project/groovy.xml (original)
+++ gump/metadata/project/groovy.xml Fri Sep 9 12:02:39 2005
@@ -29,6 +29,7 @@
<maven goal="jar">
<property name="maven.jar.cglib-nodeps" project="cglib" reference="jarpath"/>
+ <property name="maven.jar.jmock" project="packaged-jmock" reference="jarpath"/>
</maven>
<depend project="ant"/>
@@ -44,7 +45,7 @@
<depend project="jakarta-bsf"/>
<depend project="jakarta-regexp"/>
<depend project="jakarta-servletapi-4"/>
- <depend project="jmock"/>
+ <depend project="packaged-jmock"/>
<depend project="junit"/>
<depend project="mockobjects-with-groovy-compatible-jar-id"/>
<depend project="mx4j"/>