mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop relocating jopt-simple

Browse source 
Workaround for GH-189
Relocation breaks the lookup of a resource bundle, and this is easier than forking and maintaining our own version
 AFAIK this should be fine to do. Guess we'll see
This commit is contained in:
Zach Brown 2016-05-29 18:26:35 -05:00
parent a8d326f367
commit 0a98d670fe
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 91ee9a57d18f73a2947465b971dc8e81c0b3fae2 Mon Sep 17 00:00:00 2001 From 1f44ac1349b9039a365ca63f7ec578fdbc0974ea Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:40:33 -0600 Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 95a9224..90fde44 100644 index 95a9224..00edfb5 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
@ -81,7 +81,8 @@ index 95a9224..90fde44 100644
- <descriptionProperty>spigot.desc</descriptionProperty> - <descriptionProperty>spigot.desc</descriptionProperty>
- </configuration> - </configuration>
- <phase>initialize</phase> - <phase>initialize</phase>
- <goals> + <phase>compile</phase>
<goals>
- <goal>describe</goal> - <goal>describe</goal>
- </goals> - </goals>
- </execution> - </execution>
@ -93,8 +94,7 @@ index 95a9224..90fde44 100644
- <descriptionProperty>craftbukkit.desc</descriptionProperty> - <descriptionProperty>craftbukkit.desc</descriptionProperty>
- </configuration> - </configuration>
- <phase>initialize</phase> - <phase>initialize</phase>
+ <phase>compile</phase> - <goals>
<goals>
- <goal>describe</goal> - <goal>describe</goal>
+ <goal>gitdescribe</goal> + <goal>gitdescribe</goal>
</goals> </goals>
@ -141,15 +141,25 @@ index 95a9224..90fde44 100644
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version> <version>2.4.1</version>
@@ -194,6 +164,7 @@ @@ -194,11 +164,13 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper --> + <createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper -->
<relocations> <relocations>
- <relocation>
- <pattern>joptsimple</pattern>
- <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
- </relocation>
+ <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
+ <!--<relocation>-->
+ <!--<pattern>joptsimple</pattern>-->
+ <!--<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>-->
+ <!--</relocation>-->
<relocation> <relocation>
<pattern>joptsimple</pattern> <pattern>jline</pattern>
@@ -232,20 +203,6 @@ <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
@@ -232,20 +204,6 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- versions after this appear to be broken --> <!-- versions after this appear to be broken -->
<version>3.1</version> <version>3.1</version>
@ -184,5 +194,5 @@ index 9304637..674096c 100644
if (stream != null) { if (stream != null) {
-- --
2.8.2 2.8.3.windows.1