gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject svn commit: r1619963 - in /gump/metadata/project: hamcrest.xml junit.xml
Date Sat, 23 Aug 2014 04:22:17 GMT
Author: billbarker
Date: Sat Aug 23 04:22:17 2014
New Revision: 1619963

URL: http://svn.apache.org/r1619963
Log:
Updating hamcrest to current github repo. Hamcrest has split the old core jar into core and
api, so have to lie about the core jar until junit updates its pom to include both or maven
projects won't work with mvnrepo. since will get what they think is an incomplete jar

Modified:
    gump/metadata/project/hamcrest.xml
    gump/metadata/project/junit.xml

Modified: gump/metadata/project/hamcrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/hamcrest.xml?rev=1619963&r1=1619962&r2=1619963&view=diff
==============================================================================
--- gump/metadata/project/hamcrest.xml (original)
+++ gump/metadata/project/hamcrest.xml Sat Aug 23 04:22:17 2014
@@ -25,28 +25,40 @@
   </description>
   <redistributable/>
 
- <svn repository="hamcrest" dir="trunk"/>
+ <git repository="github" dir="/hamcrest/JavaHamcrest"/>
   
   <project name="hamcrest-java">
     <package>org.hamcrest</package>
-    <ant basedir="hamcrest-java" target="library">
+    <ant  target="bigjar">
       <property name="version" value="@@DATE@@"/>
     </ant>
 
     <depend project="bootstrap-ant"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
     <depend project="qdox" />
     <depend project="jarjar" />
 
-    <work nested="hamcrest-java/build/temp/build/temp/hamcrest-generator-@@DATE@@-nodeps.jar.contents"/>
-    <work nested="hamcrest-java/build/temp/build/hamcrest-core-@@DATE@@.jar.contents"/>
-    <work nested="hamcrest-java/build/temp/build/hamcrest-library-@@DATE@@.jar.contents"/>
+    <work nested="build/temp/hamcrest-api-@@DATE@@.jar.contents"/>
+    <work nested="build/temp/hamcrest-generator-@@DATE@@.jar.contents"/>
+    <work nested="build/temp/hamcrest-core-@@DATE@@.jar.contents"/>
+    <work nested="build/temp/hamcrest-integration-@@DATE@@.jar.contents"/>
+    <work nested="build/temp/hamcrest-library-@@DATE@@.jar.contents"/>
+    <work nested="build/hamcrest-api-@@DATE@@-tests.jar"/>
+    <work nested="build/hamcrest-integration-@@DATE@@-tests.jar"/>
+    <work nested="build/hamcrest-generator-@@DATE@@-tests.jar"/>
+    <work nested="build/hamcrest-library-@@DATE@@-tests.jar"/>
+    <work nested="build/hamcrest-core-@@DATE@@-tests.jar"/>
+    <work nested="lib/integration/ant-junit-1.8.4.jar"/>
+    <work nested="lib/integration/junit-dep-4.11.jar"/>
+    <work nested="lib/integration/easymock-2.2.jar"/>
+    <work nested="lib/integration/jmock-1.10RC1.jar"/>
+    <work nested="lib/integration/testng-6.5.2.jar"/>
 
-    <home nested="hamcrest-java/build" />
+    <home nested="build" />
 
-    <license name="hamcrest-java/LICENSE.txt" />
-    <jar name="hamcrest-core-@@DATE@@.jar" id="hamcrest-core"/>
+    <license name="LICENSE.txt" />
+    <jar name="hamcrest-api-@@DATE@@.jar" id="hamcrest-api"/>
+    <jar name="hamcrest-all-@@DATE@@.jar" id="hamcrest-all"/>
+    <jar name="hamcrest-all-@@DATE@@.jar" id="hamcrest-core"/>
     <jar name="hamcrest-generator-@@DATE@@.jar" id="hamcrest-generator"/>
     <jar name="hamcrest-library-@@DATE@@.jar" id="hamcrest-library"/>
   </project>

Modified: gump/metadata/project/junit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/junit.xml?rev=1619963&r1=1619962&r2=1619963&view=diff
==============================================================================
--- gump/metadata/project/junit.xml (original)
+++ gump/metadata/project/junit.xml Sat Aug 23 04:22:17 2014
@@ -31,6 +31,7 @@
       <property name="skipTests" value="true"/>
     </mvn3>
 
+    <option project="hamcrest-java"/>
     <jar name="target/junit-*[0-9T].jar"/>
     <nag from="Gump Integration &lt;general@gump.apache.org&gt;"
          to="David Saff &lt;david@saff.net&gt;" />



Mime
View raw message