2014-11-28 01:17:45 +00:00
|
|
|
From ef69e326d930564b7c45cd34a9d583e3dcf25744 Mon Sep 17 00:00:00 2001
|
2014-07-21 20:46:54 +00:00
|
|
|
From: Zach Brown <Zbob750@live.com>
|
2014-11-28 01:17:45 +00:00
|
|
|
Date: Thu, 27 Nov 2014 22:43:08 -0800
|
2014-07-21 20:46:54 +00:00
|
|
|
Subject: [PATCH] POM changes
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
2014-11-28 01:17:45 +00:00
|
|
|
index 64600fb..fc72aa1 100644
|
2014-07-21 20:46:54 +00:00
|
|
|
--- 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"
|
|
|
|
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>
|
2014-11-28 01:17:45 +00:00
|
|
|
<version>1.8-R0.1-SNAPSHOT</version>
|
2014-07-21 20:46:54 +00:00
|
|
|
- <name>Spigot</name>
|
|
|
|
- <url>http://www.spigotmc.org</url>
|
|
|
|
+ <name>PaperSpigot</name>
|
2014-11-28 01:17:45 +00:00
|
|
|
+ <url>https://github.com/PaperSpigot/Paper</url>
|
2014-07-21 20:46:54 +00:00
|
|
|
|
|
|
|
<properties>
|
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
|
@@ -19,8 +19,8 @@
|
|
|
|
</properties>
|
|
|
|
|
|
|
|
<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>
|
2014-11-28 01:17:45 +00:00
|
|
|
@@ -41,8 +41,8 @@
|
2014-07-21 20:46:54 +00:00
|
|
|
|
|
|
|
<dependencies>
|
|
|
|
<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>
|
2014-11-28 01:17:45 +00:00
|
|
|
@@ -146,7 +146,7 @@
|
2014-07-21 20:46:54 +00:00
|
|
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
|
|
|
<version>1.3</version>
|
|
|
|
<configuration>
|
|
|
|
- <outputPrefix>git-Spigot-</outputPrefix>
|
|
|
|
+ <outputPrefix>git-PaperSpigot-</outputPrefix>
|
|
|
|
<outputPostfix></outputPostfix>
|
|
|
|
</configuration>
|
|
|
|
<executions>
|
2014-07-23 01:16:50 +00: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) {
|
2014-07-21 20:46:54 +00:00
|
|
|
--
|
|
|
|
1.9.1
|
|
|
|
|