Merge pull request #1803 from akrherz/462

denote Openfire 4.6.2 release
igniterealtime · Feb 5, 2021 · b61bce3 · b61bce3
2 parents 77276cb + 94e475f
commit b61bce3
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.2-SNAPSHOT</version>
+        <version>4.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.2-SNAPSHOT</version>
+        <version>4.6.2</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
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.2-SNAPSHOT</version>
+        <version>4.6.2</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>openfire-plugin-assembly-descriptor</artifactId>

diff --git 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.2-SNAPSHOT</version>
+    <version>4.6.2</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.2-SNAPSHOT</openfire.version>
+        <openfire.version>4.6.2</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
@@ -4,7 +4,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>parent</artifactId>
-    <version>4.6.2-SNAPSHOT</version>
+    <version>4.6.2</version>
     <name>Parent</name>
     <packaging>pom</packaging>
 

diff --git a/starter/pom.xml b/starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.2-SNAPSHOT</version>
+        <version>4.6.2</version>
     </parent>
     <artifactId>starter</artifactId>
     <name>Starter for Openfire</name>

diff --git a/xmppserver/changelog.html b/xmppserver/changelog.html
@@ -163,6 +163,26 @@ <h1>Openfire Changelog</h1>
     <div id="pageBody">
 
 
+<h2>4.6.2 -- <span style="font-weight: normal;">February 5, 2021</span></h2>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2196'>OF-2196</a>] -         Fix dependencies for PluginServlet on Java 11
+</li>
+<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2197'>OF-2197</a>] -         Slash-star block comment fails for SQLServer
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2155'>OF-2155</a>] -         X-Frame-Options header in Admin returns an invalid value
+</li>
+<li>[<a href='https://igniterealtime.atlassian.net/browse/OF-2195'>OF-2195</a>] -         Add Git SHA to Admin
+</li>
+</ul>
+
+
 <h2>4.6.1 -- <span style="font-weight: normal;">January 6, 2021</span></h2>
 <h2>        Bug
 </h2>

diff --git a/xmppserver/pom.xml b/xmppserver/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire</groupId>
         <artifactId>parent</artifactId>
-        <version>4.6.2-SNAPSHOT</version>
+        <version>4.6.2</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
@@ -39,7 +39,7 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
 
     private final Date startDate;
 
-    public static final Version VERSION = new Version(4, 6, 2, Version.ReleaseStatus.Alpha, -1 );
+    public static final Version VERSION = new Version(4, 6, 2, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor