SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix jline with git builds under Windows (#2624)" (#2632)

Browse Source 
This reverts commit ea056d0fd2.
This commit is contained in:
Zach Brown
2019-10-13 01:19:22 -05:00
parent 0b05aa0ada
commit 66423fc5b0
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Spigot-Server-Patches/POM-Changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 0f8bccd43..364f66bda 100644 index 0f8bccd430..04b0dd9a7f 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -57,12 +57,14 @@ index 0f8bccd43..364f66bda 100644
+ <defaultGoal>clean install</defaultGoal> <!-- Paper --> + <defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins> <plugins>
<plugin> <plugin>
<groupId>net.md-5</groupId> - <groupId>net.md-5</groupId>
<artifactId>scriptus</artifactId> - <artifactId>scriptus</artifactId>
- <version>0.2</version> - <version>0.2</version>
+ <version>0.3.1</version> + <groupId>com.lukegb.mojo</groupId>
+ <artifactId>gitdescribe-maven-plugin</artifactId>
+ <version>1.3</version>
+ <configuration> + <configuration>
+ <format>git-Paper-%s</format> + <outputPrefix>git-Paper-</outputPrefix>
+ <scmDirectory>..</scmDirectory> + <scmDirectory>..</scmDirectory>
+ </configuration> + </configuration>
<executions> <executions>
@@ -74,7 +76,8 @@ index 0f8bccd43..364f66bda 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>
@@ -86,10 +89,12 @@ index 0f8bccd43..364f66bda 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>
</goals> </goals>
</execution>
</executions>
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <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 --> <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency> <dependency>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java 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 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/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 { @@ -0,0 +0,0 @@ public final class Versioning {