From 8f1de648c03558488ce22782b879d0acb284ef09 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall@optusnet.com>
Date: Sat, 18 Feb 2012 17:12:07 +0800
Subject: [PATCH] Merge

---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f7f9457c..ff85a613f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<bukkit.version>1.1-R4-SNAPSHOT</bukkit.version>
-		<craftbukkit.version>1.1-R4-SNAPSHOT</craftbukkit.version>
+		<bukkit.version>1.1-R5-SNAPSHOT</bukkit.version>
+		<craftbukkit.version>1.1-R5-SNAPSHOT</craftbukkit.version>
+        <citizensapi.version>2.0</citizensapi.version>
 		<build.number>Unknown</build.number>
 	</properties>
 
@@ -24,7 +25,7 @@
 		
             <!-- This does not work yet. Need repo to be set up. <repository>
 			<id>citizensapi-repo</id>
-			<url>http://repo.citizensnpcs.net</url>
+			<url>http://repo.citizensnpcs.net/content/groups/public/</url>
 		</repository>-->
 	</repositories>
 
@@ -39,7 +40,7 @@
 		<dependency>
 			<groupId>net.citizensnpcs</groupId>
 			<artifactId>citizensapi</artifactId>
-			<version>2.0</version>
+			<version>${citizensapi.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>