From 5a29722e6e48a6de646b9b229d55cdc1533446f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Mon, 13 Jan 2025 15:14:55 +0100
Subject: [PATCH 1/2] Remove optional from both Jetty bundles, as these bundles
 are typically never used as maven dependency. Optional means something
 different in maven than to OSGi. The optional OSGi instructions are left
 intact.

---
 http/jetty/pom.xml   | 2 --
 http/jetty12/pom.xml | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 4c8b748dc5..00dfa08c0a 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -465,13 +465,11 @@
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-jakarta-server</artifactId>
             <version>${jetty.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 756c339c91..d4bfe11e89 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -684,19 +684,16 @@
             <groupId>org.eclipse.jetty.ee10.websocket</groupId>
             <artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
             <version>${jetty.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.ee10.websocket</groupId>
             <artifactId>jetty-ee10-websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>jetty-websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -735,7 +732,6 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.5</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

From 8797b59598b89c3cb68516594b62618a3149eb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Mon, 13 Jan 2025 15:18:48 +0100
Subject: [PATCH 2/2] Retain optional on jetty bundles, not on commons-io

---
 http/jetty/pom.xml   | 2 ++
 http/jetty12/pom.xml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 00dfa08c0a..4c8b748dc5 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -465,11 +465,13 @@
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-jakarta-server</artifactId>
             <version>${jetty.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index d4bfe11e89..ab703601a7 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -684,16 +684,19 @@
             <groupId>org.eclipse.jetty.ee10.websocket</groupId>
             <artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
             <version>${jetty.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.ee10.websocket</groupId>
             <artifactId>jetty-ee10-websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>jetty-websocket-jetty-server</artifactId>
             <version>${jetty.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>