Skip to content

Commit fe1e250

Browse files
author
Yorgos Saslis
committed
Revert "removed any unnecesary tomcat dependencies"
This reverts commit a4df2e0
1 parent 8c51003 commit fe1e250

File tree

12 files changed

+284
-72
lines changed

12 files changed

+284
-72
lines changed

‎restcomm/pom.xml‎

Lines changed: 151 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,114 @@
204204
<artifactId>restcomm-connect.mrb</artifactId>
205205
<version>${project.version}</version>
206206
</dependency>
207+
<dependency>
208+
<groupId>org.restcomm</groupId>
209+
<artifactId>restcomm-connect.application</artifactId>
210+
<version>${project.version}</version>
211+
<type>war</type>
212+
</dependency>
213+
<dependency>
214+
<groupId>org.restcomm</groupId>
215+
<artifactId>restcomm-connect.extension.api</artifactId>
216+
<version>${project.version}</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>org.restcomm</groupId>
220+
<artifactId>restcomm-connect.extension.controller</artifactId>
221+
<version>${project.version}</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>org.restcomm</groupId>
225+
<artifactId>restcomm-connect.monitoring.service</artifactId>
226+
<version>${project.version}</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>org.restcomm</groupId>
230+
<artifactId>restcomm-connect.dao</artifactId>
231+
<version>${project.version}</version>
232+
</dependency>
233+
<dependency>
234+
<groupId>org.restcomm</groupId>
235+
<artifactId>restcomm-connect.telephony</artifactId>
236+
<version>${project.version}</version>
237+
</dependency>
238+
<dependency>
239+
<groupId>org.restcomm</groupId>
240+
<artifactId>restcomm-connect.telephony.api</artifactId>
241+
<version>${project.version}</version>
242+
</dependency>
243+
244+
<dependency>
245+
<groupId>org.restcomm</groupId>
246+
<artifactId>restcomm-connect.http</artifactId>
247+
<version>${project.version}</version>
248+
</dependency>
249+
<dependency>
250+
<groupId>org.restcomm</groupId>
251+
<artifactId>restcomm-connect.extension.api</artifactId>
252+
<version>${project.version}</version>
253+
</dependency>
254+
255+
<dependency>
256+
<groupId>org.restcomm</groupId>
257+
<artifactId>restcomm-connect.testsuite</artifactId>
258+
<version>${project.version}</version>
259+
</dependency>
260+
261+
<dependency>
262+
<groupId>org.restcomm</groupId>
263+
<artifactId>restcomm-connect.commons</artifactId>
264+
<version>${project.version}</version>
265+
</dependency>
266+
<dependency>
267+
<groupId>org.restcomm</groupId>
268+
<artifactId>restcomm-connect.email.api</artifactId>
269+
<version>${project.version}</version>
270+
</dependency>
271+
272+
<dependency>
273+
<groupId>org.restcomm</groupId>
274+
<artifactId>restcomm-connect.sms</artifactId>
275+
<version>${project.version}</version>
276+
</dependency>
277+
<dependency>
278+
<groupId>org.restcomm</groupId>
279+
<artifactId>restcomm-connect.mgcp</artifactId>
280+
<version>${project.version}</version>
281+
</dependency>
282+
283+
<dependency>
284+
<groupId>org.restcomm</groupId>
285+
<artifactId>restcomm-connect.mscontrol.api</artifactId>
286+
<version>${project.version}</version>
287+
</dependency>
288+
289+
<dependency>
290+
<groupId>org.restcomm</groupId>
291+
<artifactId>restcomm-connect.mscontrol.mms</artifactId>
292+
<version>${project.version}</version>
293+
</dependency>
294+
<dependency>
295+
<groupId>org.restcomm</groupId>
296+
<artifactId>restcomm-connect.dns.api</artifactId>
297+
<version>${project.version}</version>
298+
</dependency>
299+
<dependency>
300+
<groupId>org.restcomm</groupId>
301+
<artifactId>restcomm-connect-management</artifactId>
302+
<version>${project.version}</version>
303+
<type>war</type>
304+
</dependency>
305+
<!-- END OF INTERNAL MODULES -->
306+
307+
308+
<!-- SMPP Testing -->
309+
310+
<dependency>
311+
<groupId>org.restcomm</groupId>
312+
<artifactId>restcomm-connect.sms.api</artifactId>
313+
<version>${project.version}</version>
314+
</dependency>
207315

208316
<dependency>
209317
<groupId>com.cloudhopper</groupId>
@@ -325,12 +433,6 @@
325433
<version>${sipservletapi.version}</version>
326434
<scope>provided</scope>
327435
</dependency>
328-
<dependency>
329-
<groupId>org.mobicents.servlet.sip</groupId>
330-
<artifactId>sip-servlets-client</artifactId>
331-
<version>${sipservletapi.version}</version>
332-
<scope>provided</scope>
333-
</dependency>
334436

335437
<!--dependency> <groupId>org.apache.tomcat</groupId> <artifactId>servlet-api</artifactId>
336438
<version>${servlet-api.version}</version> </dependency -->
@@ -449,6 +551,19 @@
449551
<scope>test</scope>
450552
</dependency>
451553

554+
<dependency>
555+
<groupId>org.apache.tomcat</groupId>
556+
<artifactId>tomcat-coyote</artifactId>
557+
<version>${tomcat7.version}</version>
558+
<scope>provided</scope>
559+
</dependency>
560+
561+
<dependency>
562+
<groupId>org.apache.tomcat</groupId>
563+
<artifactId>tomcat-jasper</artifactId>
564+
<version>${tomcat7.version}</version>
565+
<scope>provided</scope>
566+
</dependency>
452567

453568
<dependency>
454569
<groupId>javax.sip</groupId>
@@ -457,6 +572,19 @@
457572
<scope>test</scope>
458573
</dependency>
459574

575+
<dependency>
576+
<groupId>org.mobicents.servlet.sip.containers</groupId>
577+
<artifactId>sip-servlets-catalina-7</artifactId>
578+
<version>${sipservletapi.version}</version>
579+
<scope>provided</scope>
580+
</dependency>
581+
582+
<dependency>
583+
<groupId>org.mobicents.servlet.sip</groupId>
584+
<artifactId>sip-servlets-core-api</artifactId>
585+
<version>${sipservletapi.version}</version>
586+
</dependency>
587+
460588
<dependency>
461589
<groupId>org.mobicents.servlet.sip</groupId>
462590
<artifactId>sip-servlets-application-router</artifactId>
@@ -630,25 +758,34 @@
630758
</dependency>
631759

632760
<dependency>
633-
<groupId>javax.sip</groupId>
634-
<artifactId>jain-sip-ri</artifactId>
761+
<groupId>org.apache.tomcat</groupId>
762+
<artifactId>tomcat-coyote</artifactId>
635763
<scope>test</scope>
636764
</dependency>
637765

766+
<dependency>
767+
<groupId>org.apache.tomcat</groupId>
768+
<artifactId>tomcat-jasper</artifactId>
769+
<scope>test</scope>
770+
</dependency>
638771

639772
<dependency>
640-
<groupId>org.mobicents.servlet.sip</groupId>
641-
<artifactId>sip-servlets-application-router</artifactId>
773+
<groupId>javax.sip</groupId>
774+
<artifactId>jain-sip-ri</artifactId>
642775
<scope>test</scope>
643776
</dependency>
644777

645778
<dependency>
646-
<groupId>javax.servlet</groupId>
647-
<artifactId>javax.servlet-api</artifactId>
648-
<version>3.1.0</version>
649-
<scope>provided</scope>
779+
<groupId>org.mobicents.servlet.sip.containers</groupId>
780+
<artifactId>sip-servlets-catalina-7</artifactId>
781+
<scope>test</scope>
650782
</dependency>
651783

784+
<dependency>
785+
<groupId>org.mobicents.servlet.sip</groupId>
786+
<artifactId>sip-servlets-application-router</artifactId>
787+
<scope>test</scope>
788+
</dependency>
652789

653790
<dependency>
654791
<groupId>org.hsqldb</groupId>

‎restcomm/restcomm.application/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@
6767
<artifactId>sip-servlets-spec</artifactId>
6868
<scope>provided</scope>
6969
</dependency>
70-
70+
71+
<dependency>
72+
<groupId>org.mobicents.servlet.sip.containers</groupId>
73+
<artifactId>sip-servlets-catalina-7</artifactId>
74+
<scope>provided</scope>
75+
</dependency>
7176

7277
<dependency>
7378
<groupId>javax.servlet</groupId>

‎restcomm/restcomm.dao/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,17 @@
6868
<scope>provided</scope>
6969
</dependency>
7070

71-
71+
<dependency>
72+
<groupId>org.apache.tomcat</groupId>
73+
<artifactId>tomcat-coyote</artifactId>
74+
<scope>provided</scope>
75+
</dependency>
76+
77+
<dependency>
78+
<groupId>org.mobicents.servlet.sip.containers</groupId>
79+
<artifactId>sip-servlets-catalina-7</artifactId>
80+
<scope>provided</scope>
81+
</dependency>
7282

7383
<dependency>
7484
<groupId>com.googlecode.libphonenumber</groupId>

‎restcomm/restcomm.dns.api/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
<version>${project.version}</version>
2020
</dependency>
2121

22-
22+
<dependency>
23+
<groupId>org.apache.tomcat</groupId>
24+
<artifactId>tomcat-coyote</artifactId>
25+
<scope>provided</scope>
26+
</dependency>
27+
2328
</dependencies>
2429
</project>

‎restcomm/restcomm.extension.api/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@
3939
</dependency>
4040

4141

42-
42+
<dependency>
43+
<groupId>org.apache.tomcat</groupId>
44+
<artifactId>tomcat-coyote</artifactId>
45+
<scope>provided</scope>
46+
</dependency>
47+
48+
<dependency>
49+
<groupId>org.mobicents.servlet.sip.containers</groupId>
50+
<artifactId>sip-servlets-catalina-7</artifactId>
51+
<scope>provided</scope>
52+
</dependency>
4353
</dependencies>
4454
</project>

‎restcomm/restcomm.extension.controller/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@
4747
<scope>provided</scope>
4848
</dependency>
4949

50-
50+
<dependency>
51+
<groupId>org.apache.tomcat</groupId>
52+
<artifactId>tomcat-coyote</artifactId>
53+
<scope>provided</scope>
54+
</dependency>
55+
5156
<dependency>
5257
<groupId>org.restcomm</groupId>
5358
<artifactId>restcomm-connect.dao</artifactId>

‎restcomm/restcomm.http/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,34 @@
182182
<scope>test</scope>
183183
</dependency>
184184

185+
<dependency>
186+
<groupId>org.mobicents.servlet.sip.containers</groupId>
187+
<artifactId>sip-servlets-catalina-7</artifactId>
188+
<version>${sipservletapi.version}</version>
189+
<scope>test</scope>
190+
</dependency>
191+
185192
<dependency>
186193
<groupId>org.mobicents.servlet.sip</groupId>
187194
<artifactId>sip-servlets-application-router</artifactId>
188195
<version>${sipservletapi.version}</version>
189196
<scope>test</scope>
190197
</dependency>
191198

199+
<dependency>
200+
<groupId>org.apache.tomcat</groupId>
201+
<artifactId>tomcat-coyote</artifactId>
202+
<version>${tomcat7.version}</version>
203+
<scope>test</scope>
204+
</dependency>
205+
206+
<dependency>
207+
<groupId>org.apache.tomcat</groupId>
208+
<artifactId>tomcat-jasper</artifactId>
209+
<version>${tomcat7.version}</version>
210+
<scope>test</scope>
211+
</dependency>
212+
192213
<dependency>
193214
<groupId>junit</groupId>
194215
<artifactId>junit</artifactId>

‎restcomm/restcomm.monitoring.service/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@
7474
<scope>provided</scope>
7575
</dependency>
7676

77-
77+
<dependency>
78+
<groupId>org.apache.tomcat</groupId>
79+
<artifactId>tomcat-coyote</artifactId>
80+
<scope>provided</scope>
81+
</dependency>
82+
7883
<dependency>
7984
<groupId>javax.sip</groupId>
8085
<artifactId>jain-sip-api</artifactId>

‎restcomm/restcomm.provisioning.number.api/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
<artifactId>restcomm-connect.commons</artifactId>
1515
<version>${project.version}</version>
1616
</dependency>
17-
18-
<dependency>
19-
<groupId>javax.servlet</groupId>
20-
<artifactId>javax.servlet-api</artifactId>
21-
<scope>provided</scope>
22-
</dependency>
17+
18+
<dependency>
19+
<groupId>org.apache.tomcat</groupId>
20+
<artifactId>tomcat-coyote</artifactId>
21+
<scope>provided</scope>
22+
</dependency>
23+
2324
</dependencies>
2425
<build>
2526
<plugins>

‎restcomm/restcomm.telephony.api/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<scope>provided</scope>
2424
</dependency>
2525

26-
26+
2727
<dependency>
28-
<groupId>org.mobicents.servlet.sip</groupId>
29-
<artifactId>sip-servlets-client</artifactId>
28+
<groupId>org.mobicents.servlet.sip.containers</groupId>
29+
<artifactId>sip-servlets-catalina-7</artifactId>
3030
<scope>provided</scope>
3131
</dependency>
3232

0 commit comments

Comments
 (0)