From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Sun, 10 Dec 2017 18:55:03 +0200
Subject: Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 catalog-be/pom.xml | 61 +++++++-----------------------------------------------
 1 file changed, 7 insertions(+), 54 deletions(-)

(limited to 'catalog-be/pom.xml')

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 5b13e028d8..73194b66d3 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,6 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>catalog-be</artifactId>
@@ -16,10 +15,7 @@
 		<swagger-ui-version>2.1.0-M2</swagger-ui-version>
 	</properties>
 
-
 	<dependencies>
-
-
 		<!--JSON and YAML Parsing-->
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -556,9 +552,13 @@
 
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito.version}</version>
-			<!--<version>1.10.19</version>-->
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -623,53 +623,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-          			<execution>
-            			<id>copy-tosca-folder</id>
-            			<!-- here the phase you need -->
-            			<phase>install</phase>
-            			<goals>
-              				<goal>copy-resources</goal>
-            			</goals>
-            			<configuration>
-              				<outputDirectory>${project.parent.basedir}/asdctool/tosca</outputDirectory>
-              				<resources>          
-                				<resource>
-                  					<directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca</directory>
-                  					<filtering>true</filtering>
-                				</resource>
-              				</resources>              
-            			</configuration>            
-          			</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>clean-static-files</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-						<configuration>
-							<filesets>
-								<!-- tosca files -->
-								<fileset>
-									<directory>${project.parent.basedir}/asdctool/tosca</directory>
-									<followSymlinks>false</followSymlinks>
-								</fileset>
-							</filesets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-- 
cgit 1.2.3-korg