mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
Make the /version command output useful
This commit is contained in:
parent
87c1d0c8b7
commit
baf01cc7f8
1 changed files with 43 additions and 9 deletions
|
@ -1,4 +1,4 @@
|
|||
From 34eb7b82a09ea507c273919fdfdfea61af0f6506 Mon Sep 17 00:00:00 2001
|
||||
From a33af7358dfa85e86fe64c23d34ec21a47f3f5cc Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 2 Jul 2013 13:07:39 +1000
|
||||
Subject: [PATCH] POM Changes
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
|
|||
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e2d4c7d..6592ad1 100644
|
||||
index e2d4c7d..5fd93be 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -1,12 +1,12 @@
|
||||
|
@ -51,7 +51,7 @@ index e2d4c7d..6592ad1 100644
|
|||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>compile</scope>
|
||||
@@ -132,15 +139,16 @@
|
||||
@@ -132,18 +139,39 @@
|
||||
|
||||
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
||||
<build>
|
||||
|
@ -61,17 +61,51 @@ index e2d4c7d..6592ad1 100644
|
|||
<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>
|
||||
+ <scmDirectory>../</scmDirectory>
|
||||
</configuration>
|
||||
- </configuration>
|
||||
+ <extraArguments>
|
||||
+ <extraArgument>--always</extraArgument>
|
||||
+ </extraArguments>
|
||||
+ </configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -193,7 +201,7 @@
|
||||
+ <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>
|
||||
@@ -160,7 +188,7 @@
|
||||
<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>
|
||||
@@ -193,7 +221,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
|
|
Loading…
Add table
Reference in a new issue