Skip to content

Commit

Permalink
Force Bukkit version to match deps.
Browse files Browse the repository at this point in the history
  • Loading branch information
@khobbits
khobbits committed Jan 25, 2014
1 parent 5070f15 commit 1c03545
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 28 deletions.
7 changes: 7 additions & 0 deletions Essentials/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 0 additions & 19 deletions Essentials/src/com/earth2me/essentials/OfflinePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -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"));
Expand Down
7 changes: 7 additions & 0 deletions EssentialsAntiBuild/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
</ciManagement>

<dependencies>
<dependency>

This comment has been minimized.

Sign in to view

Copy link
@chrisgward

chrisgward Jan 27, 2014

Member

Why are the dependencies listed under the modules now?

This comment has been minimized.

Sign in to view

Copy link
@khobbits

khobbits Jan 27, 2014

Author Member

Because I don't know enough about maven to fix it any other way.

As I've said before, I don't mind how the maven stuff is setup as long as:

  • When I go to test, I have a craftbukkit and bukkit jar file with the exact same version as used to compile.
  • We don't compile against repositories we don't control (I don't want whoever ends up with kitteh.org next month to be able to serve bad jar files).
  • You can pick any git commit in the history and know that you can get the valid matching craftbukkit.jar, (even if craftbukkit gets a C&D from mojang next year and the site is shutdown)

Last time Bukkit was updated, the libs folder wasn't updated, so I fixed it.
<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>
Expand Down
7 changes: 7 additions & 0 deletions EssentialsChat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions EssentialsGeoIP/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions EssentialsProtect/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions EssentialsSpawn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions EssentialsXMPP/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file modified lib/bukkit.jar
View file
Binary file not shown.
Binary file modified lib/craftbukkit.jar
View file
Binary file not shown.
9 changes: 0 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 1c03545

Please sign in to comment.