Merge pull request #733 from akrherz/411

Denote Openfire 4.1.1 Release
igniterealtime · Dec 31, 2016 · 2a6303d · 2a6303d
2 parents d1a595a + 254805b
commit 2a6303d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -26,7 +26,7 @@
     <property name="version.major" value="4"/>
     <property name="version.minor" value="1"/>
     <property name="version.revision" value="1"/>
-    <property name="version.extra" value="alpha"/>    <!-- For 'beta' or 'alpha' -->
+    <property name="version.extra" value=""/>    <!-- For 'beta' or 'alpha' -->
 
 	<property name="javac.source" value="1.7"/>
 	<property name="javac.target" value="1.7"/>

diff --git a/documentation/dist/changelog.html b/documentation/dist/changelog.html
@@ -161,6 +161,36 @@ <h1>Openfire Changelog</h1>
 	</div>
 
 	<div id="pageBody">
+<h2>4.1.1 -- <span style="font-weight: normal;">Dec 31, 2016</span></h2>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1253'>OF-1253</a>] -         Due to initial mysql schema failure, a new install will ask for current admin password and fail due to non-existent schema
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1254'>OF-1254</a>] -         Database update scripts for 25 set version 24
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1255'>OF-1255</a>] -         Invalid SQL syntax in Mysql installation script. 
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1257'>OF-1257</a>] -         SQLServer syntax error  java.sql.SQLException: Incorrect syntax near the keyword &#39;COLUMN&#39;.
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1260'>OF-1260</a>] -         ClientControl plugin: Improve CSRF error message
+</li>
+</ul>
+
+<h2>        New Feature
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1258'>OF-1258</a>] -         Add an option to Client Control plugin to disable Anonymous login in Spark
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1259'>OF-1259</a>] -         Migrate XML property &#39;xmpp.fqdn&#39;
+</li>
+</ul>
+
 <h2>4.1.0 -- <span style="font-weight: normal;">Dec 21, 2016</span></h2>
 
 <h2>        Sub-task

diff --git a/src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java b/src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
@@ -42,7 +42,7 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
 
     private final Date startDate;
 
-    public static final Version VERSION = new Version(4, 1, 1, Version.ReleaseStatus.Alpha, -1 );
+    public static final Version VERSION = new Version(4, 1, 1, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor