diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml index 14c66c1c..8c5f009a 100644 --- a/bukkit-legacy/pom.xml +++ b/bukkit-legacy/pom.xml @@ -12,7 +12,7 @@ luckperms-bukkit-legacy clean package - LuckPerms-Bukkit-Legacy-${release.version}.${git.closest.tag.commit.count} + LuckPerms-Bukkit-Legacy-${release.version}.${patch.version} src/main/resources @@ -48,11 +48,7 @@ false - - - org.xerial:* - - + false com.google.common @@ -71,21 +67,6 @@ - - pl.project13.maven - git-commit-id-plugin - 2.2.1 - - - - revision - - - - - true - - diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 6f81b753..2743189b 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -14,7 +14,7 @@ clean package - LuckPerms-Bukkit-${release.version}.${git.closest.tag.commit.count} + LuckPerms-Bukkit-${release.version}.${patch.version} ${basedir}/src/main/java @@ -51,6 +51,7 @@ false + false io.github.mkremins.fanciful @@ -61,21 +62,6 @@ - - pl.project13.maven - git-commit-id-plugin - 2.2.1 - - - - revision - - - - - true - - diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index abfd4221..6aa0b1c4 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: LuckPerms -version: ${release.version}.${git.closest.tag.commit.count} +version: ${release.version}.${patch.version} description: A permissions plugin author: Luck website: https://github.com/lucko/LuckPerms diff --git a/bungee/pom.xml b/bungee/pom.xml index 19c64e5f..216301b1 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -14,7 +14,7 @@ clean package - LuckPerms-Bungee-${release.version}.${git.closest.tag.commit.count} + LuckPerms-Bungee-${release.version}.${patch.version} ${basedir}/src/main/java @@ -51,6 +51,7 @@ false + false io.github.mkremins.fanciful @@ -61,21 +62,6 @@ - - pl.project13.maven - git-commit-id-plugin - 2.2.1 - - - - revision - - - - - true - - diff --git a/bungee/src/main/resources/plugin.yml b/bungee/src/main/resources/plugin.yml index 5210fede..50cf4162 100644 --- a/bungee/src/main/resources/plugin.yml +++ b/bungee/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: LuckPerms -version: ${release.version}.${git.closest.tag.commit.count} +version: ${release.version}.${patch.version} description: A permissions plugin author: Luck main: me.lucko.luckperms.bungee.LPBungeePlugin diff --git a/pom.xml b/pom.xml index 440f786a..136bb04c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ UTF-8 2.17 + ${git.closest.tag.commit.count} @@ -52,6 +53,29 @@ + + + + pl.project13.maven + git-commit-id-plugin + 2.2.1 + + + validate + + revision + + + + + false + true + true + + + + + spigot-repo diff --git a/sponge/pom.xml b/sponge/pom.xml index c4ed5aaf..7a79e724 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -14,7 +14,7 @@ clean package - LuckPerms-Sponge-${release.version}.${git.closest.tag.commit.count} + LuckPerms-Sponge-${release.version}.${patch.version} ${basedir}/src/main/java @@ -51,13 +51,7 @@ false - - - org.slf4j:* - org.xerial:* - com.h2database:* - - + false io.github.mkremins.fanciful @@ -81,21 +75,6 @@ - - pl.project13.maven - git-commit-id-plugin - 2.2.1 - - - - revision - - - - - true - - diff --git a/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java b/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java index ea298f00..4be3d835 100644 --- a/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java +++ b/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java @@ -24,6 +24,6 @@ package me.lucko.luckperms.sponge.utils; public class VersionData { - public static final String VERSION = "${release.version}.${git.closest.tag.commit.count}"; + public static final String VERSION = "${release.version}.${patch.version}"; }