Paper/Spigot-Server-Patches/0001-POM-Changes.patch

99 lines
4.3 KiB
Diff
Raw Normal View History

2015-05-25 22:59:30 +02:00
From cd68e613ef1dab9ea6c0949808e692305bbd7b3d Mon Sep 17 00:00:00 2001
2015-01-29 22:25:50 +01:00
From: Zach Brown <zach.brown@destroystokyo.com>
2015-03-20 01:41:36 +01:00
Date: Thu, 19 Mar 2015 19:41:15 -0500
2015-03-08 02:16:09 +01:00
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
2015-05-25 22:59:30 +02:00
index 99fe937..61d6346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
<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>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot</artifactId>
<packaging>jar</packaging>
2015-05-25 22:59:30 +02:00
<version>1.8.6-R0.1-SNAPSHOT</version>
2015-03-20 01:41:36 +01:00
- <name>Spigot</name>
- <url>http://www.spigotmc.org</url>
2015-05-03 23:28:13 +02:00
+ <name>PaperSpigot</name>
2015-03-20 01:41:36 +01:00
+ <url>https://hub.spigotmc.org/stash/projects/PAPER/</url>
2015-03-20 01:41:36 +01:00
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2015-03-08 02:16:09 +01:00
@@ -21,8 +21,8 @@
2015-03-20 01:41:36 +01:00
</properties>
2015-03-20 01:41:36 +01:00
<parent>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-parent</artifactId>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-parent</artifactId>
<version>dev-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
2015-03-08 02:16:09 +01:00
@@ -34,8 +34,8 @@
2015-03-20 01:41:36 +01:00
<version>3.0.3</version>
</dependency>
<dependency>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
+ <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -108,11 +108,11 @@
<version>0.2</version>
<executions>
<execution>
- <id>ex-spigot</id>
+ <id>ex-paperspigot</id>
<configuration>
- <format>git-Spigot-%s</format>
+ <format>git-PaperSpigot-%s</format>
<scmDirectory>../</scmDirectory>
- <descriptionProperty>spigot.desc</descriptionProperty>
+ <descriptionProperty>paperspigot.desc</descriptionProperty>
</configuration>
<phase>initialize</phase>
<goals>
@@ -132,7 +132,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -142,7 +142,7 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>
- <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
+ <Implementation-Version>${paperspigot.desc}${craftbukkit.desc}</Implementation-Version>
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
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
index 9304637..3a4b142 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/org.github.paperspigot/paperspigot-api/pom.properties");
Properties properties = new Properties();
if (stream != null) {
--
2015-05-19 01:41:57 +02:00
2.4.1.windows.1