You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by st...@apache.org on 2006/03/06 12:55:03 UTC
svn commit: r383522 - in /gump/metadata/project: ant.xml antbook.xml
ggf-cddlm.xml smartfrog.xml
Author: stevel
Date: Mon Mar 6 03:54:38 2006
New Revision: 383522
URL: http://svn.apache.org/viewcvs?rev=383522&view=rev
Log:
Rolling back to junit3. I've done it for ant as too many things assume that <junit> works, which means that a copy of junit was around for ant to build.
Modified:
gump/metadata/project/ant.xml
gump/metadata/project/antbook.xml
gump/metadata/project/ggf-cddlm.xml
gump/metadata/project/smartfrog.xml
Modified: gump/metadata/project/ant.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/ant.xml?rev=383522&r1=383521&r2=383522&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant.xml Mon Mar 6 03:54:38 2006
@@ -39,7 +39,7 @@
<depend project="xml-xerces"/>
<depend project="xml-apis"/>
<option project="xalan" ids="xalan"/>
- <option project="junit" runtime="true"/>
+ <option project="junit3" runtime="true"/>
<!-- actually, we won't get here if resolver is not available
since Xerces won't build, so while this is an option, it will
Modified: gump/metadata/project/antbook.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/antbook.xml?rev=383522&r1=383521&r2=383522&view=diff
==============================================================================
--- gump/metadata/project/antbook.xml (original)
+++ gump/metadata/project/antbook.xml Mon Mar 6 03:54:38 2006
@@ -44,7 +44,7 @@
<property name="project.version" value="@@DATE@@"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="maven2-ant-tasks" runtime="false"/>
<jar name="dist/antbook-diary-@@DATE@@.jar" id="antbook-diary" />
Modified: gump/metadata/project/ggf-cddlm.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/ggf-cddlm.xml?rev=383522&r1=383521&r2=383522&view=diff
==============================================================================
--- gump/metadata/project/ggf-cddlm.xml (original)
+++ gump/metadata/project/ggf-cddlm.xml Mon Mar 6 03:54:38 2006
@@ -36,7 +36,7 @@
<property name="project.version" value="@@DATE@@"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="xalan" runtime="false"/>
<depend project="xml-apis" runtime="false"/>
<depend project="xml-xerces" runtime="false"/>
Modified: gump/metadata/project/smartfrog.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/smartfrog.xml?rev=383522&r1=383521&r2=383522&view=diff
==============================================================================
--- gump/metadata/project/smartfrog.xml (original)
+++ gump/metadata/project/smartfrog.xml Mon Mar 6 03:54:38 2006
@@ -64,7 +64,7 @@
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<work nested="extras/ant/build/classes"/>
@@ -91,7 +91,7 @@
</ant>
<depend project="ant" runtime="true"/>
<depend project="ant-testutil" runtime="true"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
<work nested="extras/ant/build/test/classes"/>
@@ -117,10 +117,10 @@
<property name="ant.home" reference="home" project="ant"/>
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
<property name="system.tests" value="false" />
- <property name="junit.jar" project="junit" reference="jarpath"/>
+ <property name="junit.jar" project="junit3" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
@@ -149,10 +149,10 @@
<property name="ant.home" reference="home" project="ant"/>
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
<property name="system.tests" value="false" />
- <property name="junit.jar" project="junit" reference="jarpath"/>
+ <property name="junit.jar" project="junit3" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="smartfrog" runtime="true"/>
<depend project="smartfrog-tasks" runtime="true"/>
<depend project="smartfrog-testharness" runtime="true"/>
@@ -175,7 +175,7 @@
<property name="system.tests" value="false" />
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
<!-- logging -->
@@ -195,7 +195,7 @@
<option project="jetty" runtime="true"/>
<!-- junit -->
- <depend project="junit" runtime="true" />
+ <depend project="junit3" runtime="true" />
<!-- net -->
<depend project="commons-net" runtime="true"/>
@@ -252,10 +252,10 @@
<ant basedir="components/junit" target="gump">
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
<property name="system.tests" value="false" />
- <property name="junit.jar" project="junit" reference="jarpath"/>
+ <property name="junit.jar" project="junit3" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="true"/>
<depend project="smartfrog-testharness" runtime="true" inherit="runtime"/>
@@ -279,10 +279,10 @@
<ant basedir="components/xml" target="gump" debug="true">
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
<property name="system.tests" value="false"/>
- <property name="junit.jar" project="junit" reference="jarpath"/>
+ <property name="junit.jar" project="junit3" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false" debug="true"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="packaged-jaxen" runtime="true"/>
<depend project="maven2-ant-tasks"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
@@ -313,7 +313,7 @@
<property name="system.tests" value="false"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="maven2-ant-tasks" runtime="false"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
@@ -345,7 +345,7 @@
<depend project="ant" runtime="false"/>
<depend project="jetty4" runtime="true"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="maven2-ant-tasks" runtime="false"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
@@ -373,7 +373,7 @@
<property name="system.tests" value="false"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="maven2-ant-tasks" runtime="false"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
@@ -406,12 +406,12 @@
<ant basedir="extras/cdl" target="gump">
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
<property name="system.tests" value="false" />
- <property name="junit.jar" project="junit" reference="jarpath"/>
+ <property name="junit.jar" project="junit3" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false"/>
<depend project="cddlm" runtime="true" inherit="runtime"/>
<depend project="commons-logging" runtime="true"/>
- <depend project="junit" runtime="true"/>
+ <depend project="junit3" runtime="true"/>
<depend project="maven2-ant-tasks" runtime="false"/>
<depend project="smartfrog" runtime="true" inherit="runtime"/>
<depend project="smartfrog-tasks" runtime="false"/>
@@ -439,10 +439,10 @@
<ant basedir="components/deployapi" target="gump">
<property name="env.SFHOME" path="smartfrog/dist" project="smartfrog"/>
<property name="system.tests" value="false"/>
- <property name="junit.jar" project="junit" reference="jarpath"/>
+ <property name="junit.jar" project="junit3" reference="jarpath"/>
</ant>
<depend project="ant" runtime="false"/>
- <depend project="junit" runtime="false"/>
+ <depend project="junit3" runtime="false"/>
<depend project="maven2-ant-tasks" runtime="false"/>
<depend project="commons-httpclient" runtime="true"/>