From 82db846be6b1b42e7832752f405ff080bc4ce7df Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 02:13:51 -0400 Subject: [PATCH] set default goals on all pom poms --- Spigot-API-Patches/0001-POM-changes.patch | 16 +++++++++---- Spigot-Server-Patches/0001-POM-Changes.patch | 25 ++++++++++++++------ pom.xml | 4 ++++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 24a010aca6..90e2c2c131 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 6f357f8fcd6d70079999cfc38064ec0df97c4b99 Mon Sep 17 00:00:00 2001 +From ecf0497b4369c1851972cefd26fc4ee896fd1ebb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index dec3b6c..b85201d 100644 +index 8fb67ea..d916f44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ @@ -59,7 +59,15 @@ index dec3b6c..b85201d 100644 -@@ -129,26 +131,6 @@ +@@ -107,6 +109,7 @@ + + + ++ clean install + + + org.apache.maven.plugins +@@ -129,26 +132,6 @@ @@ -87,5 +95,5 @@ index dec3b6c..b85201d 100644 maven-shade-plugin 2.4.1 -- -2.7.2 +2.7.3 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index e09bdb7e46..d419f58c85 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 3f12fafbace495fff95f54531ff5d52d6706b3c1 Mon Sep 17 00:00:00 2001 +From 02259eec6505e02230fdf82e1f7087f57daca410 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 953cdbc..ddbb829 100644 +index 4f7cea7..7762cc9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -54,8 +54,11 @@ index 953cdbc..ddbb829 100644 ${project.version} compile -@@ -95,32 +96,18 @@ +@@ -93,34 +94,21 @@ + + ++ clean install - net.md-5 @@ -96,7 +99,7 @@ index 953cdbc..ddbb829 100644 -@@ -130,11 +117,12 @@ +@@ -130,11 +118,12 @@ maven-jar-plugin 2.6 @@ -110,7 +113,7 @@ index 953cdbc..ddbb829 100644 Bukkit Team Bukkit ${api.version} -@@ -164,26 +152,6 @@ +@@ -164,26 +153,6 @@ @@ -137,7 +140,15 @@ index 953cdbc..ddbb829 100644 org.apache.maven.plugins maven-shade-plugin 2.4.1 -@@ -232,20 +200,6 @@ +@@ -194,6 +163,7 @@ + shade + + ++ false + + + joptsimple +@@ -232,20 +202,6 @@ maven-compiler-plugin 3.1 @@ -172,5 +183,5 @@ index 9304637..674096c 100644 if (stream != null) { -- -2.7.2 +2.7.3 diff --git a/pom.xml b/pom.xml index 1121d4f6df..066f8d8893 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,10 @@ Paper-API + + clean install + + UTF-8