From 4d2a92ed475941088d1fee5d28992f2534ba1678 Mon Sep 17 00:00:00 2001
From: Wesley Wolfe <weswolf@aol.com>
Date: Sun, 9 Dec 2012 15:13:38 -0600
Subject: Add isSolid() tests for each material

---
 pom.xml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 097af98e..74be0449 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <api.version>unknown</api.version>
-    <junit.version>4.10</junit.version>
+    <junit.version>4.11</junit.version>
     <minecraft.version>1.4.5</minecraft.version>
     <minecraft_version>1_4_5</minecraft_version>
   </properties>
@@ -135,15 +135,9 @@
     <!-- testing -->
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
+      <artifactId>junit</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
@@ -275,11 +269,6 @@
                     <shadedPattern>net.minecraft.server.v${minecraft_version}</shadedPattern>
                 </relocation>
               </relocations>
-              <artifactSet>
-                <excludes>
-                  <exclude>junit:junit</exclude>
-                </excludes>
-              </artifactSet>
             </configuration>
           </execution>
         </executions>
-- 
cgit v1.2.3