OF-2600: Upgrade Jetty 9.4.43.v20210629 to 10.0.16

plugins/pom.xml

@@ -122,7 +122,7 @@
         <!-- Versions -->
         <openfire.version>4.8.0-SNAPSHOT</openfire.version>
         <!-- Note; the following jetty.version should be identical to the jetty.version in xmppserver/pom.xml -->
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>10.0.16</jetty.version>
     </properties>
 
     <profiles>

pom.xml

@@ -118,7 +118,7 @@
 
         <!-- Versions -->
         <!-- Note; the following jetty.version should be identical to the jetty.version in plugins/pom.xml -->
-        <jetty.version>9.4.43.v20210629</jetty.version>
+        <jetty.version>10.0.16</jetty.version>
         <standard-taglib.version>1.2.5</standard-taglib.version>
         <netty.version>4.1.94.Final</netty.version>
         <bouncycastle.version>1.70</bouncycastle.version>

xmppserver/pom.xml

@@ -148,8 +148,6 @@
                             <jspc>
                                 <package>org.jivesoftware.openfire.admin</package>
                             </jspc>
-                            <sourceVersion>11</sourceVersion>
-                            <targetVersion>11</targetVersion>
                             <keepSources>true</keepSources>
                         </configuration>
                     </execution>
@@ -266,7 +264,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-server</artifactId>
+            <artifactId>websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
         </dependency>
         <dependency>

xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java

@@ -211,7 +211,7 @@ protected void startup() {
 
                     final ConnectionManager connectionManager = XMPPServer.getInstance().getConnectionManager();
                     final ConnectionConfiguration configuration = connectionManager.getListener( ConnectionType.WEBADMIN, true ).generateConnectionConfiguration();
-                    final SslContextFactory sslContextFactory = new EncryptionArtifactFactory( configuration ).getSslContextFactory();
+                    final SslContextFactory.Server sslContextFactory = new EncryptionArtifactFactory( configuration ).getSslContextFactory();
 
                     final HttpConfiguration httpsConfig = new HttpConfiguration();
                     httpsConfig.setSendServerVersion( false );
@@ -489,6 +489,7 @@ private void createWebAppContext() {
         final List<ContainerInitializer> initializers = new ArrayList<>();
         initializers.add(new ContainerInitializer(new JasperInitializer(), null));
         context.setAttribute("org.eclipse.jetty.containerInitializers", initializers);
+        context.setClassLoader(Thread.currentThread().getContextClassLoader());
         context.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
         context.setConfigurations(new Configuration[]{
             new AnnotationConfiguration(),
@@ -501,7 +502,7 @@ private void createWebAppContext() {
             new JettyWebXmlConfiguration()
         });
         final URL classes = getClass().getProtectionDomain().getCodeSource().getLocation();
-        context.getMetaData().setWebInfClassesDirs(Collections.singletonList(Resource.newResource(classes)));
+        context.getMetaData().setWebInfClassesResources(Collections.singletonList(Resource.newResource(classes)));
 
         // The index.html includes a redirect to the index.jsp and doesn't bypass
         // the context security when in development mode

xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServletContext.java

@@ -257,6 +257,11 @@ public ServletRegistration.Dynamic addServlet( String s, Class<? extends Servlet
         return proxy.addServlet( s, aClass );
     }
 
+    @Override
+    public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
+        return proxy.addJspFile(servletName, jspFile);
+    }
+
     @Override
     public <T extends Servlet> T createServlet( Class<T> aClass ) throws ServletException
     {
@@ -382,4 +387,34 @@ public String getVirtualServerName()
     {
         return proxy.getVirtualServerName();
     }
+
+    @Override
+    public int getSessionTimeout() {
+        return proxy.getSessionTimeout();
+    }
+
+    @Override
+    public void setSessionTimeout(int sessionTimeout) {
+        proxy.setSessionTimeout(sessionTimeout);
+    }
+
+    @Override
+    public String getRequestCharacterEncoding() {
+        return proxy.getRequestCharacterEncoding();
+    }
+
+    @Override
+    public void setRequestCharacterEncoding(String encoding) {
+        proxy.setRequestCharacterEncoding(encoding);
+    }
+
+    @Override
+    public String getResponseCharacterEncoding() {
+        return proxy.getResponseCharacterEncoding();
+    }
+
+    @Override
+    public void setResponseCharacterEncoding(String encoding) {
+        proxy.setResponseCharacterEncoding(encoding);
+    }
 }