Skip to content

Commit

Permalink
Add org.apache.felix:org.apache.felix.http.servlet-api:1.2.0
Browse files Browse the repository at this point in the history
from Maven-Central and remove jakarta.servlet-api and jetty-servlet-api
in favor of that.

Prerequisite of eclipse-equinox/equinox#403
and therefore part of
eclipse-equinox/equinox#18
  • Loading branch information
HannesWell committed Nov 27, 2023
1 parent ac29a0e commit 664276b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
;${dependency.dir}/javax.el-api_*.jar
;${dependency.dir}/jakarta.inject-api_*.jar
;${dependency.dir}/javax.servlet.jsp-api_*.jar
;${dependency.dir}/jakarta.servlet-api_*.jar
;${dependency.dir}/org.apache.felix.http.servlet-api_*.jar
;${dependency.dir}/org.apache.ant_*/lib/ant.jar
;${dependency.dir}/org.apache.batik.css_*.jar
;${dependency.dir}/org.apache.commons.jxpath_*.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>jakarta.servlet-api</id>
<id>org.apache.felix.http.servlet-api</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
Expand Down
14 changes: 4 additions & 10 deletions eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
Original file line number Diff line number Diff line change
Expand Up @@ -216,23 +216,17 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
<type>jar</type>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
<version>1.2.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>2.3.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>4.0.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
Expand Down

0 comments on commit 664276b

Please sign in to comment.