You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2025/01/13 14:15:11 UTC
(felix-dev) 01/01: 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.
This is an automated email from the ASF dual-hosted git repository.
paulrutter pushed a commit to branch maintenance/remove-maven-optional-from-jetty-bundles
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 5a29722e6e48a6de646b9b229d55cdc1533446f2
Author: Paul Rütter <pa...@blueconic.com>
AuthorDate: Mon Jan 13 15:14:55 2025 +0100
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>