SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Stop relocating jopt-simple

Quellcode durchsuchen 
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
Dieser Commit ist enthalten in:
Zach Brown 2016-05-29 18:26:35 -05:00
Ursprung d9971432c2
Commit a618f33267
1 geänderte Dateien mit 14 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

18
Spigot-Server-Patches/POM-Changes.patch
Datei anzeigen

@ -81,7 +81,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <descriptionProperty>spigot.desc</descriptionProperty>
- </configuration>
- <phase>initialize</phase>
- <goals>
+ <phase>compile</phase>
<goals>
- <goal>describe</goal>
- </goals>
- </execution>
@ -93,8 +94,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <descriptionProperty>craftbukkit.desc</descriptionProperty>
- </configuration>
- <phase>initialize</phase>
+ <phase>compile</phase>
<goals>
- <goals>
- <goal>describe</goal>
+ <goal>gitdescribe</goal>
</goals>
@ -147,8 +147,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper -->
<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>
<pattern>joptsimple</pattern>
<pattern>jline</pattern>
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
@@ -0,0 +0,0 @@
<artifactId>maven-compiler-plugin</artifactId>
<!-- versions after this appear to be broken -->