From 18257f671cef3c8340be950a4d5c50ef3b31d9f6 Mon Sep 17 00:00:00 2001
From: akrherz <akrherz@iastate.edu>
Date: Wed, 30 Sep 2020 10:54:42 -0500
Subject: [PATCH] Denote Openfire 4.5.4 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                     | 32 +++++++++++++++++++
 xmppserver/pom.xml                            |  2 +-
 .../openfire/spi/XMPPServerInfoImpl.java      |  2 +-
 9 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8de2e882b5..a9e4d7d791 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.5.4-SNAPSHOT</version>
+        <version>4.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 98966f2327..9884c0c001 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-	<version>4.5.4-SNAPSHOT</version>
+	<version>4.5.4</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 09a590dc13..2c0b3e0ed8 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.5.4-SNAPSHOT</version>
+        <version>4.5.4</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 54aaee6636..809ac84e66 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.5.4-SNAPSHOT</version>
+    <version>4.5.4</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.5.4-SNAPSHOT</openfire.version>
+        <openfire.version>4.5.4</openfire.version>
         <!-- Note; the following jetty.version should be identical to the jetty.version in xmppserver/pom.xml -->
         <jetty.version>9.4.18.v20190429</jetty.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index 86ed61d5c8..fbd573f6f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>parent</artifactId>
-    <version>4.5.4-SNAPSHOT</version>
+    <version>4.5.4</version>
     <name>Parent</name>
     <packaging>pom</packaging>
 
diff --git a/starter/pom.xml b/starter/pom.xml
index 10089ca452..9ec2e5373f 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.5.4-SNAPSHOT</version>
+        <version>4.5.4</version>
     </parent>
     <artifactId>starter</artifactId>
     <name>Starter for Openfire</name>
diff --git a/xmppserver/changelog.html b/xmppserver/changelog.html
index 616b25deba..42bdefd68a 100644
--- a/xmppserver/changelog.html
+++ b/xmppserver/changelog.html
@@ -163,6 +163,38 @@ <h1>Openfire Changelog</h1>
     <div id="pageBody">
 
 
+<h2>4.5.4 -- <span style="font-weight: normal;">September 30, 2020</span></h2>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1972'>OF-1972</a>] -         ConcurrentModificationException while loading plugins
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2059'>OF-2059</a>] -         PubSub unsubscription could fail with “xmpp.pubsub.multiple-subscriptions=true
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2065'>OF-2065</a>] -         Component cache should not expire
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2073'>OF-2073</a>] -         PubSubPersistenceManager.purgeItems incompatibility with Oracle
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-1973'>OF-1973</a>] -         Handle future-timestamped plugin files
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2051'>OF-2051</a>] -         Do not query for version information when connection is closed
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2052'>OF-2052</a>] -         Make query for version configurable
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2055'>OF-2055</a>] -         Update PostgreSQL JDBC Driver
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2068'>OF-2068</a>] -         Display the versions of various nodes in the cluster
+</li>
+<li>[<a href='https://issues.igniterealtime.org/browse/OF-2069'>OF-2069</a>] -         NullPointerException in Stream Management
+</li>
+</ul>
+
+
 <h2>4.5.3 -- <span style="font-weight: normal;">August 17, 2020</span></h2>
 <h2>        Bug
 </h2>
diff --git a/xmppserver/pom.xml b/xmppserver/pom.xml
index cc050a6c0d..0ce067143b 100644
--- a/xmppserver/pom.xml
+++ b/xmppserver/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire</groupId>
         <artifactId>parent</artifactId>
-        <version>4.5.4-SNAPSHOT</version>
+        <version>4.5.4</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 7440a04739..2fb5ad43e3 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, 5, 4, Version.ReleaseStatus.Alpha, -1 );
+    public static final Version VERSION = new Version(4, 5, 4, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor