some fixes in maven poms

RestComm · Apr 9, 2018 · 423e2a7 · 423e2a7
1 parent c0b63e2
commit 423e2a7
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 65 deletions.
diff --git a/restcomm/pom.xml b/restcomm/pom.xml
@@ -322,6 +322,12 @@
                 <artifactId>shiro-web</artifactId>
                 <version>${shiroweb.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs</artifactId>
+                <version>1.0</version>
+            </dependency>            
 
             <dependency>
                 <groupId>com.sun.jersey</groupId>

diff --git a/restcomm/restcomm.extension.api/pom.xml b/restcomm/restcomm.extension.api/pom.xml
@@ -1,48 +1,49 @@
 <?xml version="1.0"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-		<groupId>org.restcomm</groupId>
-		<artifactId>restcomm-connect</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
-	</parent>
+        <groupId>org.restcomm</groupId>
+        <artifactId>restcomm-connect</artifactId>
+        <version>9.0.0-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.restcomm</groupId>
-	<artifactId>restcomm-connect.extension.api</artifactId>
-	<name>restcomm-connect.extension.api</name>
+    <groupId>org.restcomm</groupId>
+    <artifactId>restcomm-connect.extension.api</artifactId>
+    <name>restcomm-connect.extension.api</name>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
-	<dependencies>
+    <dependencies>
+
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs</artifactId>
+            <scope>provided</scope>
+        </dependency>            
 
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${jodatime.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${jodatime.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.restcomm</groupId>
-			<artifactId>restcomm-connect.commons</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.restcomm</groupId>
+            <artifactId>restcomm-connect.commons</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <scope>provided</scope>
-            </dependency>                
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>                
 
-	</dependencies>
+    </dependencies>
 </project>
diff --git a/restcomm/restcomm.extension.controller/pom.xml b/restcomm/restcomm.extension.controller/pom.xml
@@ -67,6 +67,12 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>  
+
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs</artifactId>
+            <scope>test</scope>
+        </dependency>         
     </dependencies>
 
 </project>
diff --git a/restcomm/restcomm.identity/pom.xml b/restcomm/restcomm.identity/pom.xml
@@ -45,22 +45,6 @@
 			<scope>provided</scope>
 		</dependency>		
 
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-server</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-client</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-servlet</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>

diff --git a/restcomm/restcomm.interpreter/pom.xml b/restcomm/restcomm.interpreter/pom.xml
@@ -144,7 +144,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/restcomm/restcomm.provisioning.number.nexmo/pom.xml b/restcomm/restcomm.provisioning.number.nexmo/pom.xml
@@ -51,7 +51,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/restcomm/restcomm.provisioning.number.vi/pom.xml b/restcomm/restcomm.provisioning.number.vi/pom.xml
@@ -56,7 +56,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/restcomm/restcomm.provisioning.number.voxbone/pom.xml b/restcomm/restcomm.provisioning.number.voxbone/pom.xml
@@ -56,7 +56,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/restcomm/restcomm.sms/pom.xml b/restcomm/restcomm.sms/pom.xml
@@ -47,7 +47,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/restcomm/restcomm.telephony.api/pom.xml b/restcomm/restcomm.telephony.api/pom.xml
@@ -19,7 +19,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/restcomm/restcomm.testsuite/pom.xml b/restcomm/restcomm.testsuite/pom.xml
@@ -93,10 +93,6 @@
             <artifactId>shiro-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -144,7 +140,7 @@
                 <scope>compile</scope>
         </dependency>
 
-        <dependency>
+   <dependency>
                 <groupId>org.jboss.shrinkwrap.resolver</groupId>
                 <artifactId>shrinkwrap-resolver-api-maven</artifactId>
                 <version>${shrinkwrap.resolver.version}</version>
@@ -173,7 +169,7 @@
         </dependency>       
         <dependency>
             <groupId>org.wildfly.arquillian</groupId>
-            <artifactId>wildfly-arquillian-container-embedded</artifactId>
+            <artifactId>wildfly-arquillian-container-managed</artifactId>
             <version>2.1.0.Final</version>
             <scope>test</scope>
         </dependency>           
@@ -451,7 +447,6 @@
                     <systemPropertyVariables>
                       <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                       <jboss.home>${project.basedir}/target/dependency/restcomm-sip-servlets-3.2.0-89-wildfly-10.0.0.Final</jboss.home>
-                      <module.path>${project.basedir}/target/dependency/restcomm-sip-servlets-3.2.0-89-wildfly-10.0.0.Final/modules</module.path>
                       <arquillian.launch>wildfly10</arquillian.launch>
                     </systemPropertyVariables>     
                     <redirectTestOutputToFile>false</redirectTestOutputToFile>               

diff --git a/restcomm/restcomm.ussd/pom.xml b/restcomm/restcomm.ussd/pom.xml
@@ -99,7 +99,6 @@
 		<dependency>
 			<groupId>org.mobicents.servlet.sip</groupId>
 			<artifactId>sip-servlets-spec</artifactId>
-			<version>${sipservletapi.version}</version>
 			<scope>provided</scope>
 		</dependency>