Update version handling for our new build system

CC GH-19

1 files changed, 67 insertions, 18 deletions

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 14252c1e7e..7778f227d2 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 109279a4b9b86578f35995e8b7b5024fd422a56d Mon Sep 17 00:00:00 2001
+From e060c4c376a9d7a27eb43d52817182e12281cf00 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 19 Mar 2015 19:41:15 -0500
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 91627ff..cdbb1ca 100644
+index 91627ff..85dff6f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -55,31 +55,80 @@ index 91627ff..cdbb1ca 100644
              <version>${project.version}</version>
              <type>jar</type>
              <scope>compile</scope>
-@@ -108,11 +109,11 @@
-                 <version>0.2</version>
-                 <executions>
-                     <execution>
+@@ -96,6 +97,11 @@
+             <id>spigotmc-public</id>
+             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+         </pluginRepository>
++        <!-- PaperSpigot - Repo for gitdescribe -->
++        <pluginRepository>
++            <id>destroystokyo</id>
++            <url>https://ci.destroystokyo.com/plugin/repository/everything/</url>
++        </pluginRepository>
+     </pluginRepositories>
+ 
+     <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
+@@ -103,36 +109,21 @@
+         <defaultGoal>install</defaultGoal>
+         <plugins>
+             <plugin>
+-                <groupId>net.md-5</groupId>
+-                <artifactId>scriptus</artifactId>
+-                <version>0.2</version>
+-                <executions>
+-                    <execution>
 -                        <id>ex-spigot</id>
-+                        <id>ex-paperspigot</id>
-                         <configuration>
+-                        <configuration>
 -                            <format>git-Spigot-%s</format>
-+                            <format>git-PaperSpigot-%s</format>
-                             <scmDirectory>../</scmDirectory>
+-                            <scmDirectory>../</scmDirectory>
 -                            <descriptionProperty>spigot.desc</descriptionProperty>
-+                            <descriptionProperty>paperspigot.desc</descriptionProperty>
-                         </configuration>
-                         <phase>initialize</phase>
-                         <goals>
-@@ -142,7 +143,7 @@
+-                        </configuration>
+-                        <phase>initialize</phase>
+-                        <goals>
+-                            <goal>describe</goal>
+-                        </goals>
+-                    </execution>
+-                    <execution>
+-                        <id>ex-craftbukkit</id>
+-                        <configuration>
+-                            <format>-%s</format>
+-                            <scmDirectory>../../CraftBukkit</scmDirectory>
+-                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
+-                        </configuration>
+-                        <phase>initialize</phase>
+-                        <goals>
+-                            <goal>describe</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-            </plugin>  
++            <groupId>com.lukegb.mojo</groupId>
++            <artifactId>gitdescribe-maven-plugin</artifactId>
++            <version>3.1-SNAPSHOT</version>
++            <configuration>
++                <outputPrefix>git-PaperSpigot-</outputPrefix>
++            </configuration>
++            <executions>
++                <execution>
++                    <phase>compile</phase>
++                    <goals>
++                        <goal>gitdescribe</goal>
++                    </goals>
++                </execution>
++            </executions>
++        </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
+@@ -142,7 +133,7 @@
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                              <Implementation-Title>CraftBukkit</Implementation-Title>
 -                            <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
-+                            <Implementation-Version>${paperspigot.desc}${craftbukkit.desc}</Implementation-Version>
++                            <Implementation-Version>${describe}</Implementation-Version>
                              <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
-@@ -172,26 +173,6 @@
+@@ -172,26 +163,6 @@
                  </configuration>
              </plugin>
              <plugin>
@@ -133,5 +182,5 @@ index 9304637..3a4b142 100644
  
          if (stream != null) {
 -- 
-2.7.0
+2.7.1