Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath 2015-03-16 10:19:21 +00:00
parent d96ecbc04b
commit 3c15908aac
1 changed files with 81 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -59,41 +59,35 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>com.lukegb.mojo</groupId>
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
- <outputPrefix>${buildtag.prefix}</outputPrefix>
- <outputPostfix>${buildtag.suffix}</outputPostfix>
<extraArguments>
<extraArgument>--always</extraArgument>
</extraArguments>
</configuration>
<groupId>net.md-5</groupId>
<artifactId>scriptus</artifactId>
<version>0.2</version>
- <configuration>
- <format>git-Bukkit-%s</format>
- </configuration>
<executions>
<execution>
+ <id>ex-spigot</id>
+ <configuration>
+ <outputPrefix>git-Spigot-</outputPrefix>
+ <outputPostfix></outputPostfix>
+ <format>git-Spigot-%s</format>
+ <scmDirectory>../</scmDirectory>
+ <descriptionProperty>spigot.desc</descriptionProperty>
+ </configuration>
+ <phase>compile</phase>
+ <phase>initialize</phase>
+ <goals>
+ <goal>gitdescribe</goal>
+ <goal>describe</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>ex-craftbukkit</id>
+ <configuration>
+ <outputPrefix>-</outputPrefix>
+ <outputPostfix></outputPostfix>
+ <format>-%s</format>
+ <scmDirectory>../../CraftBukkit</scmDirectory>
+ <descriptionProperty>craftbukkit.desc</descriptionProperty>
+ </configuration>
<phase>compile</phase>
<phase>initialize</phase>
<goals>
<goal>gitdescribe</goal>
<goal>describe</goal>
@@ -0,0 +0,0 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
@ -103,15 +97,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
@@ -0,0 +0,0 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
+ <artifactId>java16-sun</artifactId>
<version>1.1</version>
</signature>
</configuration>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java