Skip to content

Commit b6c4376

Browse files
jaimecaserojaimecasero
committed
2 parents 00155a6 + 710f440 commit b6c4376

File tree

80 files changed

+431
-189
lines changed

Some content is hidden

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

80 files changed

+431
-189
lines changed

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
def runTestsuite(exludedGroups = "org.restcomm.connect.commons.annotations.BrokenTests",groups = "", forkCount=1, profile="") {
3-
sh "mvn -f restcomm/restcomm.testsuite/pom.xml install -DskipUTs=false -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true -Dfailsafe.rerunFailingTestsCount=1 -Dgroups=\"$groups\" -DexcludedGroups=\"$exludedGroups\""
2+
def runTestsuite(exludedGroups = "org.restcomm.connect.commons.annotations.BrokenTests",groups = "", forkCount=1, profile="defaultProfile") {
3+
sh "mvn -f restcomm/restcomm.testsuite/pom.xml install -DskipUTs=false -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true -Dfailsafe.rerunFailingTestsCount=1 -P $profile -DforkCount=\"$forkCount\" -Dgroups=\"$groups\" -DexcludedGroups=\"$exludedGroups\""
44
}
55

66

‎restcomm/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<mobicents.mgcp.impl.version>6.0.23</mobicents.mgcp.impl.version>
9797
<javamail.version>1.4</javamail.version>
9898
<servletapi.version>2.5</servletapi.version>
99-
<sipservletapi.version>3.2.0-37</sipservletapi.version>
99+
<sipservletapi.version>3.2.0-97</sipservletapi.version>
100100
<staxapi.version>1.0.1</staxapi.version>
101101
<staximpl.version>1.2.0</staximpl.version>
102102
<servlet-api.version>7.0.50</servlet-api.version>
@@ -118,7 +118,7 @@
118118
<arquillian.version>1.0.3.Final</arquillian.version>
119119
<mss.arquillian.version>1.0.3</mss.arquillian.version>
120120
<mss.shrinkwrap.version>1.0.2</mss.shrinkwrap.version>
121-
<shrinkwrap.resolver.version>2.0.0-alpha-4</shrinkwrap.resolver.version>
121+
<shrinkwrap.resolver.version>2.2.6</shrinkwrap.resolver.version>
122122
<sipunit.version>2.0.4</sipunit.version>
123123
<!--tomcat.version>6.0.35</tomcat.version -->
124124
<tomcat7.version>7.0.64</tomcat7.version>

‎restcomm/restcomm.testsuite/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,20 @@
143143
<version>${shrinkwrap.resolver.version}</version>
144144
<scope>compile</scope>
145145
</dependency>
146+
147+
<dependency>
148+
<groupId>org.jboss.shrinkwrap.resolver</groupId>
149+
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
150+
<version>${shrinkwrap.resolver.version}</version>
151+
<scope>compile</scope>
152+
</dependency>
153+
154+
<dependency>
155+
<groupId>org.jboss.shrinkwrap.resolver</groupId>
156+
<artifactId>shrinkwrap-resolver-api-maven-archive</artifactId>
157+
<version>${shrinkwrap.resolver.version}</version>
158+
<scope>compile</scope>
159+
</dependency>
146160

147161
<dependency>
148162
<groupId>org.jboss.shrinkwrap.resolver</groupId>

‎restcomm/restcomm.testsuite/src/main/java/org/restcomm/connect/testsuite/WebArchiveUtil.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.apache.commons.io.IOUtils;
1313
import org.jboss.shrinkwrap.api.ShrinkWrap;
1414
import org.jboss.shrinkwrap.api.spec.WebArchive;
15-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
15+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
1616
import org.restcomm.connect.commons.Version;
1717

1818
public class WebArchiveUtil {
@@ -49,6 +49,7 @@ public static WebArchive createWebArchiveNoGw(String restcommConf, String dbScri
4949
webInfResources.put(dbScript, "data/hsql/restcomm.script");
5050
webInfResources.put("akka_application.conf", "classes/application.conf");
5151
webInfResources.put("sip.xml", "/sip.xml");
52+
webInfResources.put("web.xml", "web.xml");
5253
return createWebArchiveNoGw(webInfResources, resources, replacements);
5354
}
5455

@@ -59,7 +60,7 @@ public static WebArchive createWebArchiveNoGw(Map<String, String> webInfResource
5960
) {
6061

6162
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
62-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
63+
final WebArchive restcommArchive = Maven.resolver()
6364
.resolve(mavenApp).withoutTransitivity()
6465
.asSingle(WebArchive.class);
6566
archive = archive.merge(restcommArchive);

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/RvdProjectsMigratorDisabled.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.jboss.arquillian.test.api.ArquillianResource;
3434
import org.jboss.shrinkwrap.api.ShrinkWrap;
3535
import org.jboss.shrinkwrap.api.spec.WebArchive;
36-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
36+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
3737
import org.junit.Test;
3838
import org.junit.FixMethodOrder;
3939
import org.junit.runners.MethodSorters;
@@ -116,14 +116,16 @@ public void checkNotifications() {
116116
@Deployment(name = "RvdProjectsMigratorDisabled", managed = true, testable = false)
117117
public static WebArchive createWebArchiveRestcomm() throws Exception {
118118
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
119-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
119+
final WebArchive restcommArchive = Maven.resolver()
120120
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
121121
.asSingle(WebArchive.class);
122122
archive = archive.merge(restcommArchive);
123123
archive.delete("/WEB-INF/sip.xml");
124+
archive.delete("/WEB-INF/web.xml");
124125
archive.delete("/WEB-INF/conf/restcomm.xml");
125126
archive.delete("/WEB-INF/data/hsql/restcomm.script");
126127
archive.addAsWebInfResource("sip.xml");
128+
archive.addAsWebInfResource("web.xml");
127129
archive.addAsWebInfResource("restcomm_workspaceMigrationDisabled.xml", "conf/restcomm.xml");
128130
archive.addAsWebInfResource("restcomm.script_projectMigratorWorkspaceMigratedTest", "data/hsql/restcomm.script");
129131
String source = "src/test/resources/workspace-migration-scenarios/migrated";

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/UssdPullTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ public static WebArchive createWebArchiveNoGw() {
521521
webInfResources.put("org/restcomm/connect/ussd/restcomm.script_ussdPullTest", "data/hsql/restcomm.script");
522522
webInfResources.put("akka_application.conf", "classes/application.conf");
523523
webInfResources.put("sip.xml", "/sip.xml");
524+
webInfResources.put("web.xml", "web.xml");
524525

525526
Map<String, String> replacements = new HashMap();
526527
//replace mediaport 2727

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/extensions/BlockingExtensionTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ public static WebArchive createWebArchiveNoGw() {
398398
webInfResources.put("org/restcomm/connect/testsuite/extensions/restcomm.script", "data/hsql/restcomm.script");
399399
webInfResources.put("akka_application.conf", "classes/application.conf");
400400
webInfResources.put("sip.xml", "/sip.xml");
401+
webInfResources.put("web.xml", "web.xml");
401402
webInfResources.put("org/restcomm/connect/testsuite/extensions/extensions_blocking.xml", "conf/extensions.xml");
402403

403404
return WebArchiveUtil.createWebArchiveNoGw(

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/extensions/OutboundBlockingExtensionTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ public static WebArchive createWebArchiveNoGw() {
317317
webInfResources.put("org/restcomm/connect/testsuite/extensions/restcomm.script", "data/hsql/restcomm.script");
318318
webInfResources.put("akka_application.conf", "classes/application.conf");
319319
webInfResources.put("sip.xml", "/sip.xml");
320+
webInfResources.put("web.xml", "web.xml");
320321
webInfResources.put("org/restcomm/connect/testsuite/extensions/extensions_outbound_blocking.xml", "conf/extensions.xml");
321322

322323
return WebArchiveUtil.createWebArchiveNoGw(

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointClosingTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.jboss.arquillian.test.api.ArquillianResource;
3535
import org.jboss.shrinkwrap.api.ShrinkWrap;
3636
import org.jboss.shrinkwrap.api.spec.WebArchive;
37-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
37+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
3838
import org.junit.Before;
3939
import org.junit.Rule;
4040
import org.junit.Test;
@@ -135,14 +135,16 @@ public static WebArchive createWebArchiveNoGw() {
135135
logger.info("Packaging Test App");
136136
logger.info("version");
137137
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
138-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
138+
final WebArchive restcommArchive = Maven.resolver()
139139
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
140140
.asSingle(WebArchive.class);
141141
archive = archive.merge(restcommArchive);
142142
archive.delete("/WEB-INF/sip.xml");
143+
archive.delete("/WEB-INF/web.xml");
143144
archive.delete("/WEB-INF/conf/restcomm.xml");
144145
archive.delete("/WEB-INF/data/hsql/restcomm.script");
145146
archive.addAsWebInfResource("sip.xml");
147+
archive.addAsWebInfResource("web.xml");
146148
archive.addAsWebInfResource("restcomm-accountRemoval.xml", "conf/restcomm.xml");
147149
archive.addAsWebInfResource("restcomm.script_account_removal_test", "data/hsql/restcomm.script");
148150
logger.info("Packaged Test App");

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.jboss.arquillian.test.api.ArquillianResource;
2323
import org.jboss.shrinkwrap.api.ShrinkWrap;
2424
import org.jboss.shrinkwrap.api.spec.WebArchive;
25-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
25+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
2626
import org.junit.After;
2727
import org.junit.Assert;
2828
import org.junit.BeforeClass;
@@ -774,14 +774,16 @@ public static WebArchive createWebArchiveNoGw() {
774774
logger.info("Packaging Test App");
775775
logger.info("version");
776776
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
777-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
777+
final WebArchive restcommArchive = Maven.resolver()
778778
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
779779
.asSingle(WebArchive.class);
780780
archive = archive.merge(restcommArchive);
781781
archive.delete("/WEB-INF/sip.xml");
782+
archive.delete("/WEB-INF/web.xml");
782783
archive.delete("/WEB-INF/conf/restcomm.xml");
783784
archive.delete("/WEB-INF/data/hsql/restcomm.script");
784785
archive.addAsWebInfResource("sip.xml");
786+
archive.addAsWebInfResource("web.xml");
785787
archive.addAsWebInfResource("restcomm.xml", "conf/restcomm.xml");
786788
archive.addAsWebInfResource("restcomm.script_accounts_test", "data/hsql/restcomm.script");
787789
logger.info("Packaged Test App");

0 commit comments

Comments
 (0)