From 191d925c165b18ef460bb2956e4084602f676bf6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us. diff --git a/pom.xml b/pom.xml index 8dc82eb..6aeffa8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.bukkit - craftbukkit + org.spigotmc + spigot jar 1.7.10-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot + http://www.spigotmc.org UTF-8 @@ -18,24 +18,12 @@ - - scm:git:git://github.com/Bukkit/CraftBukkit.git - scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git - https://github.com/Bukkit/CraftBukkit - - - - - repobo-rel - repo.bukkit.org Releases - http://repo.bukkit.org/content/repositories/releases/ - - - repobo-snap - repo.bukkit.org Snapshots - http://repo.bukkit.org/content/repositories/snapshots/ - - + + org.spigotmc + spigot-parent + dev-SNAPSHOT + ../pom.xml + @@ -53,16 +41,16 @@ - org.bukkit - bukkit + org.spigotmc + spigot-api ${project.version} jar compile - org.bukkit + org.spigotmc minecraft-server - ${minecraft.version} + ${minecraft.version}-SNAPSHOT jar compile @@ -107,33 +95,6 @@ gson 2.1 - - org.avaje - ebean - 2.7.3 - jar - provided - - - org.yaml - snakeyaml - 1.9 - jar - provided - - - com.google.guava - guava - 10.0 - jar - provided - - - commons-lang - commons-lang - 2.3 - provided - junit @@ -151,15 +112,15 @@ - clean install + install com.lukegb.mojo gitdescribe-maven-plugin 1.3 - ${buildtag.prefix} - ${buildtag.suffix} + git-Spigot- + @@ -212,7 +173,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.4 + 2.1 package diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index a666131..eb0b342 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -317,7 +317,7 @@ public final class CraftServer implements Server { loadIcon(); updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel")); - updater.setEnabled(configuration.getBoolean("auto-updater.enabled")); + updater.setEnabled(false); // Spigot updater.setSuggestChannels(configuration.getBoolean("auto-updater.suggest-channels")); updater.getOnBroken().addAll(configuration.getStringList("auto-updater.on-broken")); updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update")); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index f905d17..9304637 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; - InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties"); + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties"); Properties properties = new Properties(); if (stream != null) { -- 1.9.1