Force Bukkit version to match deps.

Flowdalic · Jan 25, 2014 · 1c03545 · 1c03545
1 parent 5070f15
commit 1c03545
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 28 deletions.
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>