Merge "AT&T 1712 and 1802 release code"

1 files changed, 71 insertions, 73 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 08ff9fedd0..023567d20b 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -17,25 +17,31 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring-version>3.2.9.RELEASE</spring-version>
-        <swagger-version>1.3.0</swagger-version>
-        <jax-rs-version>1.1.1</jax-rs-version>
-        <json4s-jackson-version>3.2.4</json4s-jackson-version>
-        <json4s-core-version>3.0.0</json4s-core-version>
-        <fasterxml-json-version>2.2.2</fasterxml-json-version>
-        <scala-lang-version>2.9.1-1</scala-lang-version>
-        <reflections-version>0.9.9-RC1</reflections-version>
-        <javassist-version>3.16.1-GA</javassist-version>
-        <paranamer-version>2.5.2</paranamer-version>
-        <scannotation-version>1.0.3</scannotation-version>
-        <resteasy-version>3.0.18.Final</resteasy-version>
+		<swagger-version>1.3.0</swagger-version>
+		<jax-rs-version>1.1.1</jax-rs-version>
+		<json4s-jackson-version>3.2.4</json4s-jackson-version>
+		<json4s-core-version>3.0.0</json4s-core-version>
+		<fasterxml-json-version>2.2.2</fasterxml-json-version>
+		<scala-lang-version>2.9.1-1</scala-lang-version>
+		<reflections-version>0.9.9-RC1</reflections-version>
+		<javassist-version>3.16.1-GA</javassist-version>
+		<paranamer-version>2.5.2</paranamer-version>
+		<scannotation-version>1.0.3</scannotation-version>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-    		<artifactId>wiremock</artifactId>
-    		<version>2.6.0</version>
+		    <groupId>org.jboss.resteasy</groupId>
+		    <artifactId>resteasy-jaxrs</artifactId>
+		    <version>3.5.0.Final</version>
+<!--		    <scope>test</scope> -->
 		</dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-client</artifactId>
+                    <version>3.5.0.Final</version>
+<!--		    <scope>test</scope> -->
+                </dependency>
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine</artifactId>
@@ -43,34 +49,6 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxrs</artifactId>
-			<version>3.0.19.Final</version>
-			<scope>provided</scope>
-			<exclusions>
-     			<exclusion>
-        		<groupId>org.slf4j</groupId>
-        		<artifactId>slf4j-api</artifactId>
-     			</exclusion>
-     			<exclusion>
-        		<groupId>org.slf4j</groupId>
-        		<artifactId>slf4j-simple</artifactId>
-     			</exclusion>
-				<exclusion>
-					<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpclient</artifactId>
-				</exclusion>
-   			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-			<version>6.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
 			<groupId>org.jboss.spec.javax.ejb</groupId>
 			<artifactId>jboss-ejb-api_3.2_spec</artifactId>
 			<version>1.0.0.Final</version>
@@ -90,16 +68,10 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jackson-provider</artifactId>
-			<version>${resteasy-version}</version>
-		</dependency>
-		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>jsr311-api</artifactId>
 			<version>${jax-rs-version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.json4s</groupId>
 			<artifactId>json4s-jackson_2.9.1-1</artifactId>
@@ -115,16 +87,18 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>${fasterxml-json-version}</version>
 		</dependency>
+
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${fasterxml-json-version}</version>
+		  <groupId>org.codehaus.jackson</groupId>
+		  <artifactId>jackson-core-asl</artifactId>
+		  <version>1.9.13</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${fasterxml-json-version}</version>
+		  <groupId>org.codehaus.jackson</groupId>
+		  <artifactId>jackson-mapper-asl</artifactId>
+		  <version>1.9.13</version>
 		</dependency>
+
 		<dependency>
 			<groupId>com.thoughtworks.paranamer</groupId>
 			<artifactId>paranamer</artifactId>
@@ -178,6 +152,7 @@
 			<artifactId>swagger-jaxrs_2.9.1</artifactId>
 			<version>${swagger-version}</version>
 		</dependency>
+
 		<!-- Spring 3 dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -192,7 +167,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>${spring-version}</version>
+			<version>4.3.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -223,7 +198,7 @@
  			<groupId>org.onap.so</groupId>
  			<artifactId>mso-catalog-db</artifactId>
  			<version>${project.version}</version>
- 		</dependency>
+		</dependency>
  		<dependency>
 			<groupId>org.onap.so</groupId>
 			<artifactId>mso-requests-db</artifactId>
@@ -240,29 +215,52 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160212</version>
+        </dependency>
+        <dependency>
+    		<groupId>pl.pragmatists</groupId>
+    		<artifactId>JUnitParams</artifactId>
+    		<version>1.0.5</version>
+    		<scope>test</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>1.8</version>
-            <scope>test</scope>
-        </dependency>
+		    <groupId>com.openpojo</groupId>
+		    <artifactId>openpojo</artifactId>
+		    <version>0.8.6</version>
+		    <scope>test</scope>
+		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+			<artifactId>sdc-distribution-client</artifactId>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+                <dependency>
+                        <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+                        <artifactId>sdc-distribution-client</artifactId>
+                        <version>1.2.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>		
 		<dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20160212</version>
-        </dependency>
+	  		<groupId>org.onap.so</groupId>
+  	  		<artifactId>MSORESTClient</artifactId>
+  	  		<version>${project.version}</version>
+		</dependency>		
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-web-api</artifactId>
+			<version>6.0</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
+	
 	<build>
 		<finalName>${project.artifactId}-${project.version}</finalName>
 		<plugins>
@@ -279,4 +277,4 @@
 		</plugins>
 	</build>
 	<packaging>war</packaging>
-</project>
\ No newline at end of file
+</project>