preparing to merge GUI code from several months ago with latest moa

Waikato · Jun 1, 2015 · 9f1b624 · 9f1b624
1 parent 62ec1bd
commit 9f1b624
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+.idea/
+
diff --git a/moa/pom.xml b/moa/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.googlecode.java-diff-utils</groupId>
       <artifactId>diffutils</artifactId>
-      <version>1.2.1</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.2</version>
+        <version>4.12</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -162,6 +162,7 @@
           <configuration>
             <source>1.6</source>
             <target>1.6</target>
+            <encoding>UTF-8</encoding>
           </configuration>
         </plugin>