From be6a8aefafe4a6dc34d952b7c0cf860f7136defe 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 8d3f539..74efc8b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.bukkit - craftbukkit + org.spigotmc + spigot jar 1.8-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot + http://www.spigotmc.org UTF-8 @@ -18,6 +18,13 @@ + + org.spigotmc + spigot-parent + dev-SNAPSHOT + ../pom.xml + + repobo-snap @@ -34,8 +41,8 @@ - org.bukkit - bukkit + org.spigotmc + spigot-api ${project.version} jar compile @@ -132,21 +139,39 @@ - clean install + install com.lukegb.mojo gitdescribe-maven-plugin 2.0 - ${buildtag.prefix} - ${buildtag.suffix} --always + ex-spigot + + git-Spigot- + + ../ + spigot.desc + + compile + + gitdescribe + + + + ex-craftbukkit + + - + + ../../CraftBukkit + craftbukkit.desc + compile gitdescribe @@ -163,7 +188,7 @@ org.bukkit.craftbukkit.Main CraftBukkit - ${describe} + ${spigot.desc}${craftbukkit.desc} Bukkit Team Bukkit ${api.version} @@ -196,7 +221,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.4 + 2.1 package 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.0