From f2424f6b4744d17e550a50874ad7ae5e02fcb5df Mon Sep 17 00:00:00 2001
From: Gaston Dombiak <gaston@jivesoftware.com>
Date: Wed, 31 Oct 2007 16:41:53 +0000
Subject: [PATCH] Updated for 2.5.8 release.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9402 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/build.xml                                            | 2 +-
 documentation/README.html                                  | 4 ++--
 documentation/changelog.html                               | 7 ++++---
 src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 02c12a36..a55f8470 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -24,7 +24,7 @@
     <property name="version.major" value="2"/>
     <property name="version.minor" value="5"/>
     <property name="version.revision" value="8"/>
-    <property name="version.extra" value="beta1"/>
+    <property name="version.extra" value=""/>
     <!-- For 'beta' or 'alpha' -->
 
     <!-- Setup the full version property correctly -->
diff --git a/documentation/README.html b/documentation/README.html
index 1567bd34..1816debe 100644
--- a/documentation/README.html
+++ b/documentation/README.html
@@ -166,11 +166,11 @@ hr {
 <table boder=0>
 <tr>
 	<td align="right">version:</td>
-	<td><b>2.5.8 Beta 1</b></td>
+	<td><b>2.5.8</b></td>
 </tr>
     <tr>
 	<td align="right">released:</td>
-	<td><b>October 5th, 2007</b></td>
+	<td><b>October 31st, 2007</b></td>
 </tr>
 </table>
 
diff --git a/documentation/changelog.html b/documentation/changelog.html
index 0934adde..26600d9a 100644
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -178,14 +178,15 @@ hr {
 </div>
 
 <div id="pageBody">
-<h2>2.5.8 Beta 1 -- <span style="font-weight: normal;">October 5th, 2007</span></h2>
+<h2>2.5.8 -- <span style="font-weight: normal;">October 31st, 2007</span></h2>
 <h3>Bugs</h3>
 <ul>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-618'>SPARK-618</a>] - Fixed multiple message issue with Broadcast.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-857'>SPARK-857</a>] - Fixed language selection menu is not displaying.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-860'>SPARK-860</a>] - Show offline users in broadcast window.</li>
-<li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-855'>SPARK-855</a>] - Allow mainWindowHeight to have low values.</li>
-<li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-856'>SPARK-856</a>] - Update avatar size in contact list.</li>
+<li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-855'>SPARK-855</a>] - Allowed mainWindowHeight to have low values.</li>
+<li>[<a href='http://www.igniterealtime.org/issues/browse/SPARK-856'>SPARK-856</a>] - Updated avatar size in contact list.</li>
+<li>SIP Phone plugin is now open source.</li>
 </ul>
 
 <div id="pageBody">
diff --git a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
index f0484d29..62950131 100644
--- a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
+++ b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
@@ -17,11 +17,11 @@ public class JiveInfo {
     }
 
     public static String getVersion() {
-        return "2.5.8.beta1";
+        return "2.5.8";
     }
 
     public static String getBuildNumber() {
-        return "2.5.8.beta1";
+        return "2.5.8";
     }
 
     public static String getOS() {