summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2012-12-09 15:13:38 -0600
committerWesley Wolfe <weswolf@aol.com>2012-12-09 18:15:34 -0600
commit4d2a92ed475941088d1fee5d28992f2534ba1678 (patch)
tree252255f53b6fbb76a0c55dc16f653ee1fde64468 /pom.xml
parent12c7c2f695251e70363eca08bb97baa25d0f3bb7 (diff)
downloadcraftbukkit-4d2a92ed475941088d1fee5d28992f2534ba1678.tar
craftbukkit-4d2a92ed475941088d1fee5d28992f2534ba1678.tar.gz
craftbukkit-4d2a92ed475941088d1fee5d28992f2534ba1678.tar.lz
craftbukkit-4d2a92ed475941088d1fee5d28992f2534ba1678.tar.xz
craftbukkit-4d2a92ed475941088d1fee5d28992f2534ba1678.zip
Add isSolid() tests for each material
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml15
1 files changed, 2 insertions, 13 deletions
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>