Update from upstream SpigotMC

66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -61,15 +61,50 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
        <plugin>
          <groupId>com.lukegb.mojo</groupId>
          <artifactId>gitdescribe-maven-plugin</artifactId>
-         <version>1.3</version>
+-        <version>1.3</version>
++        <version>2.0</version>
          <configuration>
 -          <outputPrefix>${buildtag.prefix}</outputPrefix>
 -          <outputPostfix>${buildtag.suffix}</outputPostfix>
-+          <outputPrefix>git-Spigot-</outputPrefix>
-+          <outputPostfix></outputPostfix>
-         </configuration>
+-        </configuration>
++            <extraArguments>
++                <extraArgument>--always</extraArgument>
++            </extraArguments>
++        </configuration>    
          <executions>
            <execution>
++            <id>ex-spigot</id>            
++            <configuration>
++              <outputPrefix>git-Spigot-</outputPrefix>
++              <outputPostfix></outputPostfix>
++              <scmDirectory>../</scmDirectory>
++              <descriptionProperty>spigot.desc</descriptionProperty>
++            </configuration>
++            <phase>compile</phase>
++            <goals>
++              <goal>gitdescribe</goal>
++            </goals>
++          </execution>
++          <execution>
++            <id>ex-craftbukkit</id>            
++            <configuration>
++              <outputPrefix>-</outputPrefix>
++              <outputPostfix></outputPostfix>
++              <scmDirectory>../../CraftBukkit</scmDirectory>
++              <descriptionProperty>craftbukkit.desc</descriptionProperty>
++            </configuration>
+             <phase>compile</phase>
+             <goals>
+               <goal>gitdescribe</goal>
+@@ -0,0 +0,0 @@
+             <manifestEntries>
+               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
+               <Implementation-Title>CraftBukkit</Implementation-Title>
+-              <Implementation-Version>${describe}</Implementation-Version>
++              <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
+               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
+               <Specification-Title>Bukkit</Specification-Title>
+               <Specification-Version>${api.version}</Specification-Version>
 @@ -0,0 +0,0 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>