From bae8b8b1b749a906e753f9dfe662ad5c24ee02d3 Mon Sep 17 00:00:00 2001
From: Andreas Mattes <andreasmattes@fastmail.de>
Date: Tue, 17 Sep 2024 15:16:20 +0200
Subject: [PATCH] TPRUN-8496 Keep jetty feature as required by CXF.

---
 assemblies/features/standard/src/main/feature/feature.xml | 4 +---
 pom.xml                                                   | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index a929d8491c0..d09ceb5471e 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -911,11 +911,9 @@ org.osgi.service.http.port=8181
         <feature>pax-web-http-war</feature>
     </feature>
 
-    <!--
-    <feature name="jetty" description="Transition feature for backward compatibility" version="9.4.54.v20240208">
+    <feature name="jetty" description="Transition feature for backward compatibility" version="${jetty9.tesb.version}">
         <feature>pax-web-jetty</feature>
     </feature>
-    -->
 
     <feature name="kar" description="Provide KAR (KARaf archive) support" version="${upstream.version}">
         <bundle start-level="30">mvn:org.apache.karaf.kar/org.apache.karaf.kar.core/${upstream.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 748fa1ac0b3..c7460de4be2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,7 @@
         <!-- <pax.jms.tesb.version>1.1.3</pax.jms.tesb.version> -->
         <!-- <pax.jdbc.tesb.version>1.5.7</pax.jdbc.tesb.version> -->
         <!-- <pax.transx.tesb.version>0.5.4</pax.transx.tesb.version> -->
+        <jetty9.tesb.version>9.4.55.v20240627</jetty9.tesb.version>
         <spec.mail.tesb.version>1.6.7</spec.mail.tesb.version>
         <aspectj.bundle.tesb.version>1.9.21.1_1</aspectj.bundle.tesb.version>
         <bouncycastle.tesb.version>1.78.1</bouncycastle.tesb.version>
@@ -495,6 +496,7 @@
                             <!-- <pax.jms.tesb.version>${pax.jms.tesb.version}</pax.jms.tesb.version> -->
                             <!-- <pax.jdbc.tesb.version>${pax.jdbc.tesb.version}</pax.jdbc.tesb.version> -->
                             <!-- <pax.transx.tesb.version>${pax.transx.tesb.version}</pax.transx.tesb.version> -->
+                            <jetty9.tesb.version>${jetty9.tesb.version}</jetty9.tesb.version>
                             <spec.mail.tesb.version>${spec.mail.tesb.version}</spec.mail.tesb.version>
                             <aspectj.bundle.tesb.version>${aspectj.bundle.tesb.version}</aspectj.bundle.tesb.version>
                             <bouncycastle.tesb.version>${bouncycastle.tesb.version}</bouncycastle.tesb.version>