diff --git a/Essentials/pom.xml b/Essentials/pom.xml index c2e2b848056..a379e1b11c7 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 656298e7cec..28fcf6ca13b 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 59d002a1918..1e7c1c1246b 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 44590620172..a293abe8cc2 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 31edbdc0f15..2c10905f841 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 5c178f4ca6e..f69ec0a1dcf 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 8ded9339f56..efed950868f 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 b386f4ca9fa..17835e5e39b 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 507cb8c8fdc..ac36b6e0aef 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 0df4b13b7e4..e199f264754 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 33087fc3720..0136540880c 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 be27265c012..be6ebc4598c 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 9d6efd6b7cd..b2662cd071a 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 7e8a13c5323..5fce18109d3 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 bc45c86ad63..aab15a57a1f 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 c64a79cdeee..c5da9797e58 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 d0df3831993..4b48d3138e8 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 f97b3ed88c6..74f54860035 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 6fe3630dc32..0f3cc45dce7 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 066002650c3..31f430f0b34 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 09f81faf66e..1fa807e1d1b 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 399a79deafd..f284ce3a36f 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 3b424aed272..81d6e376340 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 7b159e7cc33..3671f50a982 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 ec99552b5e1..eace2bd48b9 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 6b6934f091c..0b33c114d45 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 a71f191f2b6..6012c572722 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 17a4bedd708..a88daebef76 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 46ab53bc3fd..0971ee52187 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 75d59c5e54b..21d2add6374 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 b11702e8e3e..5f855228b0e 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 bd818fc8290..c6e12c94d78 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 e8cb6bf6d55..2976c29961a 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 e2068125cb0..5c00c4b0d54 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 14e6b28206f..00a61573bbb 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 4d71dd8a9cb..de96a0f9738 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 06c9dac7de3..3e83aa950d6 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 a127be0874b..e4aba18ae25 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 cdcd9c149f7..4c82ada31f4 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 e369c413cae..1500206ef5d 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}