From ab8af032e17e67907ac0b759ce7404d85b9f18c9 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 18 Mar 2018 22:02:46 +0100
Subject: [PATCH] Include branch in plugin version

---
 pom.xml                                   | 4 ++--
 src/main/java/fr/xephi/authme/AuthMe.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a17122eaa..0ddc75c59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <project.outputName>AuthMe</project.outputName>
         <project.buildNumber>CUSTOM</project.buildNumber>
         <project.skipExtendedHashTests>false</project.skipExtendedHashTests>
-        <project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
+        <project.versionCode>${project.version}-B${project.buildNumber}</project.versionCode>
 
         <!-- BukkitPlugin properties -->
         <bukkitplugin.name>${project.outputName}</bukkitplugin.name>
@@ -87,7 +87,7 @@
                 </property>
             </activation>
             <properties>
-                <project.buildNumber>${env.BUILD_NUMBER}</project.buildNumber>
+                <project.buildNumber>${env.GIT_BRANCH}${env.BUILD_NUMBER}</project.buildNumber>
             </properties>
         </profile>
         <!-- Skip long hash tests, reduce the test time of 20-30 seconds -->
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 305aadc38..3809a72ad 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -186,7 +186,7 @@ public class AuthMe extends JavaPlugin {
         if (index != -1) {
             pluginVersion = versionRaw.substring(0, index);
             pluginBuildNumber = versionRaw.substring(index + 1);
-            if (pluginBuildNumber.startsWith("b")) {
+            if (pluginBuildNumber.startsWith("B")) {
                 pluginBuildNumber = pluginBuildNumber.substring(1);
             }
         }