Skip to content

Commit ce9b48b

Browse files
leftybleftyb
leftyb
authored and
leftyb
committed
Merge branch 'master' of https://github.com/RestComm/Restcomm-Connect into issue_2741
2 parents c569a24 + 6cddd87 commit ce9b48b

64 files changed

Lines changed: 449 additions & 130 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎release/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<property name="restcomm-media.distro.zip.path" value="${checkout.dir}/${restcomm-media.download.distro.file}"/>
3434

3535
<!-- <property name="restcomm-olympus.download.url" value="https://mobicents.ci.cloudbees.com/job/Olympus/${olympus.build}/artifact/target/olympus.war"/> -->
36-
<property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/xd8enx5wjxy3ofy8movo2gske7ofx6bp.war"/>
36+
<property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/0rf2w3q7r0g2b4p4rtptc24wauxegfsf.war"/>
3737
<property name="restcomm-olympus.path" value="${configuration.directory}/olympus.war"/>
3838

3939
<!-- Determine RVD retrieval URL

‎restcomm/pom.xml‎

Lines changed: 192 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>org.restcomm</groupId>
1212
<artifactId>restcomm-connect</artifactId>
13-
<version>8.3.1-SNAPSHOT</version>
13+
<version>8.3.2-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515
<name>RestComm-Connect</name>
1616
<description>A unified communications platform for web developers.</description>
@@ -186,6 +186,129 @@
186186

187187
<dependencyManagement>
188188
<dependencies>
189+
<!-- INTERNAL MODULES -->
190+
<dependency>
191+
<groupId>org.restcomm</groupId>
192+
<artifactId>restcomm-connect.sdr.api</artifactId>
193+
<version>${project.version}</version>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.restcomm</groupId>
197+
<artifactId>restcomm-connect.core</artifactId>
198+
<version>${project.version}</version>
199+
</dependency>
200+
<dependency>
201+
<groupId>org.restcomm</groupId>
202+
<artifactId>restcomm-connect.mrb.api</artifactId>
203+
<version>${project.version}</version>
204+
</dependency>
205+
206+
<dependency>
207+
<groupId>org.restcomm</groupId>
208+
<artifactId>restcomm-connect.mrb</artifactId>
209+
<version>${project.version}</version>
210+
</dependency>
211+
<dependency>
212+
<groupId>org.restcomm</groupId>
213+
<artifactId>restcomm-connect.application</artifactId>
214+
<version>${project.version}</version>
215+
<type>war</type>
216+
</dependency>
217+
<dependency>
218+
<groupId>org.restcomm</groupId>
219+
<artifactId>restcomm-connect.extension.api</artifactId>
220+
<version>${project.version}</version>
221+
</dependency>
222+
<dependency>
223+
<groupId>org.restcomm</groupId>
224+
<artifactId>restcomm-connect.extension.controller</artifactId>
225+
<version>${project.version}</version>
226+
</dependency>
227+
<dependency>
228+
<groupId>org.restcomm</groupId>
229+
<artifactId>restcomm-connect.monitoring.service</artifactId>
230+
<version>${project.version}</version>
231+
</dependency>
232+
<dependency>
233+
<groupId>org.restcomm</groupId>
234+
<artifactId>restcomm-connect.dao</artifactId>
235+
<version>${project.version}</version>
236+
</dependency>
237+
<dependency>
238+
<groupId>org.restcomm</groupId>
239+
<artifactId>restcomm-connect.telephony</artifactId>
240+
<version>${project.version}</version>
241+
</dependency>
242+
<dependency>
243+
<groupId>org.restcomm</groupId>
244+
<artifactId>restcomm-connect.telephony.api</artifactId>
245+
<version>${project.version}</version>
246+
</dependency>
247+
248+
<dependency>
249+
<groupId>org.restcomm</groupId>
250+
<artifactId>restcomm-connect.http</artifactId>
251+
<version>${project.version}</version>
252+
</dependency>
253+
<dependency>
254+
<groupId>org.restcomm</groupId>
255+
<artifactId>restcomm-connect.extension.api</artifactId>
256+
<version>${project.version}</version>
257+
</dependency>
258+
259+
<dependency>
260+
<groupId>org.restcomm</groupId>
261+
<artifactId>restcomm-connect.testsuite</artifactId>
262+
<version>${project.version}</version>
263+
</dependency>
264+
265+
<dependency>
266+
<groupId>org.restcomm</groupId>
267+
<artifactId>restcomm-connect.commons</artifactId>
268+
<version>${project.version}</version>
269+
</dependency>
270+
<dependency>
271+
<groupId>org.restcomm</groupId>
272+
<artifactId>restcomm-connect.email.api</artifactId>
273+
<version>${project.version}</version>
274+
</dependency>
275+
276+
<dependency>
277+
<groupId>org.restcomm</groupId>
278+
<artifactId>restcomm-connect.sms</artifactId>
279+
<version>${project.version}</version>
280+
</dependency>
281+
<dependency>
282+
<groupId>org.restcomm</groupId>
283+
<artifactId>restcomm-connect.mgcp</artifactId>
284+
<version>${project.version}</version>
285+
</dependency>
286+
287+
<dependency>
288+
<groupId>org.restcomm</groupId>
289+
<artifactId>restcomm-connect.mscontrol.api</artifactId>
290+
<version>${project.version}</version>
291+
</dependency>
292+
293+
<dependency>
294+
<groupId>org.restcomm</groupId>
295+
<artifactId>restcomm-connect.mscontrol.mms</artifactId>
296+
<version>${project.version}</version>
297+
</dependency>
298+
<dependency>
299+
<groupId>org.restcomm</groupId>
300+
<artifactId>restcomm-connect.dns.api</artifactId>
301+
<version>${project.version}</version>
302+
</dependency>
303+
<dependency>
304+
<groupId>org.restcomm</groupId>
305+
<artifactId>restcomm-connect-management</artifactId>
306+
<version>${project.version}</version>
307+
<type>war</type>
308+
</dependency>
309+
<!-- END OF INTERNAL MODULES -->
310+
311+
189312
<!-- SMPP Testing -->
190313

191314
<dependency>
@@ -459,6 +582,12 @@
459582
<version>${sipservletapi.version}</version>
460583
<scope>provided</scope>
461584
</dependency>
585+
586+
<dependency>
587+
<groupId>org.mobicents.servlet.sip</groupId>
588+
<artifactId>sip-servlets-core-api</artifactId>
589+
<version>${sipservletapi.version}</version>
590+
</dependency>
462591

463592
<dependency>
464593
<groupId>org.mobicents.servlet.sip</groupId>
@@ -489,13 +618,29 @@
489618
</exclusion>
490619
</exclusions>
491620
</dependency>
621+
622+
<dependency>
623+
<groupId>org.apache.tomcat</groupId>
624+
<artifactId>tomcat-catalina</artifactId>
625+
<version>${tomcat7.version}</version>
626+
</dependency>
492627

493628
<dependency>
494629
<groupId>org.jboss.arquillian.junit</groupId>
495630
<artifactId>arquillian-junit-container</artifactId>
496631
<version>${arquillian.version}</version>
497-
<scope>test</scope>
498632
</dependency>
633+
634+
<dependency>
635+
<groupId>org.mobicents.arquillian.container</groupId>
636+
<artifactId>mss-arquillian-mediaserver-api</artifactId>
637+
<version>${mss.arquillian.version}</version>
638+
</dependency>
639+
<dependency>
640+
<groupId>org.mobicents.arquillian.container</groupId>
641+
<artifactId>mss-arquillian-mediaserver-extension</artifactId>
642+
<version>${mss.arquillian.version}</version>
643+
</dependency>
499644

500645
<dependency>
501646
<groupId>org.jboss.shrinkwrap.resolver</groupId>
@@ -510,6 +655,12 @@
510655
<version>${shrinkwrap.resolver.version}</version>
511656
<scope>test</scope>
512657
</dependency>
658+
659+
<dependency>
660+
<groupId>com.cloudhopper</groupId>
661+
<artifactId>ch-commons-util</artifactId>
662+
<version>${ch-commons-util.version}</version>
663+
</dependency>
513664

514665
<dependency>
515666
<groupId>org.mobicents.sipunit</groupId>
@@ -553,6 +704,40 @@
553704
<version>${mockito-core.version}</version>
554705
<scope>test</scope>
555706
</dependency>
707+
708+
<dependency>
709+
<groupId>org.mobicents.servlet.sip.containers</groupId>
710+
<artifactId>sip-servlets-tomcat-7</artifactId>
711+
<version>${sipservletapi.version}</version>
712+
</dependency>
713+
<dependency>
714+
<groupId>org.mobicents.servlet.sip</groupId>
715+
<artifactId>sip-servlets-impl</artifactId>
716+
<version>${sipservletapi.version}</version>
717+
</dependency>
718+
<dependency>
719+
<groupId>org.mobicents.servlet.sip</groupId>
720+
<artifactId>sip-servlets-client</artifactId>
721+
<version>${sipservletapi.version}</version>
722+
</dependency>
723+
<dependency>
724+
<groupId>org.mobicents.commtesting</groupId>
725+
<artifactId>mgcpUnit</artifactId>
726+
<version>${mgcpunit.version}</version>
727+
</dependency>
728+
<dependency>
729+
<groupId>org.mobicents.media</groupId>
730+
<artifactId>concurrent</artifactId>
731+
<version>${mobicents.mgcp.impl.version}</version>
732+
</dependency>
733+
<dependency>
734+
<groupId>com.github.tomakehurst</groupId>
735+
<artifactId>wiremock</artifactId>
736+
<version>1.57</version>
737+
<!-- Include this if you have dependency conflicts for Guava, Jetty, Jackson
738+
or Apache HTTP Client -->
739+
<classifier>standalone</classifier>
740+
</dependency>
556741
</dependencies>
557742
</dependencyManagement>
558743

@@ -676,7 +861,6 @@
676861
<plugin>
677862
<groupId>org.apache.maven.plugins</groupId>
678863
<artifactId>maven-checkstyle-plugin</artifactId>
679-
<version>${checkstyle.plugin.version}</version>
680864
<configuration>
681865
<configLocation>/checkstyle/checkstyle.xml</configLocation>
682866
<consoleOutput>true</consoleOutput>
@@ -805,6 +989,11 @@
805989
<reuseForks>false</reuseForks>
806990
</configuration>
807991
</plugin>
992+
<plugin>
993+
<groupId>org.apache.maven.plugins</groupId>
994+
<artifactId>maven-checkstyle-plugin</artifactId>
995+
<version>${checkstyle.plugin.version}</version>
996+
</plugin>
808997
</plugins>
809998
</pluginManagement>
810999
</build>

‎restcomm/restcomm-connect.core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.restcomm</groupId>
66
<artifactId>restcomm-connect</artifactId>
7-
<version>8.3.1-SNAPSHOT</version>
7+
<version>8.3.2-SNAPSHOT</version>
88
</parent>
99
<artifactId>restcomm-connect.core</artifactId>
1010
<name>restcomm-connect.core</name>

‎restcomm/restcomm.application/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.restcomm</groupId>
66
<artifactId>restcomm-connect</artifactId>
7-
<version>8.3.1-SNAPSHOT</version>
7+
<version>8.3.2-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>restcomm-connect.application</artifactId>

‎restcomm/restcomm.asr/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.restcomm</groupId>
55
<artifactId>restcomm-connect</artifactId>
6-
<version>8.3.1-SNAPSHOT</version>
6+
<version>8.3.2-SNAPSHOT</version>
77
</parent>
88

99
<artifactId>restcomm-connect.asr</artifactId>

‎restcomm/restcomm.commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.restcomm</groupId>
77
<artifactId>restcomm-connect</artifactId>
8-
<version>8.3.1-SNAPSHOT</version>
8+
<version>8.3.2-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>restcomm-connect.commons</artifactId>

‎restcomm/restcomm.dao/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.restcomm</groupId>
88
<artifactId>restcomm-connect</artifactId>
9-
<version>8.3.1-SNAPSHOT</version>
9+
<version>8.3.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>restcomm-connect.dao</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.restcomm</groupId>
55
<artifactId>restcomm-connect</artifactId>
6-
<version>8.3.1-SNAPSHOT</version>
6+
<version>8.3.2-SNAPSHOT</version>
77
</parent>
88
<artifactId>restcomm-connect.dns.api</artifactId>
99

‎restcomm/restcomm.docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.restcomm</groupId>
77
<artifactId>restcomm-connect</artifactId>
8-
<version>8.3.1-SNAPSHOT</version>
8+
<version>8.3.2-SNAPSHOT</version>
99
</parent>
1010

1111
<groupId>org.restcomm</groupId>

‎restcomm/restcomm.docs/sources-asciidoc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.restcomm</groupId>
88
<artifactId>restcomm-connect-docs</artifactId>
9-
<version>8.3.1-SNAPSHOT</version>
9+
<version>8.3.2-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>restcomm-connect-docs-sources</artifactId>

0 commit comments

Comments
 (0)