Merge pull request #505 from akrherz/v4

Denote Openfire 4.0.0 Release

build/build.xml

@@ -26,7 +26,7 @@
     <property name="version.major" value="4"/>
     <property name="version.minor" value="0"/>
     <property name="version.revision" value="0"/>
-    <property name="version.extra" value="beta"/>    <!-- 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"/>
@@ -1821,4 +1821,4 @@
         </copy>
     </target>
 
-</project>
+</project>
\ No newline at end of file

documentation/dist/changelog.html

@@ -162,22 +162,28 @@ hr {
 	
 	<div id="pageBody">
 
-<h2>4.0.0 beta -- <span style="font-weight: normal;">Dec 13, 2015</span></h2>
+<h2>4.0.0 -- <span style="font-weight: normal;">Jan 11, 2016</span></h2>
 <h2>        Sub-task
 </h2>
 <ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-454'>OF-454</a>] -         Openfire does not send user presence information to all resources of the user
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-547'>OF-547</a>] -         Create branch of code to test-drive new setup.
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-631'>OF-631</a>] -         Implement SCRAM support
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-834'>OF-834</a>] -         Admin console login.jsp allows redirects to non-local URIs
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-997'>OF-997</a>] -         Admin Console: Frameable Response (potential Clickjacking)
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1022'>OF-1022</a>] -         Reflected XSS vulnerability in muc-room-edit-form.jsp params in Admin Console
+</li>
 </ul>
         
 <h2>        Bug
 </h2>
 <ul>
-<li>[<a href='https://igniterealtime.org/issues/browse/OF-122'>OF-122</a>] -         Massive errors in rooms permissions and options
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-122'>OF-122</a>] -         Shouldn&#39;t allow subject change, when it is forbidden in room settings
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-317'>OF-317</a>] -         Subscribe with Response Unsubscribed Causes Roster Push to Responding Client
 </li>
@@ -185,6 +191,16 @@ hr {
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-484'>OF-484</a>] -         Windows installer getting stuck on Uninstalling the previous version
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-509'>OF-509</a>] -         Unable to disable weak ciphers
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-793'>OF-793</a>] -         javax.net.ssl.SSLException: Unsupported record version Unknown-47.115
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-798'>OF-798</a>] -         Embedded RSS/community links need to be updated for new (SSL) locations
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-821'>OF-821</a>] -         MUC service returns wrong number of occupants and duplicate occupants in service discovery
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-856'>OF-856</a>] -         Monitoring plugin uses secs attribute relative from beginning message instead of last message
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-868'>OF-868</a>] -         User name update does not propagate to the affected roster(s)
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-881'>OF-881</a>] -         NIOConnection Thread Deadlock when two clients in each others roster simultaneously disconnect
@@ -207,6 +223,8 @@ hr {
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-922'>OF-922</a>] -         Major performance hit with MINA 2.0.9 vs 2.0.7
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-928'>OF-928</a>] -         Error with adding presence to MUC presence stanza
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-930'>OF-930</a>] -         Overlay enhancements
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-932'>OF-932</a>] -         XEP-0202 Entity Time should respect Daylight Saving Time
@@ -245,12 +263,32 @@ hr {
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-992'>OF-992</a>] -         BOSH fails when disabling/re-enabling the port
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-995'>OF-995</a>] -         Parent Plugin case sensitivity
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-996'>OF-996</a>] -         NullPointerException on Admin Console /audit-policy.jsp
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-998'>OF-998</a>] -         Openfire build should not need internet connectivity
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-999'>OF-999</a>] -         BOSH worker threads should be configurable
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1000'>OF-1000</a>] -         Audit file log rotation causes NullPointerException
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-1002'>OF-1002</a>] -         NPE during connection close with XEP-0198
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-1003'>OF-1003</a>] -         Exception during &lt;a/&gt; propcessing in XEP-0198
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1008'>OF-1008</a>] -         Iteratively failure to deliver message
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1009'>OF-1009</a>] -         [s2s] Federation issue with talkonaut.com
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1010'>OF-1010</a>] -         LDAPS fails
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1023'>OF-1023</a>] -         Roster cache not being updated for shared group changes
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1025'>OF-1025</a>] -         web-custom.xml fails to load
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1028'>OF-1028</a>] -         NoSuchElement Exception in XEP-0198 support
+</li>
 </ul>
         
 <h2>        Improvement
@@ -258,6 +296,8 @@ hr {
 <ul>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-675'>OF-675</a>] -         Add a comment about restarting in Managing Plugins section of documentation
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-844'>OF-844</a>] -         CertificateManager logs useless warning messages
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-892'>OF-892</a>] -         Mutual authentication support
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-925'>OF-925</a>] -         AdHoc SessionData should be extensible
@@ -272,6 +312,8 @@ hr {
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-953'>OF-953</a>] -         Replace antiquated JSP libraries
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-956'>OF-956</a>] -         Admins should be able to configure cryptographical protocols &amp; cypher suites
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-957'>OF-957</a>] -         AuditManager Module does not load properly
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-969'>OF-969</a>] -         Delete URLUTF8Encoder.java in favor of java.net.URLEncoder.
@@ -292,6 +334,18 @@ hr {
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-993'>OF-993</a>] -         Remove thread factory code duplication
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1004'>OF-1004</a>] -         Improve connection configuration in admin console
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1005'>OF-1005</a>] -         Undo module loading driven by a file
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1007'>OF-1007</a>] -         Improve support for whitelisting/blacklisting client IP addresses
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1011'>OF-1011</a>] -         When importing PEM certificates, ignore leading/trailing whitespace
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1029'>OF-1029</a>] -         Overlay should be able to override web.xml
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1033'>OF-1033</a>] -         Orderly shutdown of MUC Service
+</li>
 </ul>
     
 <h2>        New Feature
@@ -303,6 +357,8 @@ hr {
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-923'>OF-923</a>] -         FileTransferManager should generate &#39;complete&#39; event.
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-946'>OF-946</a>] -         Allow for multiple sets of keystores
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-947'>OF-947</a>] -         Overlay should support i18n
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-948'>OF-948</a>] -         Overlay should allow modification of src/resources
@@ -323,8 +379,12 @@ hr {
 <h2>        Task
 </h2>
 <ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-767'>OF-767</a>] -         Bundle Openfire with Java 8 SE JRE
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-1001'>OF-1001</a>] -         Drop Clearspace support
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-1016'>OF-1016</a>] -         Add explanation to setup about default admin password
+</li>
 </ul>
 
 <h2>3.10.3 -- <span style="font-weight: normal;">Nov 17, 2015</span></h2>

src/java/org/jivesoftware/openfire/XMPPServer.java

@@ -315,7 +315,7 @@ public class XMPPServer {
             host = "127.0.0.1";        	
         }
 
-        version = new Version(4, 0, 0, Version.ReleaseStatus.Beta, -1);
+        version = new Version(4, 0, 0, Version.ReleaseStatus.Release, -1);
         if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
             setupMode = false;
         }