From c3866a89396a0d19ac97ccff5f7e669a234a19ff Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Fri, 15 Nov 2024 14:48:48 +0100
Subject: [PATCH] fixes #24: Compatible with Openfire 5.0.0 / Jetty 12

Updates the plugin to be compatible with Openfire 5.0.0 (in particular: with the new version of Jetty that's part of that release).

This drops compatibility with versions of Openfire prior to 5.0.0.
---
 changelog.html                                           | 6 ++++++
 plugin.xml                                               | 6 ++----
 pom.xml                                                  | 6 +++---
 .../igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java  | 9 ++-------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/changelog.html b/changelog.html
index bbb6913..8e5653d 100644
--- a/changelog.html
+++ b/changelog.html
@@ -43,6 +43,12 @@ <h1>
     JSXC Plugin Changelog
 </h1>
 
+<p><b>4.4.0 Release 3</b> -- (to be determined)</p>
+<ul>
+    <li>Requires Openfire 5.0.0 or later</li>
+    <li><a href="https://github.com/igniterealtime/openfire-jsxc-plugin/issues/24">#24:</a> Openfire 5.0.0 compatibility</li>
+</ul>
+
 <p><b>4.4.0 Release 2</b> -- November 14, 2024</p>
 <ul>
     <li>Marked as last version to be compatible with Openfire versions prior to 5.0.0.</li>
diff --git a/plugin.xml b/plugin.xml
index 4afad72..7d0831e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,10 +5,8 @@
     <description>${project.description}</description>
     <author>Guus der Kinderen</author>
     <version>${project.version}</version>
-    <date>2024-11-14</date>
-    <minServerVersion>4.4.0</minServerVersion>
-    <priorToServerVersion>5.0.0</priorToServerVersion>
-    <minJavaVersion>1.8</minJavaVersion>
+    <date>2024-11-15</date>
+    <minServerVersion>5.0.0</minServerVersion>
     <adminconsole>
         <tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="jsxc-config.jsp">
             <sidebar id="tab-jsxc" name="${admin.sidebar.webclients.item.jsxc.name}" description="${admin.sidebar.webclients.item.jsxc.description}">
diff --git a/pom.xml b/pom.xml
index 5f5f28a..0d22e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.4.0</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>jsxc</artifactId>
@@ -19,8 +19,8 @@
             </plugin>
             <!-- Compiles the Openfire Admin Console JSP pages. -->
             <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jspc-maven-plugin</artifactId>
+                <groupId>org.eclipse.jetty.ee8</groupId>
+                <artifactId>jetty-ee8-jspc-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/src/java/org/igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java b/src/java/org/igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java
index c6b3971..45beaa3 100644
--- a/src/java/org/igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java
+++ b/src/java/org/igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2024 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,7 @@
  */
 package org.igniterealtime.openfire.plugin.jsxc;
 
-import org.apache.tomcat.InstanceManager;
-import org.apache.tomcat.SimpleInstanceManager;
-import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
-import org.eclipse.jetty.plus.annotation.ContainerInitializer;
-import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.ee8.webapp.WebAppContext;
 import org.jivesoftware.admin.AuthCheckFilter;
 import org.jivesoftware.openfire.container.Plugin;
 import org.jivesoftware.openfire.container.PluginManager;
@@ -30,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.*;
 
 /**
  * An Openfire plugin that integrates the JSXC web client.