From 66423fc5b0daf2d2cb7bd1a41bd276d019d0210a Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 13 Oct 2019 01:19:22 -0500
Subject: [PATCH] Revert "Fix jline with git builds under Windows (#2624)"
 (#2632)

This reverts commit ea056d0fd217c9ca14f9c1bc222147ba28865f46.
---
 Spigot-Server-Patches/POM-Changes.patch | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index d0cc647ff..3e76f6fde 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 0f8bccd43..364f66bda 100644
+index 0f8bccd430..04b0dd9a7f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -57,12 +57,14 @@ index 0f8bccd43..364f66bda 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>
-+                <version>0.3.1</version>
++                <groupId>com.lukegb.mojo</groupId>
++                <artifactId>gitdescribe-maven-plugin</artifactId>
++                <version>1.3</version>
 +                <configuration>
-+                    <format>git-Paper-%s</format>
++                    <outputPrefix>git-Paper-</outputPrefix>
 +                    <scmDirectory>..</scmDirectory>
 +                </configuration>
                  <executions>
@@ -74,7 +76,8 @@ index 0f8bccd43..364f66bda 100644
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
--                        <goals>
++                        <phase>compile</phase>
+                         <goals>
 -                            <goal>describe</goal>
 -                        </goals>
 -                    </execution>
@@ -86,10 +89,12 @@ index 0f8bccd43..364f66bda 100644
 -                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
 -                        </configuration>
 -                        <phase>initialize</phase>
-+                        <phase>compile</phase>
-                         <goals>
-                             <goal>describe</goal>
+-                        <goals>
+-                            <goal>describe</goal>
++                            <goal>gitdescribe</goal>
                          </goals>
+                     </execution>
+                 </executions>
 @@ -0,0 +0,0 @@
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>2.4</version>
@@ -141,7 +146,7 @@ index 0f8bccd43..364f66bda 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 93046379d..674096cab 100644
+index 93046379d0..674096cab1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -0,0 +0,0 @@ public final class Versioning {