From 060b9c6eccf56a24e9aab9741b25752e37f90e5e Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Sat, 28 May 2022 12:53:08 +0200
Subject: [PATCH] Change the version to 9.4

Jetty 9.x is the last version that does not use SLF4J natively: cf.
[Jetty 9 documentation](https://www.eclipse.org/jetty/documentation/jetty-9/index.html#configuring-logging)
vs
[Jetty 10
documentation](https://www.eclipse.org/jetty/documentation/jetty-10/operations-guide/index.html#og-logging)

Given the EOL announcement eclipse/jetty.project#7958, this is the last
upgrade we need to perform.
---
 log4j-appserver/pom.xml | 3 ---
 pom.xml                 | 8 ++++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index 94486053592..fedd459b7aa 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -35,7 +35,6 @@
     <docLabel>Web Documentation</docLabel>
     <projectDir>/log4j-appserver</projectDir>
     <tomcat-juli.version>10.0.21</tomcat-juli.version>
-    <jetty.version>11.0.9</jetty.version> <!--  Jetty 9 requires Java 8 -->
     <module.name>org.apache.logging.log4j.appserver</module.name>
     <maven.doap.skip>true</maven.doap.skip>
   </properties>
@@ -54,8 +53,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 5ab42be92a7..78b99433536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,6 +307,8 @@
     <argLine>-Xms256m -Xmx1024m</argLine>
     <javaTargetVersion>1.8</javaTargetVersion>
     <module.name />
+    <!-- Dependency versions -->
+    <jetty.version>9.4.46.v20220331</jetty.version>
   </properties>
   <pluginRepositories>
     <pluginRepository>
@@ -1074,6 +1076,12 @@
         <version>31.1-jre</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty.version}</version>
+        <scope>provided</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>