From b00609242621c3d19cfd2d442f196474f97509f4 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 9fc92e347f..6cc18aa360 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ 4.0.0 - org.spigotmc - spigot + paper jar 1.15.2-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper + https://papermc.io - true + UTF-8 unknown 1.15.2 @@ -19,16 +18,22 @@ - 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 + + + com.destroystokyo.paper + paper-mojangapi ${project.version} compile @@ -106,34 +111,22 @@ + paper-${minecraft.version} + clean install - net.md-5 - scriptus - 0.4.1 + 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 @@ -143,6 +136,7 @@ maven-jar-plugin 3.2.0 + true false @@ -150,8 +144,9 @@ org.bukkit.craftbukkit.Main CraftBukkit - ${spigot.desc}${craftbukkit.desc} - ${project.build.outputTimestamp} + + ${describe} + ${maven.build.timestamp} Bukkit ${api.version} Bukkit Team @@ -190,6 +185,7 @@ shade + ${project.build.directory}/dependency-reduced-pom.xml ${shadeSourcesJar} @@ -213,10 +209,11 @@ jline org.bukkit.craftbukkit.libs.jline - - it.unimi - org.bukkit.craftbukkit.libs.it.unimi - + + + + + org.apache.commons.codec org.bukkit.craftbukkit.libs.org.apache.commons.codec @@ -258,10 +255,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.1 - - - eclipse - diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index 88223a53cb..cb5d0f5378 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -186,7 +186,7 @@ public class Main { } if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { - Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L); + Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); deadline.add(Calendar.DAY_OF_YEAR, -21); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d0..674096cab1 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.26.2