From 613e852ffd828b85b7e3fdbcb06be3c6cfdce3c5 Mon Sep 17 00:00:00 2001 From: md678685 Date: Thu, 29 Mar 2018 04:00:19 +0100 Subject: [PATCH] Implement new versioning as per #1873 (#1882) --- Essentials/pom.xml | 3 +- Essentials/src/config.yml | 2 +- Essentials/src/items.csv | 2 +- Essentials/src/messages.properties | 2 +- Essentials/src/messages_cs.properties | 2 +- Essentials/src/messages_da.properties | 2 +- Essentials/src/messages_de.properties | 2 +- Essentials/src/messages_en.properties | 2 +- Essentials/src/messages_es.properties | 2 +- Essentials/src/messages_et.properties | 2 +- Essentials/src/messages_fi.properties | 2 +- Essentials/src/messages_fr.properties | 2 +- Essentials/src/messages_hu.properties | 2 +- Essentials/src/messages_it.properties | 2 +- Essentials/src/messages_ko.properties | 2 +- Essentials/src/messages_lt.properties | 2 +- Essentials/src/messages_nl.properties | 2 +- Essentials/src/messages_pl.properties | 2 +- Essentials/src/messages_pt.properties | 2 +- Essentials/src/messages_pt_BR.properties | 2 +- Essentials/src/messages_ro.properties | 2 +- Essentials/src/messages_ru.properties | 2 +- Essentials/src/messages_sv.properties | 2 +- Essentials/src/messages_tr.properties | 2 +- Essentials/src/messages_zh_HK.properties | 2 +- Essentials/src/messages_zh_TW.properties | 2 +- Essentials/src/plugin.yml | 2 +- EssentialsAntiBuild/pom.xml | 6 ++- EssentialsAntiBuild/src/plugin.yml | 2 +- EssentialsChat/pom.xml | 6 ++- EssentialsChat/src/plugin.yml | 2 +- EssentialsGeoIP/pom.xml | 3 +- EssentialsGeoIP/src/plugin.yml | 2 +- EssentialsProtect/pom.xml | 6 ++- EssentialsProtect/src/plugin.yml | 2 +- EssentialsSpawn/pom.xml | 6 ++- EssentialsSpawn/src/plugin.yml | 2 +- EssentialsXMPP/pom.xml | 5 ++- EssentialsXMPP/src/plugin.yml | 2 +- pom.xml | 49 +++++++++++++++++------- 40 files changed, 96 insertions(+), 52 deletions(-) diff --git a/Essentials/pom.xml b/Essentials/pom.xml index c2e2b8480..a379e1b11 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsX @@ -19,6 +19,7 @@ + EssentialsX-${full.version} org.apache.maven.plugins diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 656298e7c..28fcf6ca1 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -13,7 +13,7 @@ # If you have problems join the Essentials help support channel: http://tiny.cc/EssentialsChat -# Version ${project.version}-b${build.number} +# Version ${full.version} # KITS ARE NOW IN THE kits.yml FILE diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv index 59d002a19..1e7c1c124 100644 --- a/Essentials/src/items.csv +++ b/Essentials/src/items.csv @@ -1,4 +1,4 @@ -#version: ${project.version}-b${build.number} +#version: ${full.version} #If you change this file, it will not be automatically updated after the next release. #item,id,metadata stone,1,0 diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 445906201..a293abe8c 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 31edbdc0f..2c10905f8 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 5c178f4ca..f69ec0a1d 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 8ded9339f..efed95086 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index b386f4ca9..17835e5e3 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 507cb8c8f..ac36b6e0a 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties index 0df4b13b7..e199f2647 100644 --- a/Essentials/src/messages_et.properties +++ b/Essentials/src/messages_et.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 33087fc37..013654088 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index be27265c0..be6ebc459 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.com -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Début des traductions # EssentialsX a été traduit par la communauté française. diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties index 9d6efd6b7..b2662cd07 100644 --- a/Essentials/src/messages_hu.properties +++ b/Essentials/src/messages_hu.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: montlikadani diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 7e8a13c53..5fce18109 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties index bc45c86ad..aab15a57a 100644 --- a/Essentials/src/messages_ko.properties +++ b/Essentials/src/messages_ko.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties index c64a79cde..c5da9797e 100644 --- a/Essentials/src/messages_lt.properties +++ b/Essentials/src/messages_lt.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index d0df38319..4b48d3138 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index f97b3ed88..74f548600 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # Updated by RikoDEV diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 6fe3630dc..0f3cc45dc 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties index 066002650..31f430f0b 100644 --- a/Essentials/src/messages_pt_BR.properties +++ b/Essentials/src/messages_pt_BR.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index 09f81faf6..1fa807e1d 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 399a79dea..f284ce3a3 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 3b424aed2..81d6e3763 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties index 7b159e7cc..3671f50a9 100644 --- a/Essentials/src/messages_tr.properties +++ b/Essentials/src/messages_tr.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index ec99552b5..eace2bd48 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index 6b6934f09..0b33c114d 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -1,5 +1,5 @@ #X-Generator: crowdin.net -#version: ${project.version}-b${build.number} +#version: ${full.version} # Single quotes have to be doubled: '' # Translations start here # by: diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index a71f191f2..6012c5727 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -2,7 +2,7 @@ name: Essentials main: com.earth2me.essentials.Essentials # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://tiny.cc/EssentialsCommands description: Provides an essential, core set of commands for Bukkit. softdepend: [Vault] diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml index 17a4bedd7..a88daebef 100644 --- a/EssentialsAntiBuild/pom.xml +++ b/EssentialsAntiBuild/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsXAntiBuild @@ -18,6 +18,10 @@ + + EssentialsXAntiBuild-${full.version} + + net.ess3 diff --git a/EssentialsAntiBuild/src/plugin.yml b/EssentialsAntiBuild/src/plugin.yml index 46ab53bc3..0971ee521 100644 --- a/EssentialsAntiBuild/src/plugin.yml +++ b/EssentialsAntiBuild/src/plugin.yml @@ -2,7 +2,7 @@ name: EssentialsAntiBuild main: com.earth2me.essentials.antibuild.EssentialsAntiBuild # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://tiny.cc/EssentialsCommands description: Provides build protection. authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, Iaccidentally] diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml index 75d59c5e5..21d2add63 100644 --- a/EssentialsChat/pom.xml +++ b/EssentialsChat/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsXChat @@ -18,6 +18,10 @@ + + EssentialsXChat-${full.version} + + net.ess3 diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml index b11702e8e..5f855228b 100644 --- a/EssentialsChat/src/plugin.yml +++ b/EssentialsChat/src/plugin.yml @@ -2,7 +2,7 @@ name: EssentialsChat main: com.earth2me.essentials.chat.EssentialsChat # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://tiny.cc/EssentialsCommands description: Provides chat control features for Essentials. Requires Permissions. authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally] diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml index bd818fc82..c6e12c94d 100644 --- a/EssentialsGeoIP/pom.xml +++ b/EssentialsGeoIP/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsXGeoIP @@ -43,6 +43,7 @@ + EssentialsXGeoIP-${full.version} org.apache.maven.plugins diff --git a/EssentialsGeoIP/src/plugin.yml b/EssentialsGeoIP/src/plugin.yml index e8cb6bf6d..2976c2996 100644 --- a/EssentialsGeoIP/src/plugin.yml +++ b/EssentialsGeoIP/src/plugin.yml @@ -2,7 +2,7 @@ name: EssentialsGeoIP main: com.earth2me.essentials.geoip.EssentialsGeoIP # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://tiny.cc/EssentialsCommands description: Shows the country or city of a user on login and /whois. authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, kjiang] diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml index e2068125c..5c00c4b0d 100644 --- a/EssentialsProtect/pom.xml +++ b/EssentialsProtect/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsXProtect @@ -18,6 +18,10 @@ + + EssentialsXProtect-${full.version} + + net.ess3 diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml index 14e6b2820..00a61573b 100644 --- a/EssentialsProtect/src/plugin.yml +++ b/EssentialsProtect/src/plugin.yml @@ -2,7 +2,7 @@ name: EssentialsProtect main: com.earth2me.essentials.protect.EssentialsProtect # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://tiny.cc/EssentialsCommands description: Provides protection for various parts of the world. authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits] diff --git a/EssentialsSpawn/pom.xml b/EssentialsSpawn/pom.xml index 4d71dd8a9..de96a0f97 100644 --- a/EssentialsSpawn/pom.xml +++ b/EssentialsSpawn/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsXSpawn @@ -18,6 +18,10 @@ + + EssentialsXSpawn-${full.version} + + net.ess3 diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml index 06c9dac7d..3e83aa950 100644 --- a/EssentialsSpawn/src/plugin.yml +++ b/EssentialsSpawn/src/plugin.yml @@ -2,7 +2,7 @@ name: EssentialsSpawn main: com.earth2me.essentials.spawn.EssentialsSpawn # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://tiny.cc/EssentialsCommands description: Provides spawn control commands, utilizing Essentials. authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits] diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml index a127be087..e4aba18ae 100644 --- a/EssentialsXMPP/pom.xml +++ b/EssentialsXMPP/pom.xml @@ -6,7 +6,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 EssentialsXXMPP @@ -31,7 +31,10 @@ + + + EssentialsXXMPP-${full.version} org.apache.maven.plugins diff --git a/EssentialsXMPP/src/plugin.yml b/EssentialsXMPP/src/plugin.yml index cdcd9c149..4c82ada31 100644 --- a/EssentialsXMPP/src/plugin.yml +++ b/EssentialsXMPP/src/plugin.yml @@ -2,7 +2,7 @@ name: EssentialsXMPP main: com.earth2me.essentials.xmpp.EssentialsXMPP # Note to developers: This next line cannot change, or the automatic versioning system will break. -version: ${project.version}-b${build.number} +version: ${full.version} website: http://ess.khhq.net/wiki/XMPP description: Provides xmpp communication. authors: diff --git a/pom.xml b/pom.xml index e369c413c..1500206ef 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.ess3 EssentialsXParent - 2.0.1 + 2.15.0 pom @@ -200,19 +200,11 @@ TeamCity - ${build.number} - - - GMBuildVer - ${GMVer} + ${full.version} $${build.number} - ${build.number} - - - $${GMVer} - ${GMVer} + ${full.version} @@ -250,6 +242,31 @@ true + + pl.project13.maven + git-commit-id-plugin + 2.2.4 + + + + revision + + + + + + false + + true + true + false + + + true + + + + @@ -266,8 +283,14 @@ - SNAPSHOT - GMBuildVer UTF-8 + + + 2.15.0 + + + ${git.closest.tag.commit.count} + + ${release.version}.${build.number}