From 9ad3728b09ca630047701241c2980f389a1f3b1f Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Thu, 16 Feb 2012 20:54:32 -0600
Subject: [PATCH] changes to pom, still not working

---
 .settings/org.eclipse.jdt.core.prefs  |  3 ++-
 .settings/org.maven.ide.eclipse.prefs |  8 ++++++++
 pom.xml                               | 24 +++++++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 .settings/org.maven.ide.eclipse.prefs

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index a61600575..bb834b408 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Jan 12 18:45:18 CST 2012
+#Thu Feb 16 20:12:13 CST 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.6
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..c1264aea2
--- /dev/null
+++ b/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Thu Feb 16 20:12:09 CST 2012
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/pom.xml b/pom.xml
index 31120a791..c237d2a55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,19 +11,24 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.1-R3</craftbukkit.version>
+		<bukkit.version>1.1-R4</bukkit.version>
+		<craftbukkit.version>1.1-R4</craftbukkit.version>
 		<build.number>Unknown</build.number>
 	</properties>
 
 	<repositories>
+		<repository>
+			<id>craftbukkit-repo</id>
+			<url>http://repo.bukkit.org/org/bukkit/craftbukkit/${craftbukkit.version}/craftbukkit-${craftbukkit.version}.jar</url>
+		</repository>
 		<repository>
 			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/repo/</url>
+			<url>http://repo.bukkit.org/org/bukkit/bukkit/${bukkit.version}/bukkit-${bukkit.version}.jar</url>
 		</repository>
 		<repository>
 			<id>citizensapi-repo</id>
 			<!-- This does not work yet. Need repo to be set up. -->
-			<url>http://repo.citizensnpcs.net/content/groups/repo/</url>
+			<url>http://repo.citizensnpcs.net</url>
 		</repository>
 	</repositories>
 
@@ -45,22 +50,27 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.1-R5-SNAPSHOT</version>
+			<version>${bukkit.version}</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<artifactId>junit-dep</artifactId>
 			<version>4.10</version>
 			<type>jar</type>
 			<scope>test</scope>
+			<exclusions>
+                <exclusion>
+                    <artifactId>hamcrest-core</artifactId>
+                    <groupId>org.hamcrest</groupId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>1.3.RC2</version>
-			<type>jar</type>
+			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>