From 1f44ac1349b9039a365ca63f7ec578fdbc0974ea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml index 95a9224..00edfb5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.spigotmc - spigot + com.destroystokyo.paper + paper jar 1.9.4-R0.1-SNAPSHOT - Spigot - http://www.spigotmc.org + Paper + https://github.com/PaperSpigot/Paper UTF-8 @@ -15,21 +15,22 @@ 1_9_R2 git-Bukkit- - 1.6 - 1.6 + + 1.8 + 1.8 - org.spigotmc - spigot-parent + com.destroystokyo.paper + paper-parent dev-SNAPSHOT ../pom.xml - org.spigotmc - spigot-api + com.destroystokyo.paper + paper-api ${project.version} compile @@ -93,34 +94,22 @@ + paper-${minecraft.version} + clean install - net.md-5 - scriptus - 0.2 + com.lukegb.mojo + gitdescribe-maven-plugin + 1.3 + + git-Paper- + .. + - ex-spigot - - git-Spigot-%s - ../ - spigot.desc - - initialize + compile - describe - - - - ex-craftbukkit - - -%s - ../../CraftBukkit - craftbukkit.desc - - initialize - - describe + gitdescribe @@ -130,11 +119,12 @@ maven-jar-plugin 2.6 + true org.bukkit.craftbukkit.Main CraftBukkit - ${spigot.desc}${craftbukkit.desc} + ${describe} Bukkit Team Bukkit ${api.version} @@ -164,26 +154,6 @@ - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.14 - - - process-classes - - check - - - - - - org.codehaus.mojo.signature - java16 - 1.1 - - - - org.apache.maven.plugins maven-shade-plugin 2.4.1 @@ -194,11 +164,13 @@ shade + false - - joptsimple - org.bukkit.craftbukkit.libs.joptsimple - + + + + + jline org.bukkit.craftbukkit.libs.jline @@ -232,20 +204,6 @@ maven-compiler-plugin 3.1 - - - eclipse - - true - - - - - org.codehaus.plexus - plexus-compiler-eclipse - 2.5.0-spigotmc - - org.apache.maven.plugins diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 9304637..674096c 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.spigotmc/spigot-api/pom.properties"); + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties"); Properties properties = new Properties(); if (stream != null) { -- 2.8.3.windows.1