2020-05-02 00:03:47 +02:00
|
|
|
From e25efa93c402502049e6ccd531118f65a856d1a9 Mon Sep 17 00:00:00 2001
|
2015-01-29 22:25:50 +01:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Mon, 29 Feb 2016 20:40:33 -0600
|
2015-03-08 02:16:09 +01:00
|
|
|
Subject: [PATCH] POM Changes
|
2014-07-21 22:46:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
2020-04-27 09:34:45 +02:00
|
|
|
index 9fc92e347f..6cc18aa360 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/pom.xml
|
|
|
|
+++ b/pom.xml
|
2019-02-07 06:48:17 +01:00
|
|
|
@@ -1,15 +1,14 @@
|
2014-07-21 22:46:54 +02:00
|
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
2015-03-20 01:41:36 +01:00
|
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
|
|
- <artifactId>spigot</artifactId>
|
2016-03-01 00:09:49 +01:00
|
|
|
+ <artifactId>paper</artifactId>
|
2015-03-20 01:41:36 +01:00
|
|
|
<packaging>jar</packaging>
|
2020-01-22 03:02:07 +01:00
|
|
|
<version>1.15.2-R0.1-SNAPSHOT</version>
|
2015-03-20 01:41:36 +01:00
|
|
|
- <name>Spigot</name>
|
2019-04-25 08:53:51 +02:00
|
|
|
- <url>https://www.spigotmc.org/</url>
|
2016-03-01 00:09:49 +01:00
|
|
|
+ <name>Paper</name>
|
2018-10-05 17:52:04 +02:00
|
|
|
+ <url>https://papermc.io</url>
|
2014-07-21 22:46:54 +02:00
|
|
|
|
2015-03-20 01:41:36 +01:00
|
|
|
<properties>
|
2019-02-07 06:48:17 +01:00
|
|
|
- <skipTests>true</skipTests>
|
|
|
|
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
|
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
|
<api.version>unknown</api.version>
|
2020-01-22 03:02:07 +01:00
|
|
|
<minecraft.version>1.15.2</minecraft.version>
|
2020-04-27 09:34:45 +02:00
|
|
|
@@ -19,16 +18,22 @@
|
2015-03-20 01:41:36 +01:00
|
|
|
</properties>
|
2014-07-21 22:46:54 +02:00
|
|
|
|
2015-03-20 01:41:36 +01:00
|
|
|
<parent>
|
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
|
|
- <artifactId>spigot-parent</artifactId>
|
2016-03-01 00:09:49 +01:00
|
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
|
|
+ <artifactId>paper-parent</artifactId>
|
2015-03-20 01:41:36 +01:00
|
|
|
<version>dev-SNAPSHOT</version>
|
|
|
|
<relativePath>../pom.xml</relativePath>
|
|
|
|
</parent>
|
2018-07-15 03:53:17 +02:00
|
|
|
|
|
|
|
<dependencies>
|
2015-03-20 01:41:36 +01:00
|
|
|
<dependency>
|
|
|
|
- <groupId>org.spigotmc</groupId>
|
|
|
|
- <artifactId>spigot-api</artifactId>
|
2016-03-01 00:09:49 +01:00
|
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
|
|
+ <artifactId>paper-api</artifactId>
|
2020-04-27 07:37:37 +02:00
|
|
|
+ <version>${project.version}</version>
|
|
|
|
+ <scope>compile</scope>
|
|
|
|
+ </dependency>
|
|
|
|
+ <dependency>
|
|
|
|
+ <groupId>com.destroystokyo.paper</groupId>
|
|
|
|
+ <artifactId>paper-mojangapi</artifactId>
|
2015-03-20 01:41:36 +01:00
|
|
|
<version>${project.version}</version>
|
|
|
|
<scope>compile</scope>
|
2016-03-01 00:09:49 +01:00
|
|
|
</dependency>
|
2020-04-27 09:34:45 +02:00
|
|
|
@@ -106,34 +111,22 @@
|
2016-03-18 07:13:51 +01:00
|
|
|
|
|
|
|
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
2016-03-01 00:09:49 +01:00
|
|
|
<build>
|
2016-03-31 03:27:13 +02:00
|
|
|
+ <finalName>paper-${minecraft.version}</finalName>
|
2016-03-18 07:13:51 +01:00
|
|
|
+ <defaultGoal>clean install</defaultGoal> <!-- Paper -->
|
2016-02-15 13:02:47 +01:00
|
|
|
<plugins>
|
|
|
|
<plugin>
|
2019-10-13 08:19:22 +02:00
|
|
|
- <groupId>net.md-5</groupId>
|
|
|
|
- <artifactId>scriptus</artifactId>
|
2020-04-27 09:34:45 +02:00
|
|
|
- <version>0.4.1</version>
|
2019-10-13 08:19:22 +02:00
|
|
|
+ <groupId>com.lukegb.mojo</groupId>
|
|
|
|
+ <artifactId>gitdescribe-maven-plugin</artifactId>
|
|
|
|
+ <version>1.3</version>
|
2016-03-01 00:09:49 +01:00
|
|
|
+ <configuration>
|
2019-10-13 08:19:22 +02:00
|
|
|
+ <outputPrefix>git-Paper-</outputPrefix>
|
2016-03-01 00:09:49 +01:00
|
|
|
+ <scmDirectory>..</scmDirectory>
|
|
|
|
+ </configuration>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
2015-03-20 01:41:36 +01:00
|
|
|
- <id>ex-spigot</id>
|
2016-02-15 13:02:47 +01:00
|
|
|
- <configuration>
|
2015-03-20 01:41:36 +01:00
|
|
|
- <format>git-Spigot-%s</format>
|
2016-02-15 13:02:47 +01:00
|
|
|
- <scmDirectory>../</scmDirectory>
|
2015-03-20 01:41:36 +01:00
|
|
|
- <descriptionProperty>spigot.desc</descriptionProperty>
|
2016-02-15 13:02:47 +01:00
|
|
|
- </configuration>
|
|
|
|
- <phase>initialize</phase>
|
2019-10-13 08:19:22 +02:00
|
|
|
+ <phase>compile</phase>
|
|
|
|
<goals>
|
2016-02-15 13:02:47 +01:00
|
|
|
- <goal>describe</goal>
|
|
|
|
- </goals>
|
|
|
|
- </execution>
|
|
|
|
- <execution>
|
|
|
|
- <id>ex-craftbukkit</id>
|
|
|
|
- <configuration>
|
|
|
|
- <format>-%s</format>
|
|
|
|
- <scmDirectory>../../CraftBukkit</scmDirectory>
|
|
|
|
- <descriptionProperty>craftbukkit.desc</descriptionProperty>
|
|
|
|
- </configuration>
|
|
|
|
- <phase>initialize</phase>
|
2019-10-13 08:19:22 +02:00
|
|
|
- <goals>
|
|
|
|
- <goal>describe</goal>
|
|
|
|
+ <goal>gitdescribe</goal>
|
2016-03-01 00:09:49 +01:00
|
|
|
</goals>
|
2019-10-13 08:19:22 +02:00
|
|
|
</execution>
|
|
|
|
</executions>
|
2020-04-27 09:34:45 +02:00
|
|
|
@@ -143,6 +136,7 @@
|
2016-02-15 13:02:47 +01:00
|
|
|
<artifactId>maven-jar-plugin</artifactId>
|
2020-04-27 09:34:45 +02:00
|
|
|
<version>3.2.0</version>
|
2016-03-01 00:09:49 +01:00
|
|
|
<configuration>
|
|
|
|
+ <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
|
|
|
|
<archive>
|
2020-04-27 09:34:45 +02:00
|
|
|
<manifest>
|
|
|
|
<addDefaultEntries>false</addDefaultEntries>
|
|
|
|
@@ -150,8 +144,9 @@
|
2015-03-20 01:41:36 +01:00
|
|
|
<manifestEntries>
|
|
|
|
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
|
|
|
<Implementation-Title>CraftBukkit</Implementation-Title>
|
|
|
|
- <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
|
2020-04-27 09:34:45 +02:00
|
|
|
- <Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
|
2018-08-26 20:11:49 +02:00
|
|
|
+ <!--suppress MavenModelInspection -->
|
2016-02-15 13:02:47 +01:00
|
|
|
+ <Implementation-Version>${describe}</Implementation-Version>
|
2020-04-27 09:34:45 +02:00
|
|
|
+ <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
|
2015-03-20 01:41:36 +01:00
|
|
|
<Specification-Title>Bukkit</Specification-Title>
|
|
|
|
<Specification-Version>${api.version}</Specification-Version>
|
2020-04-27 09:34:45 +02:00
|
|
|
<Specification-Vendor>Bukkit Team</Specification-Vendor>
|
2020-04-27 07:37:37 +02:00
|
|
|
@@ -190,6 +185,7 @@
|
2016-03-18 07:13:51 +01:00
|
|
|
<goal>shade</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
2016-11-19 03:09:03 +01:00
|
|
|
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
|
2018-12-08 11:09:55 +01:00
|
|
|
<createSourcesJar>${shadeSourcesJar}</createSourcesJar>
|
2020-04-27 09:34:45 +02:00
|
|
|
<filters>
|
|
|
|
<filter>
|
|
|
|
@@ -213,10 +209,11 @@
|
2016-05-30 01:26:35 +02:00
|
|
|
<pattern>jline</pattern>
|
|
|
|
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
|
2017-06-08 20:07:00 +02:00
|
|
|
</relocation>
|
|
|
|
- <relocation>
|
|
|
|
- <pattern>it.unimi</pattern>
|
|
|
|
- <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
|
|
|
|
- </relocation>
|
|
|
|
+ <!-- Paper - Don't relocate fastutil in order to prevent api breakage -->
|
|
|
|
+ <!--<relocation>-->
|
|
|
|
+ <!--<pattern>it.unimi</pattern>-->
|
|
|
|
+ <!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>-->
|
|
|
|
+ <!--</relocation>-->
|
|
|
|
<relocation>
|
2019-04-23 06:47:07 +02:00
|
|
|
<pattern>org.apache.commons.codec</pattern>
|
|
|
|
<shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
|
2020-04-27 09:34:45 +02:00
|
|
|
@@ -258,10 +255,6 @@
|
2017-07-17 02:36:27 +02:00
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
2016-03-01 00:09:49 +01:00
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
2019-12-11 01:56:03 +01:00
|
|
|
<version>3.8.1</version>
|
2016-03-01 00:09:49 +01:00
|
|
|
- <configuration>
|
|
|
|
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
|
|
|
|
- <compilerId>eclipse</compilerId>
|
|
|
|
- </configuration>
|
2019-01-24 22:36:24 +01:00
|
|
|
<dependencies>
|
|
|
|
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
|
|
|
|
<dependency>
|
2020-04-27 10:03:00 +02:00
|
|
|
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);
|
2014-07-23 03:16:50 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
2020-04-02 23:07:06 +02:00
|
|
|
index 93046379d0..674096cab1 100644
|
2014-07-23 03:16:50 +02:00
|
|
|
--- 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");
|
2016-03-01 00:09:49 +01:00
|
|
|
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties");
|
2014-07-23 03:16:50 +02:00
|
|
|
Properties properties = new Properties();
|
|
|
|
|
|
|
|
if (stream != null) {
|
2014-07-21 22:46:54 +02:00
|
|
|
--
|
2020-04-27 07:37:37 +02:00
|
|
|
2.26.2
|
2014-07-21 22:46:54 +02:00
|
|
|
|