diff options
| author | Andrew Steinborn <[email protected]> | 2019-10-13 01:06:44 -0400 |
|---|---|---|
| committer | Zach <[email protected]> | 2019-10-13 00:06:44 -0500 |
| commit | 0c64f7b0ae77cc6539126c9008ec6ff616dee220 (patch) | |
| tree | a7b4e8ded8c52e4391f9de6b288ba6e69fa4029e | |
| parent | e8c82f4eeeb511b7bfa974ddd2cc5d58779c8805 (diff) | |
| download | Paper-0c64f7b0ae77cc6539126c9008ec6ff616dee220.tar.gz Paper-0c64f7b0ae77cc6539126c9008ec6ff616dee220.zip | |
Fix jline with git builds under Windows (#2624)
| -rw-r--r-- | Spigot-Server-Patches/0001-POM-Changes.patch | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 51dd071ee3..9d32c094f1 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 566af2ba410dc0dfd23c752b3f94cc20a39fc736 Mon Sep 17 00:00:00 2001 +From fd4dfa16d58ebc91625cd41e8ac311f32df1606a Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 0f8bccd430..04b0dd9a7f 100644 +index 0f8bccd43..364f66bda 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -49,7 +49,7 @@ index 0f8bccd430..04b0dd9a7f 100644 <version>${project.version}</version> <scope>compile</scope> </dependency> -@@ -109,34 +108,22 @@ +@@ -109,32 +108,20 @@ <!-- This builds a completely 'ready to start' jar with all dependencies inside --> <build> @@ -57,14 +57,12 @@ index 0f8bccd430..04b0dd9a7f 100644 + <defaultGoal>clean install</defaultGoal> <!-- Paper --> <plugins> <plugin> -- <groupId>net.md-5</groupId> -- <artifactId>scriptus</artifactId> + <groupId>net.md-5</groupId> + <artifactId>scriptus</artifactId> - <version>0.2</version> -+ <groupId>com.lukegb.mojo</groupId> -+ <artifactId>gitdescribe-maven-plugin</artifactId> -+ <version>1.3</version> ++ <version>0.3.1</version> + <configuration> -+ <outputPrefix>git-Paper-</outputPrefix> ++ <format>git-Paper-%s</format> + <scmDirectory>..</scmDirectory> + </configuration> <executions> @@ -76,8 +74,7 @@ index 0f8bccd430..04b0dd9a7f 100644 - <descriptionProperty>spigot.desc</descriptionProperty> - </configuration> - <phase>initialize</phase> -+ <phase>compile</phase> - <goals> +- <goals> - <goal>describe</goal> - </goals> - </execution> @@ -89,12 +86,10 @@ index 0f8bccd430..04b0dd9a7f 100644 - <descriptionProperty>craftbukkit.desc</descriptionProperty> - </configuration> - <phase>initialize</phase> -- <goals> -- <goal>describe</goal> -+ <goal>gitdescribe</goal> ++ <phase>compile</phase> + <goals> + <goal>describe</goal> </goals> - </execution> - </executions> @@ -146,11 +133,13 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> @@ -146,7 +141,7 @@ index 0f8bccd430..04b0dd9a7f 100644 <!-- we need our custom version as it fixes some bugs on case sensitive file systems --> <dependency> diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 93046379d0..674096cab1 100644 +index 93046379d..674096cab 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -159,5 +154,5 @@ index 93046379d0..674096cab1 100644 if (stream != null) { -- -2.22.0 +2.23.0 |