Denote Openfire 4.2.0 Release

build/build.xml

@@ -26,7 +26,7 @@
     <property name="version.major" value="4"/>
     <property name="version.minor" value="2"/>
     <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"/>

dbutil/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <artifactId>dbutil</artifactId>
     <name>Database Utilities</name>

documentation/dist/changelog.html

@@ -163,7 +163,7 @@ hr {
     <div id="pageBody">
 
 
-<h2>4.2.0 Beta -- <span style="font-weight: normal;">Nov 17, 2017</span></h2>
+<h2>4.2.0 -- <span style="font-weight: normal;">Dec 4, 2017</span></h2>
 
 <h2>        Sub-task
 </h2>
@@ -211,6 +211,8 @@ hr {
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1335'>OF-1335</a>] -         Forwarded messages rewritten to default namespace over S2S
 </li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1356'>OF-1356</a>] -         Add a section about upgrading from x86 to x64 to Upgrade guide (Windows)
+</li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1366'>OF-1366</a>] -         NullPointerException in Group lookup
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1384'>OF-1384</a>] -         Disco-item handler should process any domain
@@ -231,8 +233,24 @@ hr {
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1424'>OF-1424</a>] -         CME while calculating Group Cache stats
 </li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1427'>OF-1427</a>] -         PEP should respond to service discovery
+</li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1429'>OF-1429</a>] -         Closed BOSH sessions are still on admin console as client sessions
 </li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1430'>OF-1430</a>] -         SCRAM-SHA-1 not offered when it should be, and maybe vice-versa
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1431'>OF-1431</a>] -         XMPP Ping without type= set causes a NPE
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1436'>OF-1436</a>] -         Sharing BOSH context should not prevent context restart.
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1441'>OF-1441</a>] -         &lt;scope&gt;test&lt;/scope&gt; Maven dependencies being included in distribution
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1442'>OF-1442</a>] -         dom4j included twice in (maven) target directory
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1443'>OF-1443</a>] -         rpm install needlessly requires java-headless
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1444'>OF-1444</a>] -         mvn package is expanded environment variables
+</li>
 </ul>
         
 <h2>        New Feature
@@ -253,6 +271,8 @@ hr {
 <h2>        Task
 </h2>
 <ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1286'>OF-1286</a>] -         Update shipped CA truststore
+</li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1316'>OF-1316</a>] -         Update Tinder to 1.3.0
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1320'>OF-1320</a>] -         Update bundled JRE with the latest version
@@ -302,12 +322,20 @@ hr {
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1410'>OF-1410</a>] -         Allow openfire.bat to start in other folders
 </li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1413'>OF-1413</a>] -         Clarify Candy and InVerse readme
+</li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1415'>OF-1415</a>] -         Simplify certificate management
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1418'>OF-1418</a>] -         LDAPManager reports UserNotFoundException unnecessarily
 </li>
 <li>[<a href='https://issues.igniterealtime.org/browse/OF-1425'>OF-1425</a>] -         Allow plugins to define a minimum Java version
 </li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1434'>OF-1434</a>] -         Optimize sender check in PubSubEngine#createNodeHelper
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1438'>OF-1438</a>] -         Add option to replace private key
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1445'>OF-1445</a>] -         Cache reconfig without restart
+</li>
 </ul>
 
 <h2>4.1.6 -- <span style="font-weight: normal;">Oct 5, 2017</span></h2>

i18n/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>i18n</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>parent</artifactId>
-    <version>4.2.0-beta</version>
+    <version>4.2.0</version>
     <name>Parent</name>
     <packaging>pom</packaging>
 

src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java

@@ -38,7 +38,7 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
 
     private final Date startDate;
 
-    public static final Version VERSION = new Version(4, 2, 0, Version.ReleaseStatus.Beta, -1 );
+    public static final Version VERSION = new Version(4, 2, 0, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor

src/plugins/bookmarks/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>bookmarks</artifactId>

src/plugins/broadcast/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>broadcast</artifactId>

src/plugins/callbackOnOffline/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>callbackOnOffline</artifactId>

src/plugins/candy/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>candy</artifactId>

src/plugins/clientControl/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>clientControl</artifactId>

src/plugins/contentFilter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>contentFilter</artifactId>

src/plugins/dbaccess/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>dbaccess</artifactId>

src/plugins/emailListener/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>emailListener</artifactId>

src/plugins/emailOnAway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>emailOnAway</artifactId>

src/plugins/fastpath/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>fastpath</artifactId>

src/plugins/gojara/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>gojara</artifactId>

src/plugins/hazelcast/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>hazelcast</artifactId>

src/plugins/inverse/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>inverse</artifactId>

src/plugins/jingleNodes/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>jingleNodes</artifactId>

src/plugins/jmxweb/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>jmxweb</artifactId>

src/plugins/justmarried/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>justmarried</artifactId>

src/plugins/kraken/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>kraken</artifactId>

src/plugins/loadStats/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>loadStats</artifactId>

src/plugins/monitoring/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>monitoring</artifactId>

src/plugins/motd/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>motd</artifactId>

src/plugins/mucservice/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>mucservice</artifactId>

src/plugins/nodejs/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>nodejs</artifactId>

src/plugins/nonSaslAuthentication/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>nonSaslAuthentication</artifactId>

src/plugins/openfire-plugin-assembly-descriptor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>openfire-plugin-assembly-descriptor</artifactId>

src/plugins/packetFilter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>packetFilter</artifactId>

src/plugins/pom.xml

@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.igniterealtime.openfire</groupId>
-    <version>4.2.0-beta</version>
+    <version>4.2.0</version>
     <artifactId>plugins</artifactId>
     <packaging>pom</packaging>
     <name>Openfire Plugins</name>
@@ -77,7 +77,7 @@
         <plugin.name>${project.artifactId}</plugin.name>
 
         <!-- Versions -->
-        <openfire.version>4.2.0-beta</openfire.version>
+        <openfire.version>4.2.0</openfire.version>
     </properties>
 
     <build>

src/plugins/presence/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>presence</artifactId>

src/plugins/rayo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>rayo</artifactId>

src/plugins/registration/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>registration</artifactId>

src/plugins/restAPI/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>restAPI</artifactId>

src/plugins/search/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>search</artifactId>

src/plugins/sip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>sip</artifactId>

src/plugins/stunserver/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>stunserver</artifactId>

src/plugins/subscription/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>subscription</artifactId>

src/plugins/tikitoken/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>tikitoken</artifactId>

src/plugins/userCreation/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>userCreation</artifactId>

src/plugins/userImportExport/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>userImportExport</artifactId>

src/plugins/userservice/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>userservice</artifactId>

src/plugins/xmldebugger/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>xmldebugger</artifactId>

starter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <artifactId>starter</artifactId>
     <name>Starter for Openfire</name>

webadmin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <artifactId>webadmin</artifactId>
     <name>Web-based Administration Interface</name>

webadmintld/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <artifactId>webadmintld</artifactId>
     <name>Administration Interface Taglibs</name>

xmppserver/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire</groupId>
         <artifactId>parent</artifactId>
-        <version>4.2.0-beta</version>
+        <version>4.2.0</version>
     </parent>
     <artifactId>xmppserver</artifactId>
     <name>Core XMPP Server</name>