From f4ea7c10b004df52f20f9839eed47a71c4286c52 Mon Sep 17 00:00:00 2001 From: Spigot <noreply+git-spigot@papermc.io> Date: Sun, 3 Feb 2013 09:54:16 +1100 Subject: [PATCH] Actually use the parent pom. By: md_5 <md_5@live.com.au> --- Bukkit-Patches/0001-Spigot-POM-Changes.patch | 23 +++++++++++----- CraftBukkit-Patches/0001-POM-Changes.patch | 28 +++++++++++++------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch index 7e7b22fbfb..6622287868 100644 --- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch +++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch @@ -1,21 +1,30 @@ -From adc1a050f272a44a702f9334e33ee8e7126a679a Mon Sep 17 00:00:00 2001 -From: EvilSeph <evilseph@gmail.com> +From d4f2a6667c100c1a24d8362954fb3f49ccbe7c32 Mon Sep 17 00:00:00 2001 +From: md_5 <md_5@live.com.au> Date: Wed, 30 Jan 2013 23:44:29 -0500 Subject: [PATCH] Spigot POM Changes. --- - pom.xml | 36 ++++-------------------------------- - 1 file changed, 4 insertions(+), 32 deletions(-) + pom.xml | 46 +++++++++++++--------------------------------- + 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml -index 18bda4b..b531cec 100644 +index 18bda4b..ca4c1c4 100644 --- a/pom.xml +++ b/pom.xml -@@ -1,43 +1,15 @@ +@@ -1,43 +1,23 @@ <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> +- <modelVersion>4.0.0</modelVersion> - <groupId>org.bukkit</groupId> - <artifactId>bukkit</artifactId> ++ <modelVersion>4.0.0</modelVersion> ++ ++ <parent> ++ <groupId>org.spigotmc</groupId> ++ <artifactId>spigot-parent</artifactId> ++ <version>dev-SNAPSHOT</version> ++ <relativePath>../pom.xml</relativePath> ++ </parent> ++ + <groupId>org.spigotmc</groupId> + <artifactId>spigot-api</artifactId> <version>1.4.7-R1.1-SNAPSHOT</version> diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index e1ad5d2b72..8eb2e17ae6 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,22 +1,30 @@ -From 4cbb6243977214e595efa83ba0445c571dcb303b Mon Sep 17 00:00:00 2001 +From e0f7016338cf6506d7415d8373c425e0de92252c Mon Sep 17 00:00:00 2001 From: md_5 <md_5@live.com.au> Date: Sun, 3 Feb 2013 09:44:24 +1100 Subject: [PATCH] POM Changes. --- - pom.xml | 47 +++++++++++++---------------------------------- - 1 file changed, 13 insertions(+), 34 deletions(-) + pom.xml | 55 +++++++++++++++++++++---------------------------------- + 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml -index d697ca1..5a1a5dd 100644 +index d697ca1..f17bd19 100644 --- a/pom.xml +++ b/pom.xml -@@ -1,12 +1,12 @@ +@@ -1,12 +1,20 @@ <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.bukkit</groupId> - <artifactId>craftbukkit</artifactId> ++ ++ <parent> ++ <groupId>org.spigotmc</groupId> ++ <artifactId>spigot-parent</artifactId> ++ <version>dev-SNAPSHOT</version> ++ <relativePath>../pom.xml</relativePath> ++ </parent> ++ + <groupId>org.spigotmc</groupId> + <artifactId>spigot</artifactId> <packaging>jar</packaging> @@ -28,7 +36,7 @@ index d697ca1..5a1a5dd 100644 <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -@@ -16,25 +16,6 @@ +@@ -16,25 +24,6 @@ <minecraft_version>1_4_R1</minecraft_version> </properties> @@ -54,7 +62,7 @@ index d697ca1..5a1a5dd 100644 <repositories> <repository> <id>repobo-snap</id> -@@ -42,17 +23,10 @@ +@@ -42,17 +31,10 @@ </repository> </repositories> @@ -74,7 +82,7 @@ index d697ca1..5a1a5dd 100644 <version>${project.version}</version> <type>jar</type> <scope>compile</scope> -@@ -145,6 +119,11 @@ +@@ -145,6 +127,11 @@ <version>1.3</version> <scope>test</scope> </dependency> @@ -86,7 +94,7 @@ index d697ca1..5a1a5dd 100644 </dependencies> <!-- This builds a completely 'ready to start' jar with all dependencies inside --> -@@ -156,7 +135,7 @@ +@@ -156,7 +143,7 @@ <artifactId>gitdescribe-maven-plugin</artifactId> <version>1.3</version> <configuration> @@ -95,7 +103,7 @@ index d697ca1..5a1a5dd 100644 <outputPostfix></outputPostfix> </configuration> <executions> -@@ -210,7 +189,7 @@ +@@ -210,7 +197,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId>