From 9f1b624c909aa109de32b7e97964448e15cfea7e Mon Sep 17 00:00:00 2001
From: SeH <1s1e1h1@gmail.com>
Date: Mon, 1 Jun 2015 10:51:24 -0400
Subject: [PATCH] preparing to merge GUI code from several months ago with
 latest moa

---
 .gitignore  | 3 +++
 moa/pom.xml | 2 +-
 pom.xml     | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..7cf671cde
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+.idea/
+
diff --git a/moa/pom.xml b/moa/pom.xml
index dd44c7979..14fd58579 100755
--- 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
index 052fa8916..503637ce0 100644
--- 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>