Fix patches

This commit is contained in:
md_5 2015-01-09 11:14:57 +11:00 committed by Zach Brown
parent 6c95b61fd5
commit 35f381961d

View File

@ -1,4 +1,4 @@
From c6953dc30ed342ede3d1f0396fa93b47bf0a647f Mon Sep 17 00:00:00 2001
From 5a203aaea5ba33c3747926d34ddbb46176bf7ca7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index a0d4db6..8c4a517 100644
index 34b539b..017eecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -26,7 +26,7 @@ index a0d4db6..8c4a517 100644
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,10 +20,17 @@
@@ -20,6 +20,13 @@
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
@ -37,6 +37,11 @@ index a0d4db6..8c4a517 100644
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
@@ -29,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.bukkit</groupId>
@ -46,7 +51,7 @@ index a0d4db6..8c4a517 100644
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -93,21 +100,39 @@
@@ -104,21 +111,39 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@ -89,7 +94,7 @@ index a0d4db6..8c4a517 100644
<phase>compile</phase>
<goals>
<goal>gitdescribe</goal>
@@ -124,7 +149,7 @@
@@ -135,7 +160,7 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>