mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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