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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
Description: Use versionless dependencies in the .mod files
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
+++ b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
@@ -16,8 +16,8 @@
[lib]
lib/jetty-ee8-annotations-${jetty.version}.jar
-lib/ee8-annotations/asm-${ee8.asm.version}.jar
-lib/ee8-annotations/asm-analysis-${ee8.asm.version}.jar
-lib/ee8-annotations/asm-commons-${ee8.asm.version}.jar
-lib/ee8-annotations/asm-tree-${ee8.asm.version}.jar
-lib/ee8-annotations/jakarta.annotation-api-${ee8.jakarta.annotation.api.version}.jar
+lib/ee8-annotations/asm.jar
+lib/ee8-annotations/asm-analysis.jar
+lib/ee8-annotations/asm-commons.jar
+lib/ee8-annotations/asm-tree.jar
+lib/ee8-annotations/javax.annotation-api.jar
--- a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
+++ b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
@@ -15,8 +15,8 @@
[lib]
lib/jetty-ee9-annotations-${jetty.version}.jar
-lib/ee9-annotations/asm-${ee9.asm.version}.jar
-lib/ee9-annotations/asm-analysis-${ee9.asm.version}.jar
-lib/ee9-annotations/asm-commons-${ee9.asm.version}.jar
-lib/ee9-annotations/asm-tree-${ee9.asm.version}.jar
-lib/ee9-annotations/jakarta.annotation-api-${ee9.jakarta.annotation.api.version}.jar
+lib/ee9-annotations/asm.jar
+lib/ee9-annotations/asm-analysis.jar
+lib/ee9-annotations/asm-commons.jar
+lib/ee9-annotations/asm-tree.jar
+lib/ee9-annotations/jakarta.annotation-api.jar
--- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
+++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
@@ -15,8 +15,8 @@
[lib]
lib/jetty-ee10-annotations-${jetty.version}.jar
-lib/ee10-annotations/asm-${ee10.asm.version}.jar
-lib/ee10-annotations/asm-analysis-${ee10.asm.version}.jar
-lib/ee10-annotations/asm-commons-${ee10.asm.version}.jar
-lib/ee10-annotations/asm-tree-${ee10.asm.version}.jar
-lib/ee10-annotations/jakarta.annotation-api-${ee10.jakarta.annotation.api.version}.jar
+lib/ee10-annotations/asm.jar
+lib/ee10-annotations/asm-analysis.jar
+lib/ee10-annotations/asm-commons.jar
+lib/ee10-annotations/asm-tree.jar
+lib/ee10-annotations/jakarta.annotation-api.jar
--- a/jetty-ee8/jetty-ee8-plus/src/main/config/modules/ee8-plus.mod
+++ b/jetty-ee8/jetty-ee8-plus/src/main/config/modules/ee8-plus.mod
@@ -13,4 +13,4 @@
[lib]
lib/jetty-ee8-plus-${jetty.version}.jar
-lib/jakarta.transaction-api-@jakarta.transaction-api.version@.jar
+lib/javax.transaction-api.jar
--- a/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
+++ b/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
@@ -13,8 +13,8 @@
[lib]
lib/jetty-ee9-plus-${jetty.version}.jar
-lib/jakarta.transaction-api-@jakarta.transaction-api.version@.jar
-lib/jakarta.interceptor-api-@jakarta.interceptor.api.version@.jar
-lib/jakarta.enterprise.cdi-api-@jakarta.enterprise.cdi.api.version@.jar
-lib/jakarta.inject-api-@jakarta.inject.api.version@.jar
-lib/jakarta.enterprise.lang-model-@jakarta.enterprise.lang.model.version@.jar
+lib/jakarta.transaction-api.jar
+lib/jakarta.interceptor-api.jar
+lib/jakarta.enterprise.cdi-api.jar
+lib/jakarta.inject-api.jar
+lib/jakarta.enterprise.lang-model.jar
--- a/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
+++ b/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
@@ -13,8 +13,8 @@
[lib]
lib/jetty-ee10-plus-${jetty.version}.jar
-lib/jakarta.transaction-api-@jakarta.transaction-api.version@.jar
-lib/jakarta.interceptor-api-@jakarta.interceptor.api.version@.jar
-lib/jakarta.enterprise.cdi-api-@jakarta.enterprise.cdi.api.version@.jar
-lib/jakarta.inject-api-@jakarta.inject.api.version@.jar
-lib/jakarta.enterprise.lang-model-@jakarta.enterprise.lang.model.version@.jar
+lib/jakarta.transaction-api.jar
+lib/jakarta.interceptor-api.jar
+lib/jakarta.enterprise.cdi-api.jar
+lib/jakarta.inject-api.jar
+lib/jakarta.enterprise.lang-model.jar
--- a/jetty-home/src/main/resources/modules/logging/slf4j.mod
+++ b/jetty-home/src/main/resources/modules/logging/slf4j.mod
@@ -12,7 +12,7 @@
slf4j
[lib]
-lib/logging/slf4j-api-${slf4j.version}.jar
+lib/logging/slf4j-api.jar
[ini]
slf4j.version?=@slf4j.version@
--- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
+++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
@@ -15,7 +15,7 @@
[lib]
lib/jetty-ee9-jaspi-${jetty.version}.jar
-lib/ee9-jaspi/jakarta.authentication-api-${ee9.jakarta.authentication.api.version}.jar
+lib/ee9-jaspi/jakarta.authentication-api.jar
[xml]
etc/jaspi/jetty-ee9-jaspi-authmoduleconfig.xml
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
@@ -18,7 +18,7 @@
[lib]
lib/jetty-ee10-jaspi-${jetty.version}.jar
-lib/ee10-jaspi/jakarta.authentication-api-${ee10.jakarta.authentication.api.version}.jar
+lib/ee10-jaspi/jakarta.authentication-api.jar
[xml]
etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml
--- a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
+++ b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
@@ -11,6 +11,6 @@
sessions
[lib]
-lib/jetty-servlet-api-@jetty.servlet.api.version@.jar
+lib/javax.servlet-api.jar
lib/jetty-ee8-nested-${jetty.version}.jar
lib/jetty-ee8-servlet-${jetty.version}.jar
--- a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
+++ b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
@@ -12,6 +12,6 @@
# FIXME should servlet api version be interpolated
[lib]
-lib/jetty-jakarta-servlet-api-@jetty.servlet.api.version@.jar
+lib/jakarta.servlet-api.jar
lib/jetty-ee9-nested-${jetty.version}.jar
lib/jetty-ee9-servlet-${jetty.version}.jar
--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
@@ -11,5 +11,5 @@
sessions
[lib]
-lib/jakarta.servlet-api-@jakarta.servlet.api.version@.jar
+lib/jakarta.servlet-api.jar
lib/jetty-ee10-servlet-${jetty.version}.jar
--- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
+++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
@@ -14,7 +14,7 @@
[lib]
lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar
-lib/ee8-websocket/jetty-javax-websocket-api-@jakarta.websocket.api.version@.jar
+lib/ee8-websocket/jetty-javax-websocket-api.jar
lib/ee8-websocket/jetty-ee8-websocket-javax-client-${jetty.version}.jar
lib/ee8-websocket/jetty-ee8-websocket-javax-common-${jetty.version}.jar
lib/ee8-websocket/jetty-ee8-websocket-javax-server-${jetty.version}.jar
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
@@ -14,7 +14,7 @@
[lib]
lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar
-lib/ee9-websocket/jetty-jakarta-websocket-api-@jakarta.websocket.api.version@.jar
+lib/ee9-websocket/jetty-jakarta-websocket-api.jar
lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar
lib/ee9-websocket/jetty-ee9-websocket-jakarta-common-${jetty.version}.jar
lib/ee9-websocket/jetty-ee9-websocket-jakarta-server-${jetty.version}.jar
--- a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
+++ b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
@@ -15,7 +15,11 @@
ee8.jsp.impl.version?=@jsp.impl.version@
[lib]
-lib/ee8-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
-lib/ee8-apache-jsp/org.mortbay.jasper.apache-el-${ee8.jsp.impl.version}.jar
-lib/ee8-apache-jsp/org.mortbay.jasper.apache-jsp-${ee8.jsp.impl.version}.jar
+lib/ee8-apache-jsp/org.eclipse.jdt.ecj.jar
+lib/ee8-apache-jsp/org.mortbay.jasper.apache-el.jar
+lib/ee8-apache-jsp/org.mortbay.jasper.apache-jsp.jar
lib/jetty-ee8-apache-jsp-${jetty.version}.jar
+/usr/share/java/tomcat9-api.jar
+/usr/share/java/tomcat9-juli.jar
+/usr/share/java/tomcat9-util.jar
+/usr/share/java/tomcat9-util-scan.jar
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
@@ -14,8 +14,8 @@
[lib]
lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
-lib/ee10-websocket/jakarta.websocket-client-api-@jakarta.websocket.api.version@.jar
-lib/ee10-websocket/jakarta.websocket-api-@jakarta.websocket.api.version@.jar
+lib/ee10-websocket/jakarta.websocket-client-api.jar
+lib/ee10-websocket/jakarta.websocket-api.jar
lib/ee10-websocket/jetty-ee10-websocket-jakarta-client-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jakarta-common-${jetty.version}.jar
lib/ee10-websocket/jetty-ee10-websocket-jakarta-server-${jetty.version}.jar
--- a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
+++ b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
@@ -15,7 +15,11 @@
ee9.jsp.impl.version?=@jsp.impl.version@
[lib]
-lib/ee9-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
-lib/ee9-apache-jsp/org.mortbay.jasper.apache-el-${ee9.jsp.impl.version}.jar
-lib/ee9-apache-jsp/org.mortbay.jasper.apache-jsp-${ee9.jsp.impl.version}.jar
+lib/ee9-apache-jsp/org.eclipse.jdt.ecj.jar
+lib/ee9-apache-jsp/org.mortbay.jasper.apache-el.jar
+lib/ee9-apache-jsp/org.mortbay.jasper.apache-jsp.jar
lib/jetty-ee9-apache-jsp-${jetty.version}.jar
+/usr/share/java/tomcat10-api.jar
+/usr/share/java/tomcat10-juli.jar
+/usr/share/java/tomcat10-util.jar
+/usr/share/java/tomcat10-util-scan.jar
--- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
+++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
@@ -17,10 +17,14 @@
ee10.jsp.impl.version?=@jsp.impl.version@
[lib]
-lib/ee10-apache-jsp/jakarta.el.jakarta.el-api-${ee10.jakarta.el.api.version}.jar
-lib/ee10-apache-jsp/jakarta.servlet.jsp.jakarta.servlet.jsp-api-${ee10.jakarta.servlet.jsp.api.version}.jar
-lib/ee10-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
-lib/ee10-apache-jsp/org.mortbay.jasper.apache-el-${ee10.jsp.impl.version}.jar
-lib/ee10-apache-jsp/org.mortbay.jasper.apache-jsp-${ee10.jsp.impl.version}.jar
+lib/ee10-apache-jsp/jakarta.el-api.jar
+lib/ee10-apache-jsp/jakarta.servlet.jsp-api.jar
+lib/ee10-apache-jsp/org.eclipse.jdt.ecj.jar
+lib/ee10-apache-jsp/org.mortbay.jasper.apache-el.jar
+lib/ee10-apache-jsp/org.mortbay.jasper.apache-jsp.jar
lib/jetty-ee10-apache-jsp-${jetty.version}.jar
+/usr/share/java/tomcat10-api.jar
+/usr/share/java/tomcat10-juli.jar
+/usr/share/java/tomcat10-util.jar
+/usr/share/java/tomcat10-util-scan.jar
--- a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
+++ b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
@@ -11,5 +11,5 @@
ee8.javax.servlet.jsp.jstl.impl.version?=@javax.servlet.jsp.jstl.impl.version@
[lib]
-lib/ee8-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee8.jakarta.servlet.jsp.jstl.api.version}.jar
-lib/ee8-glassfish-jstl/org.glassfish.web.javax.servlet.jsp.jstl-${ee8.javax.servlet.jsp.jstl.impl.version}.jar
+lib/ee8-glassfish-jstl/javax.servlet.jsp.jstl-api.jar
+lib/ee8-glassfish-jstl/javax.servlet.jsp.jstl-impl.jar
--- a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
+++ b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
@@ -11,5 +11,5 @@
ee9.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.version@
[lib]
-lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee9.jakarta.servlet.jsp.jstl.api.version}.jar
-lib/ee9-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee9.jakarta.servlet.jsp.jstl.impl.version}.jar
+lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl-api.jar
+lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl-impl.jar
--- a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
+++ b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
@@ -14,5 +14,5 @@
ee10.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.version@
[lib]
-lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee10.jakarta.servlet.jsp.jstl.api.version}.jar
-lib/ee10-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee10.jakarta.servlet.jsp.jstl.impl.version}.jar
+lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl-api.jar
+lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl-impl.jar
|
