Use maven for versioning. Note GroupManager versioning is broken.

11 files changed, 11 insertions, 18 deletions

diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index acec277cc..33ed4af66 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -1,4 +1,4 @@
-#version: TeamCity
+#version: ${build.number}
 # 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/plugin.yml b/Essentials/src/plugin.yml
index 2e9f80bb1..488abb02d 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -2,7 +2,7 @@
 name: Essentials3
 main: com.earth2me.essentials.Essentials
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Provides an essential, core set of commands for Bukkit.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5]
diff --git a/EssentialsAntiCheat/src/plugin.yml b/EssentialsAntiCheat/src/plugin.yml
index 0d0ad4d92..a1a5afac9 100644
--- a/EssentialsAntiCheat/src/plugin.yml
+++ b/EssentialsAntiCheat/src/plugin.yml
@@ -1,7 +1,7 @@
 name: EssentialsAntiCheat
 main: com.earth2me.essentials.anticheat.NoCheat
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Detect and Fight the exploitation of various Flaws/Bugs in Minecraft.
 authors: [Evenprime, md_5]
diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml
index 6ecadd4d3..488ef7b50 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: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Provides chat control features for Essentials.  Requires Permissions.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy]
diff --git a/EssentialsGeoIP/src/plugin.yml b/EssentialsGeoIP/src/plugin.yml
index fbb17eda9..9d55446bd 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: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Shows the country or city of a user on login and /whois.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits]
diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml
index 42fe156b9..f87cdc7c7 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: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Provides protection for various parts of the world.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits]
diff --git a/EssentialsSigns/src/plugin.yml b/EssentialsSigns/src/plugin.yml
index 868680cfe..7f0bda1a2 100644
--- a/EssentialsSigns/src/plugin.yml
+++ b/EssentialsSigns/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsSigns
 main: com.earth2me.essentials.signs.EssentialsSignsPlugin
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Provides signs, utilizing Essentials.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits]
diff --git a/EssentialsUpdate/src/plugin.yml b/EssentialsUpdate/src/plugin.yml
index 45c821265..4e7700711 100644
--- a/EssentialsUpdate/src/plugin.yml
+++ b/EssentialsUpdate/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsUpdate
 main: com.earth2me.essentials.update.EssentialsUpdate
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${build.number}
 description: This plugin allows to install or update all Essentials plugins
 website: http://tiny.cc/EssentialsWiki
 authors: [snowleo]
diff --git a/EssentialsXMPP/src/plugin.yml b/EssentialsXMPP/src/plugin.yml
index ed885011d..7109284b7 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: TeamCity
+version: ${build.number}
 website: http://tiny.cc/EssentialsWiki
 description: Provides xmpp communication.
 authors:
diff --git a/pom.xml b/pom.xml
index b054285b8..1a2465ff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     <resources>
       <resource>
         <directory>${basedir}/src</directory>
+        <filtering>true</filtering>
         <includes>
           <include>*.*</include>
         </includes>
@@ -101,6 +102,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <bukkitversion>1.2.3-R0.3-SNAPSHOT</bukkitversion>
+    <build.number>Unknown</build.number>
     <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
     <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
     <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>2</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>
diff --git a/versioning.xml b/versioning.xml
deleted file mode 100644
index df25c80c8..000000000
--- a/versioning.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="setversion">
-  <target name="setversion">
-    <replace dir="." includes="**/src/plugin.yml" token="version: TeamCity" value="version: ${build.number}"/>
-    <replace dir="." includes="**/src/plugin.yml" token="version: GMBuildVer" value="version: ${GMVer} (${build.number})"/>
-    <replace dir="." includes="**/src/messages*.properties" token="version: TeamCity" value="version: ${build.number}"/>
-    <replace dir="." includes="**/src/items.csv" token="version: TeamCity" value="version: ${build.number}"/>
-  </target>
-</project>