diff --git a/changelog.html b/changelog.html
index bbb6913..8e5653d 100644
--- a/changelog.html
+++ b/changelog.html
@@ -43,6 +43,12 @@
JSXC Plugin Changelog
+4.4.0 Release 3 -- (to be determined)
+
+ - Requires Openfire 5.0.0 or later
+ - #24: Openfire 5.0.0 compatibility
+
+
4.4.0 Release 2 -- November 14, 2024
- Marked as last version to be compatible with Openfire versions prior to 5.0.0.
diff --git a/plugin.xml b/plugin.xml
index 4afad72..7d0831e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,10 +5,8 @@
${project.description}
Guus der Kinderen
${project.version}
- 2024-11-14
- 4.4.0
- 5.0.0
- 1.8
+ 2024-11-15
+ 5.0.0
diff --git a/pom.xml b/pom.xml
index 5f5f28a..0d22e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
plugins
org.igniterealtime.openfire
- 4.4.0
+ 5.0.0-SNAPSHOT
org.igniterealtime.openfire.plugins
jsxc
@@ -19,8 +19,8 @@
- org.eclipse.jetty
- jetty-jspc-maven-plugin
+ org.eclipse.jetty.ee8
+ jetty-ee8-jspc-maven-plugin
diff --git a/src/java/org/igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java b/src/java/org/igniterealtime/openfire/plugin/jsxc/JSXCPlugin.java
index ad5cac0..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.
@@ -66,12 +61,6 @@ public void initializePlugin( PluginManager manager, File pluginDirectory )
context = new WebAppContext( null, pluginDirectory.getPath() + File.separator + "classes/", "/" + CONTEXT_ROOT );
context.setClassLoader( this.getClass().getClassLoader() );
- // Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs).
- final List initializers = new ArrayList<>();
- initializers.add( new ContainerInitializer( new JettyJasperInitializer(), null ) );
- context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
- context.setAttribute( InstanceManager.class.getName(), new SimpleInstanceManager());
-
HttpBindManager.getInstance().addJettyHandler( context );
}