13
0
geforkt von Mirrors/Paper

Fix jline with git builds under Windows (#2624)

Dieser Commit ist enthalten in:
Andrew Steinborn 2019-10-13 01:06:44 -04:00
Ursprung 328755d72f
Commit ea056d0fd2

Datei anzeigen

@ -5,7 +5,7 @@ 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
@@ -0,0 +0,0 @@
@ -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>
@@ -0,0 +0,0 @@
<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
@@ -0,0 +0,0 @@ public final class Versioning {