This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http/jakarta
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 53902046cdc1a1452444e5206797b29aaaa93a43
Author: Carsten Ziegeler <czieg...@adobe.com>
AuthorDate: Sun Jan 2 15:32:15 2022 +0100
Remove unused instructions
---
http/jetty/pom.xml | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index d80fa50..bf4b721 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -160,7 +160,6 @@
org.osgi.service.http.whiteboard,
!org.eclipse.jetty,
!org.eclipse.jetty.version,
- !org.eclipse.jetty.websocket.core.server.internal,
org.eclipse.jetty.*,
org.apache.felix.http.jetty
</Export-Package>
@@ -358,21 +357,6 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
-<<<<<<< HEAD
-=======
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
--->
- <dependency>
->>>>>>> 8dc97db602 (Update jetty to Jetty 11, jakarta servlet api)
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<version>${jetty.version}</version>
