Denote Openfire 4.2.1 Release (#952)

igniterealtime · Dec 8, 2017 · dcef698 · dcef698
1 parent 77999f2
commit dcef698
Show file tree

Hide file tree

Showing 49 changed files with 72 additions and 48 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="2"/>
     <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/dbutil/pom.xml b/dbutil/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>dbutil</artifactId>
     <name>Database Utilities</name>

diff --git a/documentation/dist/changelog.html b/documentation/dist/changelog.html
@@ -163,6 +163,30 @@ <h1>Openfire Changelog</h1>
     <div id="pageBody">
 
 
+<h2>4.2.1 -- <span style="font-weight: normal;">Dec 8, 2017</span></h2>
+<h2>        Bug
+</h2>
+<ul>
+<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-1450'>OF-1450</a>] -         Some admin console text is hardcoded
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1451'>OF-1451</a>] -         Support for SNAPSHOT plugin versions
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1447'>OF-1447</a>] -         Improve deployability of Maven artifacts to public repository.
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1448'>OF-1448</a>] -         Don&#39;t require i18n source files to be encoded.
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1452'>OF-1452</a>] -         Updated Russian Translation
+</li>
+</ul>
+
+
 <h2>4.2.0 -- <span style="font-weight: normal;">Dec 4, 2017</span></h2>
 
 <h2>        Sub-task

diff --git a/i18n/pom.xml b/i18n/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>i18n</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>parent</artifactId>
-    <version>4.2.1-SNAPSHOT</version>
+    <version>4.2.1</version>
     <name>Parent</name>
     <packaging>pom</packaging>
 

diff --git a/src/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java b/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, 1, Version.ReleaseStatus.Alpha, -1 );
+    public static final Version VERSION = new Version(4, 2, 1, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor

diff --git a/src/plugins/bookmarks/pom.xml b/src/plugins/bookmarks/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>bookmarks</artifactId>

diff --git a/src/plugins/broadcast/pom.xml b/src/plugins/broadcast/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>broadcast</artifactId>

diff --git a/src/plugins/callbackOnOffline/pom.xml b/src/plugins/callbackOnOffline/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>callbackOnOffline</artifactId>

diff --git a/src/plugins/candy/pom.xml b/src/plugins/candy/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>candy</artifactId>

diff --git a/src/plugins/clientControl/pom.xml b/src/plugins/clientControl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>clientControl</artifactId>

diff --git a/src/plugins/contentFilter/pom.xml b/src/plugins/contentFilter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>contentFilter</artifactId>

diff --git a/src/plugins/dbaccess/pom.xml b/src/plugins/dbaccess/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>dbaccess</artifactId>

diff --git a/src/plugins/emailListener/pom.xml b/src/plugins/emailListener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>emailListener</artifactId>

diff --git a/src/plugins/emailOnAway/pom.xml b/src/plugins/emailOnAway/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>emailOnAway</artifactId>

diff --git a/src/plugins/fastpath/pom.xml b/src/plugins/fastpath/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>fastpath</artifactId>

diff --git a/src/plugins/gojara/pom.xml b/src/plugins/gojara/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>gojara</artifactId>

diff --git a/src/plugins/hazelcast/pom.xml b/src/plugins/hazelcast/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>hazelcast</artifactId>

diff --git a/src/plugins/inverse/pom.xml b/src/plugins/inverse/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>inverse</artifactId>

diff --git a/src/plugins/jingleNodes/pom.xml b/src/plugins/jingleNodes/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>jingleNodes</artifactId>

diff --git a/src/plugins/jmxweb/pom.xml b/src/plugins/jmxweb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>jmxweb</artifactId>

diff --git a/src/plugins/justmarried/pom.xml b/src/plugins/justmarried/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>justmarried</artifactId>

diff --git a/src/plugins/kraken/pom.xml b/src/plugins/kraken/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>kraken</artifactId>

diff --git a/src/plugins/loadStats/pom.xml b/src/plugins/loadStats/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>loadStats</artifactId>

diff --git a/src/plugins/monitoring/pom.xml b/src/plugins/monitoring/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>monitoring</artifactId>

diff --git a/src/plugins/motd/pom.xml b/src/plugins/motd/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>motd</artifactId>

diff --git a/src/plugins/mucservice/pom.xml b/src/plugins/mucservice/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>mucservice</artifactId>

diff --git a/src/plugins/nodejs/pom.xml b/src/plugins/nodejs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>nodejs</artifactId>

diff --git a/src/plugins/nonSaslAuthentication/pom.xml b/src/plugins/nonSaslAuthentication/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>nonSaslAuthentication</artifactId>

diff --git a/src/plugins/openfire-plugin-assembly-descriptor/pom.xml b/src/plugins/openfire-plugin-assembly-descriptor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>openfire-plugin-assembly-descriptor</artifactId>

diff --git a/src/plugins/packetFilter/pom.xml b/src/plugins/packetFilter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>packetFilter</artifactId>

diff --git a/src/plugins/pom.xml b/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.1-SNAPSHOT</version>
+    <version>4.2.1</version>
     <artifactId>plugins</artifactId>
     <packaging>pom</packaging>
     <name>Openfire Plugins</name>

diff --git a/src/plugins/presence/pom.xml b/src/plugins/presence/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>presence</artifactId>

diff --git a/src/plugins/rayo/pom.xml b/src/plugins/rayo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>rayo</artifactId>

diff --git a/src/plugins/registration/pom.xml b/src/plugins/registration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>registration</artifactId>

diff --git a/src/plugins/restAPI/pom.xml b/src/plugins/restAPI/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>restAPI</artifactId>

diff --git a/src/plugins/search/pom.xml b/src/plugins/search/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>search</artifactId>

diff --git a/src/plugins/sip/pom.xml b/src/plugins/sip/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>sip</artifactId>

diff --git a/src/plugins/stunserver/pom.xml b/src/plugins/stunserver/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>stunserver</artifactId>

diff --git a/src/plugins/subscription/pom.xml b/src/plugins/subscription/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>subscription</artifactId>

diff --git a/src/plugins/tikitoken/pom.xml b/src/plugins/tikitoken/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>tikitoken</artifactId>

diff --git a/src/plugins/userCreation/pom.xml b/src/plugins/userCreation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.2.1-SNAPSHOT</version>
+        <version>4.2.1</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>userCreation</artifactId>