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 b61407cb1aef84e99ac20b5094c6e3549d78a1d8 Author: Carsten Ziegeler <[email protected]> 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 c8fbcea..9bd51d6 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> @@ -359,21 +358,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>
