Revision: 17630
          http://sourceforge.net/p/gate/code/17630
Author:   markagreenwood
Date:     2014-03-11 15:24:26 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
upgraded junit to 4.11 and upgraded some code in src/main which includes a test 
that referenced a deprecated assert class

Modified Paths:
--------------
    gate/trunk/build/deploy/maven/gate-core.pom.template
    gate/trunk/ivy.xml
    gate/trunk/src/main/gate/email/EmailDocumentHandler.java

Modified: gate/trunk/build/deploy/maven/gate-core.pom.template
===================================================================
--- gate/trunk/build/deploy/maven/gate-core.pom.template        2014-03-11 
13:37:29 UTC (rev 17629)
+++ gate/trunk/build/deploy/maven/gate-core.pom.template        2014-03-11 
15:24:26 UTC (rev 17630)
@@ -278,15 +278,8 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>compile</scope>
-            <exclusions>
-                <!-- we don't use the hamcrest matchers -->
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
     </dependencies>

Modified: gate/trunk/ivy.xml
===================================================================
--- gate/trunk/ivy.xml  2014-03-11 13:37:29 UTC (rev 17629)
+++ gate/trunk/ivy.xml  2014-03-11 15:24:26 UTC (rev 17630)
@@ -104,7 +104,7 @@
     <dependency org="xmlunit" name="xmlunit" rev="1.5" conf="required->master" 
/>
 
     <!-- Used for testing GATE -->
-    <dependency org="junit" name="junit" rev="4.10" conf="compile->master" />
+    <dependency org="junit" name="junit" rev="4.11" 
conf="compile->master,compile" />
 
     <!-- exclude stuff that is part of Java 6 core -->
     <exclude org="xml-apis" module="xml-apis" />

Modified: gate/trunk/src/main/gate/email/EmailDocumentHandler.java
===================================================================
--- gate/trunk/src/main/gate/email/EmailDocumentHandler.java    2014-03-11 
13:37:29 UTC (rev 17629)
+++ gate/trunk/src/main/gate/email/EmailDocumentHandler.java    2014-03-11 
15:24:26 UTC (rev 17630)
@@ -32,7 +32,7 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 /**
   * This class implements the behaviour of the Email reader

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to