You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/02/20 10:07:15 UTC
[felix-dev] 02/19: Remove unused instructions
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 e4b5d73614fbe0d95d169a25d6bafc482cf240b3
Author: Carsten Ziegeler <cz...@adobe.com>
AuthorDate: Sun Jan 2 15:32:15 2022 +0100
Remove unused instructions
---
http/itest/pom.xml | 4 ++--
http/jetty/pom.xml | 18 +-----------------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index e2ea0bd..bdc8b33 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -45,8 +45,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <http.servlet.api.version>${http.servlet.api.version}</http.servlet.api.version>
- <http.jetty.version>${http.jetty.version}</http.jetty.version>
+ <http.servlet.api.version>${http.servlet.api.version}</http.servlet.api.version>
+ <http.jetty.version>${http.jetty.version}</http.jetty.version>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 1036575..4821bf6 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -159,9 +159,7 @@
org.osgi.service.http.runtime.dto,
org.osgi.service.http.whiteboard,
!org.eclipse.jetty,
- !org.eclipse.jetty.util.log.jmx,
!org.eclipse.jetty.version,
- !org.eclipse.jetty.websocket.core.server.internal,
org.eclipse.jetty.*,
org.apache.felix.http.jetty
</Export-Package>
@@ -169,9 +167,7 @@
org.apache.felix.http.base.*,
org.apache.felix.http.jetty.*,
org.eclipse.jetty,
- org.eclipse.jetty.security.authentication,
- org.eclipse.jetty.version,
- org.eclipse.jetty.websocket.core.server.internal
+ org.eclipse.jetty.version
</Private-Package>
<Conditional-Package>
org.apache.commons.*
@@ -362,18 +358,6 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <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>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<version>${jetty.version}</version>