TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-add dependency reduced pom

Browse source 
Learned the correct way to handle that file
This commit is contained in:
Aikar 2016-11-18 21:09:03 -05:00
parent 7e37e54053
commit ae5a66ed1b
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Spigot-API-Patches/0001-POM-changes.patch
View file

@ -1,11 +1,11 @@
From b3731bee34a4bb6ddd06bc47e1b0c9631aabcec9 Mon Sep 17 00:00:00 2001
From ac84151c8a02652a1137b7853894796dba4c3df3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 2ccc205..1ce6a91 100644
index 2ccc205..6e0250c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@ -122,6 +122,16 @@ index 2ccc205..1ce6a91 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
@@ -161,8 +158,7 @@
</execution>
</executions>
<configuration>
- <!-- utterly useless artifact from shade 2.x -->
- <createDependencyReducedPom>false</createDependencyReducedPom>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2.10.2

6
Spigot-Server-Patches/0001-POM-Changes.patch
View file

@ -1,11 +1,11 @@
From ef4a8ce2c0397b24187bd98015ccc83c33f14062 Mon Sep 17 00:00:00 2001
From 0e7f1c733e810fc4e95da50c1c21214b500ca44e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 165863b..87f438c 100644
index c5fd4d0..2fa1925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -145,7 +145,7 @@ index 165863b..87f438c 100644
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper -->
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
<relocations>
- <relocation>
- <pattern>joptsimple</pattern>