(felix-dev) branch jakarta-servlet-6 updated: Use http.base from main branch

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch jakarta-servlet-6
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/jakarta-servlet-6 by this push:
     new b352f46407 Use http.base from main branch
b352f46407 is described below

commit b352f464072aa3436ee25b2fa0a38d6c7aa7c10f
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Nov 27 10:02:00 2023 +0100

    Use http.base from main branch
---
 http/jetty/pom.xml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 69b2e737f7..18a21564f3 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -359,24 +359,14 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.servlet</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>2.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.base</artifactId>
-            <version>6.0.0-SNAPSHOT</version>
+            <version>5.1.3-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-fileupload2-core</artifactId>
-            <version>2.0.0-M3-SNAPSHOT</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
-            <version>2.0.0-M3-SNAPSHOT</version>
-        </dependency>        
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>