harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r801877 - in /harmony/enhanced: classlib/trunk/depends/jars/ classlib/trunk/make/ common_resources/trunk/make/ drlvm/trunk/make/tests/ jdktools/trunk/make/
Date Fri, 07 Aug 2009 04:07:56 GMT
Author: ndbeyer
Date: Fri Aug  7 04:07:55 2009
New Revision: 801877

URL: http://svn.apache.org/viewvc?rev=801877&view=rev
Log:
Update JUnit to 4.6 and add Hamcrest Library 1.1 for future use

Modified:
    harmony/enhanced/classlib/trunk/depends/jars/   (props changed)
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml
    harmony/enhanced/common_resources/trunk/make/depends.properties
    harmony/enhanced/drlvm/trunk/make/tests/test-common.xml
    harmony/enhanced/jdktools/trunk/make/depends.xml

Propchange: harmony/enhanced/classlib/trunk/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug  7 04:07:55 2009
@@ -1,4 +1,5 @@
-junit_4.4
+junit_4.6
+hamcrest-library_1.1
 mx4j_3.0.2
 xalan-j_2.7.0
 bcel-5.2

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=801877&r1=801876&r2=801877&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Fri Aug  7 04:07:55 2009
@@ -28,11 +28,15 @@
 xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.zip
 xerces.md5=a0e07ede1c3bd5231fe15eae24032b2e
 
-junit.dir=${depends.jars}/junit_4.4
-junit.jar=${junit.dir}/junit.jar
-junit.url=${maven2.base}/junit/junit/4.4/junit-4.4.jar
-junit.md5=f852bbb2bbe0471cef8e5b833cb36078
-
+junit.dir=${depends.jars}/junit_4.6
+junit.jar=${junit.dir}/junit-4.6.jar
+junit.url=${maven2.base}/junit/junit/4.6/junit-4.6.jar
+junit.md5=37dc57962c1275ebc572726a6f5cdd13
+
+hamcrest-library.dir=${depends.jars}/hamcrest-library_1.1
+hamcrest-library.jar=${hamcrest-library.dir}/hamcrest-library-1.1.jar
+hamcrest-library.url=${maven2.base}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar
+hamcrest-library.md5=271f78edc4333f0f44df617676e0a874
 
 msvcr.dir=${depends.dir}/libs/${hy.platform}
 msvcp.dir=${depends.dir}/libs/${hy.platform}

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=801877&r1=801876&r2=801877&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Fri Aug  7 04:07:55 2009
@@ -37,6 +37,7 @@
         <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
+        <check-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
         <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
         <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
@@ -138,6 +139,10 @@
     <download-one-file src="${junit.url}" dest="${junit.jar}"
                            md5="${junit.md5}" />
 
+    <mkdir dir="${hamcrest-library.dir}" />
+    <download-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}"
+                           md5="${hamcrest-library.md5}" />
+
     <mkdir dir="${bcprov.dir}" />
     <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
                            md5="${bcprov.md5}" />

Modified: harmony/enhanced/common_resources/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/depends.properties?rev=801877&r1=801876&r2=801877&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/depends.properties (original)
+++ harmony/enhanced/common_resources/trunk/make/depends.properties Fri Aug  7 04:07:55 2009
@@ -21,9 +21,13 @@
 eclipse.base=http://download.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700
 harmony.standard.base=http://svn.apache.org/repos/asf/harmony/standard/depends
 
-junit.jar=${depends.jars}/junit_4.4/junit.jar
-junit.jar.url=${maven2.base}/junit/junit/4.4/junit-4.4.jar
-junit.jar.md5=f852bbb2bbe0471cef8e5b833cb36078
+junit.jar=${depends.jars}/junit_4.6/junit-4.6.jar
+junit.jar.url=${maven2.base}/junit/junit/4.6/junit-4.6.jar
+junit.jar.md5=37dc57962c1275ebc572726a6f5cdd13
+
+hamcrest-library.jar=${depends.jars}/hamcrest-library_1.1/hamcrest-library-1.1.jar
+hamcrest-library.jar.url=${maven2.base}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar
+hamcrest-library.jar.md5=271f78edc4333f0f44df617676e0a874
 
 ecj.jar=${depends.jars}/ecj_3.4.2/ecj-3.4.2.jar
 ecj.jar.url=${eclipse.base}/ecj-3.4.2.jar

Modified: harmony/enhanced/drlvm/trunk/make/tests/test-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/tests/test-common.xml?rev=801877&r1=801876&r2=801877&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/tests/test-common.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/tests/test-common.xml Fri Aug  7 04:07:55 2009
@@ -36,10 +36,12 @@
         <check-one-file dest="${ant-contrib.jar}" src="${ant-contrib.url}"/>
         <check-one-file dest="${jasmin.jar}" src="${jasmin.url}"/>
         <check-one-file dest="${junit.jar}" src="${junit.jar.url}"/>
+        <check-one-file dest="${hamcrest-library.jar}" src="${hamcrest-library.jar.url}"/>
     </target>
         
     <target name="fetch-depends">
         <fetch dep="junit.jar"/>
+        <fetch dep="hamcrest-library.jar"/>
         <fetch dep="jasmin"/>
         <fetch dep="ant-contrib"/>
     </target>

Modified: harmony/enhanced/jdktools/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/depends.xml?rev=801877&r1=801876&r2=801877&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/depends.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/depends.xml Fri Aug  7 04:07:55 2009
@@ -31,6 +31,7 @@
     <target name="check">
         <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
         <check-one-file src="${junit.jar.url}" dest="${junit.jar}" />
+        <check-one-file src="${hamcrest-library.jar.url}" dest="${hamcrest-library.jar}"
/>
 
         <poll-modules target="check-depends" dir="${jdktools.base.dir}/modules"/>
 
@@ -55,6 +56,7 @@
         
     <target name="fetch">
         <fetch dep="junit.jar"/>
+        <fetch dep="hamcrest-library.jar"/>
         <fetch dep="ecj.jar"/>
         <poll-modules target="fetch-depends" dir="${jdktools.base.dir}/modules"/>
     </target>



Mime
View raw message