Skip to content

Commit e93b4e4

Browse files
committed
FELIX-6825 : Allow bridge to be used with Servlet API 6
1 parent 29d119d commit e93b4e4

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

http/bridge/pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@
7575
org.apache.felix.http.bridge.internal.*
7676
</Private-Package>
7777
<Import-Package>
78-
jakarta.servlet,
79-
jakarta.servlet.http,
8078
org.osgi.service.useradmin;resolution:=optional;version="[1.1,2)",
8179
sun.misc;resolution:=optional,
8280
sun.nio.ch;resolution:=optional,
@@ -105,14 +103,12 @@
105103
<goal>bundle</goal>
106104
</goals>
107105
</execution>
108-
<!--
109106
<execution>
110107
<id>baseline</id>
111108
<goals>
112109
<goal>baseline</goal>
113110
</goals>
114111
</execution>
115-
-->
116112
<execution>
117113
<id>light-bundle</id>
118114
<goals>
@@ -141,7 +137,7 @@
141137
<dependency>
142138
<groupId>jakarta.servlet</groupId>
143139
<artifactId>jakarta.servlet-api</artifactId>
144-
<version>6.1.0</version>
140+
<version>6.0.0</version>
145141
</dependency>
146142
<dependency>
147143
<groupId>org.osgi</groupId>
@@ -170,16 +166,17 @@
170166
<groupId>commons-fileupload</groupId>
171167
<artifactId>commons-fileupload</artifactId>
172168
<version>1.6.0</version>
169+
<scope>provided</scope>
173170
</dependency>
174171
<dependency>
175172
<groupId>org.apache.felix</groupId>
176173
<artifactId>org.apache.felix.http.base</artifactId>
177-
<version>5.1.14</version>
174+
<version>5.1.16</version>
178175
</dependency>
179176
<dependency>
180177
<groupId>org.apache.felix</groupId>
181178
<artifactId>org.apache.felix.http.wrappers</artifactId>
182179
<version>6.1.0</version>
183-
</dependency>
180+
</dependency>
184181
</dependencies>
185182
</project>

0 commit comments

Comments
 (0)