From 9b35e20028cdb52e29e4ac815a8419ffb35ca2d3 Mon Sep 17 00:00:00 2001
From: akrherz <akrherz@iastate.edu>
Date: Thu, 22 Apr 2021 07:37:09 -0500
Subject: [PATCH] denote Openfire 4.6.3 release

---
 distribution/pom.xml                          |  2 +-
 i18n/pom.xml                                  |  2 +-
 .../pom.xml                                   |  2 +-
 plugins/pom.xml                               |  4 +--
 pom.xml                                       |  2 +-
 starter/pom.xml                               |  2 +-
 xmppserver/changelog.html                     | 25 +++++++++++++++++++
 xmppserver/pom.xml                            |  2 +-
 .../openfire/spi/XMPPServerInfoImpl.java      |  2 +-
 9 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 675780e156..8f770497c5 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.3-SNAPSHOT</version>
+        <version>4.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/i18n/pom.xml b/i18n/pom.xml
index f58bc83924..ce387dcc29 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-	<version>4.6.3-SNAPSHOT</version>
+	<version>4.6.3</version>
     </parent>
     <artifactId>i18n</artifactId>
     <name>Internationalization files for Openfire</name>
diff --git a/plugins/openfire-plugin-assembly-descriptor/pom.xml b/plugins/openfire-plugin-assembly-descriptor/pom.xml
index 1a190ad935..a1141e1436 100644
--- a/plugins/openfire-plugin-assembly-descriptor/pom.xml
+++ b/plugins/openfire-plugin-assembly-descriptor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.3-SNAPSHOT</version>
+        <version>4.6.3</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>openfire-plugin-assembly-descriptor</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 1cc3a0f1aa..7e79677b9f 100644
--- a/plugins/pom.xml
+++ b/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.6.3-SNAPSHOT</version>
+    <version>4.6.3</version>
     <artifactId>plugins</artifactId>
     <packaging>pom</packaging>
     <name>Openfire Plugins</name>
@@ -120,7 +120,7 @@
         <plugin.name>${project.artifactId}</plugin.name>
 
         <!-- Versions -->
-        <openfire.version>4.6.3-SNAPSHOT</openfire.version>
+        <openfire.version>4.6.3</openfire.version>
         <!-- Note; the following jetty.version should be identical to the jetty.version in xmppserver/pom.xml -->
         <jetty.version>9.4.35.v20201120</jetty.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index feb4f2915a..70aad22d4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>parent</artifactId>
-    <version>4.6.3-SNAPSHOT</version>
+    <version>4.6.3</version>
     <name>Parent</name>
     <packaging>pom</packaging>
 
diff --git a/starter/pom.xml b/starter/pom.xml
index 4b33a1a0b5..1069b9a8c8 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.3-SNAPSHOT</version>
+        <version>4.6.3</version>
     </parent>
     <artifactId>starter</artifactId>
     <name>Starter for Openfire</name>
diff --git a/xmppserver/changelog.html b/xmppserver/changelog.html
index f56e710477..0611f7c69e 100644
--- a/xmppserver/changelog.html
+++ b/xmppserver/changelog.html
@@ -163,6 +163,31 @@ <h1>Openfire Changelog</h1>
     <div id="pageBody">
 
 
+<h2>4.6.3 -- <span style="font-weight: normal;">April 22, 2021</span></h2>
+
+<h2>Bug</h2>
+<ul>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2214'>OF-2214</a>] - DbConnectionManager should not default to DB2 for unknown database types.</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2210'>OF-2210</a>] - Session Destroyed event is not triggered</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2207'>OF-2207</a>] - Creating new room on cluster generates exception on one node</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2205'>OF-2205</a>] - Race-condition in EntityCapabilitiesManager when deleting user</li>
+</ul>
+
+<h2>Improvement</h2>
+<ul>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2217'>OF-2217</a>] - Enable Result Set scroll support for Oracle</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2216'>OF-2216</a>] - Enable SQL transaction support for MySQL</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2215'>OF-2215</a>] - Use MySQL database scripts for MariaDB</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2201'>OF-2201</a>] - Better error when LDAP fails due to missing HTTP session</li>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2192'>OF-2192</a>] - Add Client Version column to Sessions page</li>
+</ul>
+
+<h2>New Feature</h2>
+<ul>
+	<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2209'>OF-2209</a>] - MUC 'ghost' users should be detected/removed</li>
+</ul>
+
+
 <h2>4.6.2 -- <span style="font-weight: normal;">February 5, 2021</span></h2>
 <h2>        Bug
 </h2>
diff --git a/xmppserver/pom.xml b/xmppserver/pom.xml
index 092a6612d4..ec4e2e72a2 100644
--- a/xmppserver/pom.xml
+++ b/xmppserver/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire</groupId>
         <artifactId>parent</artifactId>
-        <version>4.6.3-SNAPSHOT</version>
+        <version>4.6.3</version>
     </parent>
     <artifactId>xmppserver</artifactId>
     <name>Core XMPP Server</name>
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
index 7b5d1e1aca..8ce3fb6511 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
@@ -39,7 +39,7 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
 
     private final Date startDate;
 
-    public static final Version VERSION = new Version(4, 6, 3, Version.ReleaseStatus.Alpha, -1 );
+    public static final Version VERSION = new Version(4, 6, 3, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor