From 0000000000000000000000000000000000000000 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 920da83478057968db0e179954041e5747b41bcd..46e85fa9fafacf3b38dfb9b240e2d6f447ebabaa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ 4.0.0 - org.spigotmc - spigot + paper jar 1.16.5-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper + https://papermc.io - true + UTF-8 unknown git @@ -20,21 +19,39 @@ - org.spigotmc - spigot-parent + com.destroystokyo.paper + paper-parent dev-SNAPSHOT ../pom.xml + + + + org.apache.logging.log4j + log4j-bom + 2.11.2 + pom + import + + + + - org.spigotmc - spigot-api + com.destroystokyo.paper + paper-api + ${project.version} + compile + + + com.destroystokyo.paper + paper-mojangapi ${project.version} compile - org.spigotmc + io.papermc minecraft-server ${minecraft.version}-SNAPSHOT compile @@ -45,18 +62,15 @@ 2.12.1 compile + + org.apache.logging.log4j + log4j-api + compile + org.apache.logging.log4j log4j-iostreams - 2.8.1 compile - - - - org.apache.logging.log4j - log4j-api - - org.ow2.asm @@ -64,6 +78,17 @@ 9.1 compile + + + co.aikar + cleaner + 1.0-SNAPSHOT + + + io.netty + netty-all + 4.1.50.Final + com.googlecode.json-simple @@ -80,7 +105,7 @@ mysql mysql-connector-java - 5.1.49 + 8.0.23 runtime @@ -105,7 +130,7 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.8.1 + compile @@ -132,34 +157,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 - - ${bt.name}-Spigot-%s - ../ - spigot.desc - - initialize + compile - describe - - - - ex-craftbukkit - - -%s - ../../CraftBukkit - craftbukkit.desc - - initialize - - describe + gitdescribe @@ -169,6 +182,7 @@ maven-jar-plugin 3.2.0 + true false @@ -176,11 +190,13 @@ org.bukkit.craftbukkit.Main CraftBukkit - ${spigot.desc}${craftbukkit.desc} - ${project.build.outputTimestamp} + + ${describe} + ${maven.build.timestamp} Bukkit ${api.version} Bukkit Team + true @@ -216,14 +232,24 @@ shade + ${project.build.directory}/dependency-reduced-pom.xml ${shadeSourcesJar} - org.spigotmc:minecraft-server + io.papermc:minecraft-server com/google/common/** com/google/gson/** com/google/thirdparty/** + + io/netty/** + META-INF/native/libnetty* + com/mojang/brigadier/** + META-INF/MANIFEST.MF + com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.class + com/mojang/datafixers/util/Either* + org/apache/logging/log4j/** + META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat @@ -245,10 +271,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 @@ -316,10 +343,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.1 - - - eclipse - org.codehaus.plexus diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index 036c870d991118e5c09eced8485b94579bc6782a..c6417a0594ffe2d3650ec54d44e575e347a1f724 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, -28); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d0cefd5d3236fc59e698809acdc18f80..674096cab190d62622f9947853b056f57d43a2a5 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) {