From ede9fd5f7e5e6b8d0a3069fa2568782e553502bd 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 ed0ddbd86..fce7fe4d0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - org.spigotmc - spigot + com.destroystokyo.paper + paper jar 1.12-pre6-SNAPSHOT - Spigot - http://www.spigotmc.org + Paper + https://github.com/PaperMC/Paper UTF-8 @@ -21,16 +21,16 @@ - 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 @@ -94,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 @@ -131,11 +119,12 @@ maven-jar-plugin 3.0.2 + true org.bukkit.craftbukkit.Main CraftBukkit - ${spigot.desc}${craftbukkit.desc} + ${describe} ${maven.build.timestamp} Bukkit ${api.version} @@ -195,11 +184,13 @@ shade + ${project.build.directory}/dependency-reduced-pom.xml - - joptsimple - org.bukkit.craftbukkit.libs.joptsimple - + + + + + jline org.bukkit.craftbukkit.libs.jline @@ -234,20 +225,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 93046379d..674096cab 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.13.0