TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
This reverts commit 0c64f7b0ae.
This commit is contained in:
Zach 2019-10-13 01:19:22 -05:00 committed by GitHub
parent a4dbabdbd3
commit c65396072f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From fd4dfa16d58ebc91625cd41e8ac311f32df1606a Mon Sep 17 00:00:00 2001 From 566af2ba410dc0dfd23c752b3f94cc20a39fc736 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 0f8bccd43..364f66bda 100644 index 0f8bccd430..04b0dd9a7f 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
@ -49,7 +49,7 @@ index 0f8bccd43..364f66bda 100644
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -109,32 +108,20 @@ @@ -109,34 +108,22 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build> <build>
@ -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>
@@ -146,11 +133,13 @@ @@ -146,11 +133,13 @@
<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
@@ -11,7 +11,7 @@ public final class Versioning { @@ -11,7 +11,7 @@ public final class Versioning {
@ -154,5 +159,5 @@ index 93046379d..674096cab 100644
if (stream != null) { if (stream != null) {
-- --
2.23.0 2.22.0