Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 21:47:55 +01:00
Code Issues Projects Releases Wiki Activity

Actually use the parent pom.

Browse Source
This commit is contained in:
md_5 2013-02-03 09:54:16 +11:00
parent 5853e18f40
commit 7b4bba6b3b
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Bukkit-Patches/0001-Spigot-POM-Changes.patch
View File

@ -1,21 +1,30 @@
From adc1a050f272a44a702f9334e33ee8e7126a679a Mon Sep 17 00:00:00 2001 From d4f2a6667c100c1a24d8362954fb3f49ccbe7c32 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@gmail.com> From: md_5 <md_5@live.com.au>
Date: Wed, 30 Jan 2013 23:44:29 -0500 Date: Wed, 30 Jan 2013 23:44:29 -0500
Subject: [PATCH] Spigot POM Changes. Subject: [PATCH] Spigot POM Changes.
--- ---
pom.xml | 36 ++++-------------------------------- pom.xml | 46 +++++++++++++---------------------------------
1 file changed, 4 insertions(+), 32 deletions(-) 1 file changed, 13 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 18bda4b..b531cec 100644 index 18bda4b..ca4c1c4 100644
--- a/pom.xml --- a/pom.xml
+++ b/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"> <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> - <groupId>org.bukkit</groupId>
- <artifactId>bukkit</artifactId> - <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> + <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId> + <artifactId>spigot-api</artifactId>
<version>1.4.7-R1.1-SNAPSHOT</version> <version>1.4.7-R1.1-SNAPSHOT</version>

28
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -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> From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:44:24 +1100 Date: Sun, 3 Feb 2013 09:44:24 +1100
Subject: [PATCH] POM Changes. Subject: [PATCH] POM Changes.
--- ---
pom.xml | 47 +++++++++++++---------------------------------- pom.xml | 55 +++++++++++++++++++++----------------------------------
1 file changed, 13 insertions(+), 34 deletions(-) 1 file changed, 21 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index d697ca1..5a1a5dd 100644 index d697ca1..f17bd19 100644
--- a/pom.xml --- a/pom.xml
+++ b/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" <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"> 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> - <groupId>org.bukkit</groupId>
- <artifactId>craftbukkit</artifactId> - <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> + <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId> + <artifactId>spigot</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -28,7 +36,7 @@ index d697ca1..5a1a5dd 100644
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,25 +16,6 @@ @@ -16,25 +24,6 @@
<minecraft_version>1_4_R1</minecraft_version> <minecraft_version>1_4_R1</minecraft_version>
</properties> </properties>
@ -54,7 +62,7 @@ index d697ca1..5a1a5dd 100644
<repositories> <repositories>
<repository> <repository>
<id>repobo-snap</id> <id>repobo-snap</id>
@@ -42,17 +23,10 @@ @@ -42,17 +31,10 @@
</repository> </repository>
</repositories> </repositories>
@ -74,7 +82,7 @@ index d697ca1..5a1a5dd 100644
<version>${project.version}</version> <version>${project.version}</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
@@ -145,6 +119,11 @@ @@ -145,6 +127,11 @@
<version>1.3</version> <version>1.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -86,7 +94,7 @@ index d697ca1..5a1a5dd 100644
</dependencies> </dependencies>
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- 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> <artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version> <version>1.3</version>
<configuration> <configuration>
@ -95,7 +103,7 @@ index d697ca1..5a1a5dd 100644
<outputPostfix></outputPostfix> <outputPostfix></outputPostfix>
</configuration> </configuration>
<executions> <executions>
@@ -210,7 +189,7 @@ @@ -210,7 +197,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>