Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-25 03:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Include branch in plugin version

Browse Source
This commit is contained in:
Gabriele C 2018-03-18 22:02:46 +01:00
parent 8b05ce4b92
commit ab8af032e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -64,7 +64,7 @@
<project.outputName>AuthMe</project.outputName> <project.outputName>AuthMe</project.outputName>
<project.buildNumber>CUSTOM</project.buildNumber> <project.buildNumber>CUSTOM</project.buildNumber>
<project.skipExtendedHashTests>false</project.skipExtendedHashTests> <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 properties -->
<bukkitplugin.name>${project.outputName}</bukkitplugin.name> <bukkitplugin.name>${project.outputName}</bukkitplugin.name>
@ -87,7 +87,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<project.buildNumber>${env.BUILD_NUMBER}</project.buildNumber> <project.buildNumber>${env.GIT_BRANCH}${env.BUILD_NUMBER}</project.buildNumber>
</properties> </properties>
</profile> </profile>
<!-- Skip long hash tests, reduce the test time of 20-30 seconds --> <!-- Skip long hash tests, reduce the test time of 20-30 seconds -->

2
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -186,7 +186,7 @@ public class AuthMe extends JavaPlugin {
if (index != -1) { if (index != -1) {
pluginVersion = versionRaw.substring(0, index); pluginVersion = versionRaw.substring(0, index);
pluginBuildNumber = versionRaw.substring(index + 1); pluginBuildNumber = versionRaw.substring(index + 1);
if (pluginBuildNumber.startsWith("b")) { if (pluginBuildNumber.startsWith("B")) {
pluginBuildNumber = pluginBuildNumber.substring(1); pluginBuildNumber = pluginBuildNumber.substring(1);
} }
} }