1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
Description: Replace some Java EE dependencies of the Jetty EE8 modules that can't be replaced by debian/maven.rules
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/jetty-ee8/jetty-ee8-plus/pom.xml
+++ b/jetty-ee8/jetty-ee8-plus/pom.xml
@@ -19,8 +19,9 @@
<dependencies>
<dependency>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.2_spec</artifactId>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
--- a/jetty-ee8/jetty-ee8-annotations/pom.xml
+++ b/jetty-ee8/jetty-ee8-annotations/pom.xml
@@ -18,8 +18,9 @@
<dependencies>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
--- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml
+++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml
@@ -26,14 +26,9 @@
<artifactId>jetty-servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jasper</groupId>
- <artifactId>apache-jsp</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-schemas</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>9.x</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
|
