Force Bukkit version to match deps.

khobbits · khobbits · commit 1c035457bbc2 · 2014-01-25T23:29:48.000Z
diff --git a/Essentials/pom.xml b/Essentials/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>BOSEconomy</groupId>
 			<artifactId>BOSEconomy</artifactId>
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -474,49 +474,41 @@ public void awardAchievement(Achievement a)
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void removeAchievement(Achievement achievement)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public boolean hasAchievement(Achievement achievement)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic ststc)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic ststc, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public int getStatistic(Statistic statistic) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
@@ -528,67 +520,56 @@ public void incrementStatistic(Statistic ststc, Material mtrl)
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void decrementStatistic(Statistic statistic, EntityType entityType, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
-	@Override
 	public void setStatistic(Statistic statistic, EntityType entityType, int i)
 	{
 		throw new UnsupportedOperationException(_("notSupportedYet"));
diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsSpawn/pom.xml b/EssentialsSpawn/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml
@@ -42,6 +42,13 @@
 	</ciManagement>
 
 	<dependencies>
+    <dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+      <scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>    
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>Essentials</artifactId>
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
diff --git a/pom.xml b/pom.xml
@@ -44,10 +44,6 @@
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/groups/public</url>
 		</repository>
-		<repository>
-			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/public</url>
-		</repository>
 	</repositories>
 
 	<distributionManagement>
@@ -72,11 +68,6 @@
 	</modules>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>bukkit</artifactId>
-			<version>1.7.2-R0.3-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -474,49 +474,41 @@ public void awardAchievement(Achievement a)`
`474`	`474`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`475`	`475`	`}`
`476`	`476`
`477`		`- @Override`
`478`	`477`	`public void removeAchievement(Achievement achievement)`
`479`	`478`	`{`
`480`	`479`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`481`	`480`	`}`
`482`	`481`
`483`		`- @Override`
`484`	`482`	`public boolean hasAchievement(Achievement achievement)`
`485`	`483`	`{`
`486`	`484`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`487`	`485`	`}`
`488`	`486`
`489`		`- @Override`
`490`	`487`	`public void incrementStatistic(Statistic ststc)`
`491`	`488`	`{`
`492`	`489`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`493`	`490`	`}`
`494`	`491`
`495`		`- @Override`
`496`	`492`	`public void decrementStatistic(Statistic statistic) throws IllegalArgumentException`
`497`	`493`	`{`
`498`	`494`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`499`	`495`	`}`
`500`	`496`
`501`		`- @Override`
`502`	`497`	`public void incrementStatistic(Statistic ststc, int i)`
`503`	`498`	`{`
`504`	`499`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`505`	`500`	`}`
`506`	`501`
`507`		`- @Override`
`508`	`502`	`public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException`
`509`	`503`	`{`
`510`	`504`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`511`	`505`	`}`
`512`	`506`
`513`		`- @Override`
`514`	`507`	`public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException`
`515`	`508`	`{`
`516`	`509`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`517`	`510`	`}`
`518`	`511`
`519`		`- @Override`
`520`	`512`	`public int getStatistic(Statistic statistic) throws IllegalArgumentException`
`521`	`513`	`{`
`522`	`514`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`@@ -528,67 +520,56 @@ public void incrementStatistic(Statistic ststc, Material mtrl)`
`528`	`520`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`529`	`521`	`}`
`530`	`522`
`531`		`- @Override`
`532`	`523`	`public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException`
`533`	`524`	`{`
`534`	`525`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`535`	`526`	`}`
`536`	`527`
`537`		`- @Override`
`538`	`528`	`public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException`
`539`	`529`	`{`
`540`	`530`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`541`	`531`	`}`
`542`	`532`
`543`		`- @Override`
`544`	`533`	`public void incrementStatistic(Statistic ststc, Material mtrl, int i)`
`545`	`534`	`{`
`546`	`535`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`547`	`536`	`}`
`548`	`537`
`549`		`- @Override`
`550`	`538`	`public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException`
`551`	`539`	`{`
`552`	`540`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`553`	`541`	`}`
`554`	`542`
`555`		`- @Override`
`556`	`543`	`public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException`
`557`	`544`	`{`
`558`	`545`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`559`	`546`	`}`
`560`	`547`
`561`		`- @Override`
`562`	`548`	`public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException`
`563`	`549`	`{`
`564`	`550`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`565`	`551`	`}`
`566`	`552`
`567`		`- @Override`
`568`	`553`	`public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException`
`569`	`554`	`{`
`570`	`555`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`571`	`556`	`}`
`572`	`557`
`573`		`- @Override`
`574`	`558`	`public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException`
`575`	`559`	`{`
`576`	`560`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`577`	`561`	`}`
`578`	`562`
`579`		`- @Override`
`580`	`563`	`public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException`
`581`	`564`	`{`
`582`	`565`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`583`	`566`	`}`
`584`	`567`
`585`		`- @Override`
`586`	`568`	`public void decrementStatistic(Statistic statistic, EntityType entityType, int i)`
`587`	`569`	`{`
`588`	`570`	`throw new UnsupportedOperationException(_("notSupportedYet"));`
`589`	`571`	`}`
`590`	`572`
`591`		`- @Override`
`592`	`573`	`public void setStatistic(Statistic statistic, EntityType entityType, int i)`
`593`	`574`	`{`
`594`	`575`	`throw new UnsupportedOperationException(_("notSupportedYet"));`