From cfb60f72c3eb450b9ebf12cc1ac3e1c6dc8191d3 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Wed, 20 Nov 2024 15:25:43 +0100
Subject: [PATCH 1/4] Only compatible with Openfire < 5.0.0

---
 changelog.html | 5 +++++
 plugin.xml     | 3 ++-
 pom.xml        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index ddbaf71..92e3bd1 100644
--- a/changelog.html
+++ b/changelog.html
@@ -43,6 +43,11 @@ <h1>
     Random Avatar Plugin Changelog
 </h1>
 
+<p><b>1.1.1</b> -- November 20, 2024</p>
+<ul>
+    <li>Marked as last version to be compatible with Openfire versions prior to 5.0.0.</li>
+</ul>
+
 <p><b>1.1.0</b> -- May 23, 2023</p>
 <ul>
     <li>Remove unused exclusion to authentication filter</li>
diff --git a/plugin.xml b/plugin.xml
index 157c304..2321343 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,7 +5,8 @@
     <description>${project.description}</description>
     <author>Guus der Kinderen</author>
     <version>${project.version}</version>
-    <date>2023-05-23</date>
+    <date>2024-11-20</date>
     <minServerVersion>4.1.5</minServerVersion>
+    <priorToServerVersion>5.0.0</priorToServerVersion>
     <minJavaVersion>1.8</minJavaVersion>
 </plugin>
diff --git a/pom.xml b/pom.xml
index 8729a05..99117d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>randomavatar</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <name>Random Avatar Generator Plugin</name>
     <description>Generates semi-random avatar images.</description>

From 44402c9ea39ce2b19649649e69517b953eedec06 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Wed, 20 Nov 2024 15:26:14 +0100
Subject: [PATCH 2/4] Denote v1.1.1 release.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 99117d0..0158a10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>randomavatar</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 
     <name>Random Avatar Generator Plugin</name>
     <description>Generates semi-random avatar images.</description>

From 0de91dc9e519fdc7edc9b32d7da1173dec30fee0 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Wed, 20 Nov 2024 15:26:42 +0100
Subject: [PATCH 3/4] March forward version number to next SNAPSHOT.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0158a10..8729a05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>randomavatar</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <name>Random Avatar Generator Plugin</name>
     <description>Generates semi-random avatar images.</description>

From 202715f554dbb80324eebfa71e1098bf66b9ad8f Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Wed, 20 Nov 2024 15:30:36 +0100
Subject: [PATCH 4/4] fixes #5: Openfire 5.0.0 compatibility

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.

Drop unnecessary manual initialization of JasperInitializer

To quote Joakim Erdfelt, a Jetty developer:

> For a `WebAppContext`, this manual initialization of JasperInitializer is not necessary. (it is necessary for a `ServletContextHandler`)
> The fact that jetty-ee8-apache-jsp-<ver>.jar is in your classpath should be enough for that webapp to automatically have JSP support enabled.
>
> If you find that you don't have a `jsp` servlet initialized, then that means you'll want to declare the `WebAppContext.setDefaultDescriptor()` to point to the `webdefault-ee8.xml` for your version. You can find that file in the `jetty-ee8-webapp-<ver>-config.jar` -
> See https://repo1.maven.org/maven2/org/eclipse/jetty/ee8/jetty-ee8-webapp/12.0.14/

Drop explicit InstanceManager configuration

Removing initialization of an attribute that I believe to be something that has been carried over from earlier versions, without this being neccesary anymore.
---
 changelog.html                                     |  6 ++++++
 plugin.xml                                         |  4 +---
 pom.xml                                            |  6 +++---
 .../plugins/randomavatar/RandomAvatarPlugin.java   | 14 ++------------
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/changelog.html b/changelog.html
index 92e3bd1..c9aa38c 100644
--- a/changelog.html
+++ b/changelog.html
@@ -43,6 +43,12 @@ <h1>
     Random Avatar Plugin Changelog
 </h1>
 
+<p><b>1.2.0</b> -- (to be determined)</p>
+<ul>
+    <li>Requires Openfire 5.0.0 or later</li>
+    <li><a href="https://github.com/igniterealtime/openfire-randomavatar-plugin/issues/5">#5:</a> Openfire 5.0.0 compatibility</li>
+</ul>
+
 <p><b>1.1.1</b> -- November 20, 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 2321343..409445f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,7 +6,5 @@
     <author>Guus der Kinderen</author>
     <version>${project.version}</version>
     <date>2024-11-20</date>
-    <minServerVersion>4.1.5</minServerVersion>
-    <priorToServerVersion>5.0.0</priorToServerVersion>
-    <minJavaVersion>1.8</minJavaVersion>
+    <minServerVersion>5.0.0</minServerVersion>
 </plugin>
diff --git a/pom.xml b/pom.xml
index 8729a05..018014c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.3.0</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.igniterealtime.openfire.plugins</groupId>
@@ -34,8 +34,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/plugins/randomavatar/RandomAvatarPlugin.java b/src/java/org/igniterealtime/openfire/plugins/randomavatar/RandomAvatarPlugin.java
index 179b8d6..6c5c1e2 100644
--- a/src/java/org/igniterealtime/openfire/plugins/randomavatar/RandomAvatarPlugin.java
+++ b/src/java/org/igniterealtime/openfire/plugins/randomavatar/RandomAvatarPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-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.plugins.randomavatar;
 
-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.openfire.container.Plugin;
 import org.jivesoftware.openfire.container.PluginManager;
 import org.jivesoftware.openfire.http.HttpBindManager;
@@ -27,8 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * An Openfire plugin that makes available an avatar-exposing webservice.
@@ -56,10 +50,6 @@ public void initializePlugin( PluginManager manager, File pluginDirectory )
         context.setClassLoader( this.getClass().getClassLoader() );
 
         Log.debug( "Ensure the JSP engine is initialized correctly (in order to be able to cope with Tomcat/Jasper precompiled JSPs)." );
-        final List<ContainerInitializer> initializers = new ArrayList<>();
-        initializers.add( new ContainerInitializer( new JettyJasperInitializer(), null ) );
-        context.setAttribute( "org.eclipse.jetty.containerInitializers", initializers );
-        context.setAttribute( InstanceManager.class.getName(), new SimpleInstanceManager() );
         context.setAttribute( "org.igniterealtime.openfire.plugins.randomavatar.plugindirectory", pluginDirectory.toPath() );
         Log.debug( "Registering context with the embedded webserver." );
         HttpBindManager.getInstance().addJettyHandler( context );