From c579a83622e1fce7be3620a36c86b763eedd06fc 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 2c04579..0e0fd09 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.bukkit - craftbukkit + org.spigotmc + spigot jar 1.8.7-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot + http://www.spigotmc.org UTF-8 @@ -20,10 +20,22 @@ 1.6 + + org.spigotmc + spigot-parent + dev-SNAPSHOT + ../pom.xml + + - org.bukkit - bukkit + net.sf.trove4j + trove4j + 3.0.3 + + + org.spigotmc + spigot-api ${project.version} jar compile @@ -88,17 +100,32 @@ - clean install + install net.md-5 scriptus 0.2 - - git-Bukkit-%s - + ex-spigot + + git-Spigot-%s + ../ + spigot.desc + + initialize + + describe + + + + ex-craftbukkit + + -%s + ../../CraftBukkit + craftbukkit.desc + initialize describe @@ -115,7 +142,7 @@ org.bukkit.craftbukkit.Main CraftBukkit - ${describe} + ${spigot.desc}${craftbukkit.desc} Bukkit Team Bukkit ${api.version} 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) { -- 2.1.4