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