From a3604c7464763f1fad29d8f8f45d71ced2687cb6 Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 25 Jul 2016 21:05:09 +0100 Subject: [PATCH] Bump version, and make future version changes easier --- api/pom.xml | 2 +- bukkit/pom.xml | 2 +- bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java | 4 +--- bukkit/src/main/resources/plugin.yml | 2 +- bungee/pom.xml | 2 +- bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java | 4 +--- bungee/src/main/resources/plugin.yml | 2 +- common/pom.xml | 2 +- pom.xml | 6 +++++- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 843ee655..a6176efd 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,7 +5,7 @@ luckperms me.lucko - 1.3 + ${global.version} 4.0.0 diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 56c2617f..631d8cfb 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ luckperms me.lucko - 1.3 + ${global.version} 4.0.0 diff --git a/bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java index 461d0993..b5d31435 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/LPBukkitPlugin.java @@ -32,8 +32,6 @@ import java.util.stream.Collectors; @Getter public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { - public static final String VERSION = "v1.3"; - private LPConfiguration configuration; private UserManager userManager; private GroupManager groupManager; @@ -146,7 +144,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin { @Override public String getVersion() { - return VERSION; + return getDescription().getVersion(); } @Override diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index b97d8148..e0d98753 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: LuckPerms author: Luck -version: 1.2 +version: ${global.version} main: me.lucko.luckperms.LPBukkitPlugin softdepend: [Vault] description: A permissions plugin diff --git a/bungee/pom.xml b/bungee/pom.xml index 6e6450c5..95c59136 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ luckperms me.lucko - 1.3 + ${global.version} 4.0.0 diff --git a/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java index 05e3b158..91e06deb 100644 --- a/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java @@ -25,8 +25,6 @@ import java.util.stream.Collectors; @Getter public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { - public static final String VERSION = "v1.3"; - private LPConfiguration configuration; private UserManager userManager; private GroupManager groupManager; @@ -106,7 +104,7 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { @Override public String getVersion() { - return VERSION; + return getDescription().getVersion(); } @Override diff --git a/bungee/src/main/resources/plugin.yml b/bungee/src/main/resources/plugin.yml index 55ae9898..d67940b2 100644 --- a/bungee/src/main/resources/plugin.yml +++ b/bungee/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: LuckPerms author: Luck -version: 1.2 +version: ${global.version} main: me.lucko.luckperms.LPBungeePlugin description: A permissions plugin \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index ce6b9a43..fca736af 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ luckperms me.lucko - 1.3 + ${global.version} 4.0.0 diff --git a/pom.xml b/pom.xml index 940cd554..2b594f55 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ me.lucko luckperms - 1.3 + ${global.version} bukkit common @@ -16,6 +16,10 @@ pom + + 1.4 + UTF-8 +