From: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Date: Tue, 13 Mar 2018 12:00:22 +0000 (+0200)
Subject: analyze and fix IQ server violations SDC
X-Git-Tag: v1.2.0~263
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F35461%2F2;p=sdc.git

analyze and fix IQ server violations SDC

Also fixes SDC-1119

Change-Id: I698ee784e0774e8c856acd7485e5abcb1ce27991
Issue-ID: SDC-1114
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
---

diff --git a/.gitignore b/.gitignore
index c930c4d1e5..9c445a8b31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,3 +258,4 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/*
 
 
 *normatives.tar.gz
+/openecomp-ui/yarn.lock
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 52ba5199a9..0d1f30d0ac 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -84,8 +84,14 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey2-jaxrs</artifactId>
             <scope>compile</scope>
-            <version>1.5.15</version>
-        </dependency>
+            <version>1.5.18</version>
+        </dependency>
+        
+        <!-- <dependency>
+    		<groupId>io.swagger.core.v3</groupId>
+    		<artifactId>swagger-jaxrs2</artifactId>
+    		<version>2.0.0-rc4</version>
+		</dependency> -->
         <!-- Swagger Dependencies End -->
 
         <dependency>
@@ -711,24 +717,6 @@
 							<includeScope>compile</includeScope>
 						</configuration>
 					</execution>
-					<execution>
-						<id>copy-installed</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>${project.artifactId}</artifactId>
-									<version>${project.version}</version>
-									<type>${project.packaging}</type>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/</outputDirectory>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 
@@ -749,47 +737,6 @@
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.6</version>
 				<executions>
-					<execution>
-						<id>copy-normatives</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
-							<resources>
-								<resource>
-									<directory>./target</directory>
-									<includes>
-										<include>normatives.tar.gz</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>copy-static-configuration-files</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${project.parent.basedir}/catalog-be/src/main/resources/config</directory>
-									<includes>
-										<include>Artifact-Generator.properties</include>
-										<include>error-configuration.yaml</include>
-										<include>ecomp-error-configuration.yaml</include>
-										<include>logback.xml</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-
 					<execution>
 						<id>copy-tosca-folder</id>
 						<!-- here the phase you need -->
@@ -889,16 +836,6 @@
 									<directory>${project.parent.basedir}/asdctool/tosca</directory>
 									<followSymlinks>false</followSymlinks>
 								</fileset>
-								<!-- static configuration files -->
-								<fileset>
-									<directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
-									<includes>
-										<include>Artifact-Generator.properties</include>
-										<include>error-configuration.yaml</include>
-										<include>ecomp-error-configuration.yaml</include>
-										<include>logback.xml</include>
-									</includes>
-								</fileset>
 							</filesets>
 						</configuration>
 					</execution>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index dedd21c969..ad3b0dacab 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -23,7 +23,6 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>
-			<!-- <version>21.0</version> -->
 			<scope>compile</scope>
 		</dependency>
 
@@ -31,14 +30,12 @@
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
 			<version>2.53.1</version>
-			<!-- <version>3.4.0</version> -->
 		</dependency>
 
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-server</artifactId>
 			<version>2.53.1</version>
-			<!-- <version>3.4.0</version> -->
 			<scope>runtime</scope>
 		</dependency>
 
@@ -60,7 +57,6 @@
 			<groupId>org.openecomp.sdc</groupId>
 			<artifactId>test-apis-ci</artifactId>
 			<version>${project.version}</version>
-			<!-- <classifier>jar-with-dependencies</classifier> -->
 			<scope>compile</scope>
 		</dependency>