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 2014/06/18 06:14:38 UTC

svn commit: r1603353 - in /gump/metadata: project/xml-commons.xml testbase/commons-lang-3.x.xml testbase/commons-proper.xml testbase/junit.xml

Author: bodewig
Date: Wed Jun 18 04:14:38 2014
New Revision: 1603353

URL: http://svn.apache.org/r1603353
Log:
catch up with testbase

Modified:
    gump/metadata/project/xml-commons.xml
    gump/metadata/testbase/commons-lang-3.x.xml
    gump/metadata/testbase/commons-proper.xml
    gump/metadata/testbase/junit.xml

Modified: gump/metadata/project/xml-commons.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xml-commons.xml?rev=1603353&r1=1603352&r2=1603353&view=diff
==============================================================================
--- gump/metadata/project/xml-commons.xml (original)
+++ gump/metadata/project/xml-commons.xml Wed Jun 18 04:14:38 2014
@@ -21,7 +21,7 @@
     Apache XML Commons - externally defined standards - DOM,SAX,JAXP; plus xml utilities
   </description>
 
-  <svn repository="asf" dir="xerces/xml-commons/trunk"/>
+  <svn repository="asf" dir="xml/commons/trunk"/>
   
   <project name="xml-apis" groupId="xml-apis">
     <package>javax.xml.parsers</package>

Modified: gump/metadata/testbase/commons-lang-3.x.xml
URL: http://svn.apache.org/viewvc/gump/metadata/testbase/commons-lang-3.x.xml?rev=1603353&r1=1603352&r2=1603353&view=diff
==============================================================================
--- gump/metadata/testbase/commons-lang-3.x.xml (original)
+++ gump/metadata/testbase/commons-lang-3.x.xml Wed Jun 18 04:14:38 2014
@@ -36,7 +36,7 @@
     </mvn3>
     <option project="junit"/>
 
-    <jar name="target/commons-lang3-*.jar" />
+    <jar name="target/commons-lang3-*[0-9T].jar" />
     <report nested="target/surefire-reports"/>
   </project>
 </module>

Modified: gump/metadata/testbase/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/testbase/commons-proper.xml?rev=1603353&r1=1603352&r2=1603353&view=diff
==============================================================================
--- gump/metadata/testbase/commons-proper.xml (original)
+++ gump/metadata/testbase/commons-proper.xml Wed Jun 18 04:14:38 2014
@@ -25,32 +25,19 @@
   <svn repository="asf" dir="commons/trunks-proper"/>
 
   <project name="bcel-pom">
-    <mvninstall basedir="bcel"/>
+    <mvn3install basedir="bcel"/>
   </project>
 
   <project name="bcel" groupId="org.apache.bcel">
     <package>org.apache.bcel</package>
 
-    <mvn2 separateLocalRepository="foo" basedir="bcel"/>
+    <mvn3 separateLocalRepository="too-early-for-mvn" basedir="bcel"/>
 
     <option project="junit"/>
 
-    <!-- downloaded by mvn even though the project doesn't need them.
-         Adding them as "option" would cause circular dependencies via
-         xalan and ant (jmock needs ant needs xalan needs bcel) so
-         we give bcel a separate local repository and download the two
-         projects from mvn's central repository
-         -->
-    <!--option project="jmock"/>
-    <option project="commons-lang"/-->
-
     <jar name="bcel/target/bcel-[0-9]*[0-9T].jar"/>
     <pom name="bcel/pom.xml"/>
 
     <license name="LICENSE.txt"/>
-
-    <!--
-    <nag to="dev@commons.apache.org" from="Gump &lt;issues@commons.apache.org&gt;"/>
-    -->
   </project>
 </module>

Modified: gump/metadata/testbase/junit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/testbase/junit.xml?rev=1603353&r1=1603352&r2=1603353&view=diff
==============================================================================
--- gump/metadata/testbase/junit.xml (original)
+++ gump/metadata/testbase/junit.xml Wed Jun 18 04:14:38 2014
@@ -23,25 +23,16 @@
   </description>
   <redistributable/>
 
-  <git repository="github" dir="/KentBeck/junit"/>
+  <git repository="github" dir="/junit-team/junit"/>
   
   <project name="junit">
     <package>org.junit</package>
 
-    <ant target="populate-dist">
-      <property name="binjar" value="junit-@@DATE@@.jar"/>
-      <property name="dist" value="dist"/>
-    </ant>
+    <mvn3 goal="package" separateLocalRepository="junit">
+      <property name="skipTests" value="true"/>
+    </mvn3>
 
-    <depend project="bootstrap-ant"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-xerces"/>
-    <!--depend project="hamcrest-java"/-->
-    <work nested="lib/hamcrest-core-1.1.jar"/>
-    <work nested="target/main"/>
-
-    <home nested="dist"/>
-    <jar name="junit-@@DATE@@.jar" id="junit"/>
+    <jar name="target/junit-*[0-9T].jar"/>
   </project>
 
 </module>