maven improvements and clean up

update plugging to latest available versions,
remove un needed files from source control
clean up commented sections.
disable verbose for docker plug in.
add logback file for tests to disable out put by default.
update logging calls to new api.
disable logging on debug level.
update docker run to include simulator on demand

Change-Id: Icc0fb7add6dd4fe65f5f3d8dd309fd8dae2681fc
Issue-ID: SDC-1639
Signed-off-by: Michael Lando <ml636r@att.com>

34 files changed, 203 insertions, 549 deletions

diff --git a/.gitignore b/.gitignore
index a1b4c0f8dc..4d30906ad9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,6 @@ settings.gradle
 #------------------------------------------------------------
 #------------------------------------------------------------
 catalog-ui/app/dist/*
-catalog-ui/package-lock.json
 catalog-ui/dist
 catalog-ui/*.tmp.txt
 catalog-ui/tests/Coverage/*
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 09e2e186a8..9a6ef22d82 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -512,8 +512,8 @@
 		<finalName>${project.artifactId}-${project.version}-jar-with-dependencies</finalName>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>clean-static-files</id>
@@ -555,7 +555,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -585,7 +584,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -619,7 +617,6 @@
 			<plugin>
 				<groupId>ru.yaal.maven</groupId>
 				<artifactId>write-text-files-maven-plugin</artifactId>
-				<version>1.1</version>
 				<configuration>
 					<charset>UTF-8</charset>
 					<files>
@@ -646,7 +643,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
 				<executions>
 					<execution>
 						<id>copy-tosca-folder</id>
@@ -678,8 +674,8 @@
 			<build>
 				<plugins>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>3.0.2</version>
 						<executions>
 							<execution>
 								<id>copy-sdctool</id>
@@ -704,9 +700,7 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>${fabric8.version}</version>
 						<configuration>
-							<verbose>true</verbose>
 							<apiVersion>1.23</apiVersion>
 							<registry>nexus3.onap.org:10001</registry>
 							<authConfig>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 3a360f7f8d..068eecf53b 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -619,7 +619,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar,
                         WEB-INF/classes/elasticsearch.yml,
@@ -644,46 +643,10 @@
                     <attachClasses>true</attachClasses>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <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>
-
             <plugin>
                 <groupId>com.jcabi</groupId>
                 <artifactId>jcabi-maven-plugin</artifactId>
-                <version>${jcabi.plugin.version}</version>
+                <version>${jcabi.maven.plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -714,8 +677,8 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>clean.sdc.backend.folder</id>
@@ -782,8 +745,8 @@
 
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <id>copy-static-configuration-files</id>
@@ -870,14 +833,6 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.7</version>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         <!-- Swagger Plugins End -->
@@ -900,8 +855,8 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
                         <executions>
                             <execution>
                                 <id>copy-resources-apidocs</id>
@@ -973,10 +928,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${fabric8.version}</version>
-
                         <configuration>
-                            <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
                             <registry>nexus3.onap.org:10001</registry>
                             <authConfig>
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index c6b0e41db1..596278e4b4 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -301,14 +301,6 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.7</version>
-					<configuration>
-						<skip>true</skip>
-					</configuration>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index a5ebc4b719..66f718a111 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -298,7 +298,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.6</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -318,7 +317,6 @@
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 				<version>${jetty.version}</version>
-				<!--<version>9.0.6.v20130930</version>-->
 				<configuration>
 					<webApp>
 						<contextPath>/</contextPath>
@@ -331,7 +329,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -340,7 +337,7 @@
 			<plugin>
 				<groupId>com.jcabi</groupId>
 				<artifactId>jcabi-maven-plugin</artifactId>
-				<version>${jcabi.plugin.version}</version>
+				<version>${jcabi.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -350,8 +347,8 @@
 				</executions>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>clean.catalog.fe.folder</id>
@@ -446,8 +443,8 @@
 			<build>
 				<plugins>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>3.0.2</version>
 						<executions>
 							<execution>
 								<id>copy-resources-fe</id>
@@ -478,10 +475,7 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>${fabric8.version}</version>
-
 						<configuration>
-							<verbose>true</verbose>
 							<apiVersion>1.23</apiVersion>
 							<registry>nexus3.onap.org:10001</registry>
 							<authConfig>
diff --git a/catalog-fe/src/test/resources/logback-test.xml b/catalog-fe/src/test/resources/logback-test.xml
index 9fc1778eba..d2b9bff23f 100644
--- a/catalog-fe/src/test/resources/logback-test.xml
+++ b/catalog-fe/src/test/resources/logback-test.xml
@@ -1,2 +1,13 @@
 <!-- only one line, shut up logback ! -->
-<configuration />
\ No newline at end of file
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <Pattern>
+                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </encoder>
+    </appender>
+    <root level="OFF">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 63f8d12b4f..e1193980b3 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -252,7 +252,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
diff --git a/catalog-ui/npm-debug.log.2241131429 b/catalog-ui/npm-debug.log.2241131429
deleted file mode 100644
index e69de29bb2..0000000000
--- a/catalog-ui/npm-debug.log.2241131429
+++ /dev/null
diff --git a/catalog-ui/npm-debug.log.3178739070 b/catalog-ui/npm-debug.log.3178739070
deleted file mode 100644
index e69de29bb2..0000000000
--- a/catalog-ui/npm-debug.log.3178739070
+++ /dev/null
diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index c7add36a13..14b3267209 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -17,13 +17,9 @@
 
 	<build>
 		<plugins>
-
-			<!--  ============================================= -->
-			<!--  Clean webapps folder                          -->
-			<!--  ============================================= -->
 			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.6.1</version>
                 <executions>
                     <execution>
                         <id>clean.fe.webapp.folder</id>
@@ -49,30 +45,13 @@
                             </filesets>
                         </configuration>
                     </execution>
-                    <!-- <execution>
-                        <id>clean.dist.folder</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${basedir}/node_modules</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/dist</directory>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution> -->
                 </executions>
 			</plugin>
 
 
 			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.7</version>
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -95,8 +74,6 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.4</version>
-
                 <configuration>
         			<installDirectory>${project.parent.basedir}</installDirectory>
    				</configuration>
@@ -131,7 +108,7 @@
                         </goals>
                         <!-- Optional configuration which provides for running any npm command -->
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --registry ${npm.registry}</arguments>
                         </configuration>
                     </execution>
 
@@ -149,159 +126,5 @@
 
 		</plugins>
 	</build>
-
-
-
-	<profiles>
-		<profile>
-			<id>CI</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.7</version>
-						<executions>
-							<execution>
-								<id>copy-resources</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-
-								<configuration>
-									<outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
-									<resources>
-										<resource>
-											<directory>${project.basedir}/dist</directory>
-											<filtering>false</filtering>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-
-
-					<!--  ============================================= -->
-					<!--  Build the UI module node code                 -->
-					<!--  ============================================= -->
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.4.0</version>
-						<executions>
-
-							<!-- Set execution permissions for the build script -->
-							<execution>
-								<id>set.script.permissions</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>/bin/chmod</executable>
-									<arguments>
-										<argument>755</argument>
-										<argument>./build_catalog_ui.sh</argument>
-									</arguments>
-								</configuration>
-							</execution>
-
-							<!-- Run the build script -->
-							<execution>
-								<id>execute grant build</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>./build_catalog_ui.sh</executable>
-								</configuration>
-							</execution>
-
-							<!-- Undo checkout the build script -->
-							<execution>
-								<id>undo.checkout.script</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>/usr/bin/git</executable>
-									<arguments>
-										<argument>checkout</argument>
-										<argument>--</argument>
-										<argument>./build_catalog_ui.sh</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-
-        <profile>
-            <id>not-minified</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.7</version>
-                        <executions>
-                            <execution>
-                                <id>copy-resources</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/app</directory>
-                                            <includes>
-                                                <include>languages/**</include>
-                                                <include>scripts/**</include>
-                                                <include>styles/**</include>
-                                                <include>third-party/**</include>
-                                                <include>index.html</include>
-                                                <include>robots.txt</include>
-                                                <include>favicon.png</include>
-                                            </includes>
-                                            <filtering>false</filtering>
-                                        </resource>
-                                        <resource>
-                                            <directory>${project.basedir}</directory>
-                                            <includes>
-                                                <include>bower_components/**</include>
-                                            </includes>
-                                            <filtering>false</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-	</profiles>
 </project>
 
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 3ad76f376d..7a8077ec7d 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -203,7 +203,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
index b0c377c778..383325c368 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
@@ -1574,6 +1574,7 @@ public class Configuration extends BasicConfiguration {
         this.resourcesForUpgrade = resourcesForUpgrade;
     }
 
+    @SuppressWarnings("unchecked")
     public static <K,V> Map<K,V> safeGetCapsInsensitiveMap(Map<K,V> map) {
         return map == null ? emptyMap() : new CaseInsensitiveMap(map);
     }
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java b/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java
index 73358136b5..c29574dd1b 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/monitoring/BeMonitoringService.java
@@ -33,6 +33,7 @@ import org.openecomp.sdc.common.http.client.api.HttpRequest;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
 import org.openecomp.sdc.common.http.config.HttpClientConfig;
 import org.openecomp.sdc.common.http.config.Timeouts;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.monitoring.MonitoringEvent;
 import org.openecomp.sdc.common.monitoring.MonitoringMetricsFetcher;
@@ -99,10 +100,10 @@ public class BeMonitoringService {
 			HttpResponse<String> httpResponse = HttpRequest.post(redirectedUrl, myEntity, new HttpClientConfig(new Timeouts(timeout, timeout)));
             int beResponseStatus = httpResponse.getStatusCode();
             if (beResponseStatus != HttpStatus.SC_OK) {
-                monitoringLogger.error("Unexpected HTTP response from BE : {}", beResponseStatus);
+                monitoringLogger.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Unexpected HTTP response from BE : {}", beResponseStatus);
             }
 		} catch (Exception e) {
-			monitoringLogger.error("Monitoring BE failed with exception ", e);
+			monitoringLogger.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Monitoring BE failed with exception ", e);
 		}
 	}
 }
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java b/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java
index 3a7ccd774a..e243bac730 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/impl/ConfigFileChangeListener.java
@@ -23,6 +23,7 @@ package org.openecomp.sdc.common.impl;
 import org.apache.commons.jci.listeners.FileChangeListener;
 import org.openecomp.sdc.common.api.BasicConfiguration;
 import org.openecomp.sdc.common.api.ConfigurationListener;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.YamlToObjectConverter;
 
@@ -64,12 +65,11 @@ public class ConfigFileChangeListener extends FileChangeListener {
 							BasicConfiguration basicConfiguration = yamlToObjectConverter.convert(pFile.getAbsolutePath(), configClass);
 
 							if (basicConfiguration == null) {
-								log.warn("Cannot update the listeners for file Change since the file content is invalid");
+								log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot update the listeners for file Change since the file content is invalid");
 								continue;
 							}
 							log.debug("Loaded configuration after converting is {}", basicConfiguration);
-							// System.out.println("New configuration is " +
-							// basicConfiguration);
+
 
 							configurationListener.getCallBack().reconfigure(basicConfiguration);
 
@@ -77,7 +77,7 @@ public class ConfigFileChangeListener extends FileChangeListener {
 					}
 				} else {
 
-					log.warn("Cannot calculate id from file {}", pFile.getName());
+					log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot calculate id from file {}", pFile.getName());
 				}
 			}
 
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java b/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java
index fb9fb1c037..6703b91a60 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/rest/impl/validator/RequestHeadersValidator.java
@@ -22,6 +22,7 @@ package org.openecomp.sdc.common.rest.impl.validator;
 
 import org.apache.commons.codec.binary.Base64;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
 import javax.servlet.http.HttpServletRequest;
@@ -58,7 +59,7 @@ public class RequestHeadersValidator {
 				headersMap.put(requiredHeader, headerVal);
 				log.debug("found header - {} : {}", requiredHeader, headerVal);
 			} else {
-				log.error("missing identification header: {}", requiredHeader);
+				log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","missing identification header: {}", requiredHeader);
 				throw new RestRequestValidationException("missing identification header: " + requiredHeader);
 			}
 		}
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java
index 93160330fd..af46140fc1 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/YamlToObjectConverter.java
@@ -29,6 +29,7 @@ import org.openecomp.sdc.be.config.DistributionEngineConfiguration.CreateTopicCo
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionNotificationTopicConfig;
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionStatusTopicConfig;
 import org.openecomp.sdc.be.config.validation.DeploymentArtifactHeatConfiguration;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.fe.config.Configuration.FeMonitoringConfig;
 import org.yaml.snakeyaml.TypeDescription;
@@ -149,7 +150,7 @@ public class YamlToObjectConverter {
 			config = convert(fullFileName, className);
 
 		} catch (Exception e) {
-			log.error("Failed to convert yaml file {} to object.", configFileName,e);
+			log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", configFileName,e);
 		}
 
 		return config;
@@ -196,7 +197,7 @@ public class YamlToObjectConverter {
 
 			File f = new File(fullFileName);
 			if (!f.exists()) {
-				log.warn("The file " + fullFileName + " cannot be found. Ignore reading configuration.");
+				log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","The file {} cannot be found. Ignore reading configuration.",fullFileName);
 				return null;
 			}
 			in = Files.newInputStream(Paths.get(fullFileName));
@@ -205,7 +206,7 @@ public class YamlToObjectConverter {
 
 			// System.out.println(config.toString());
 		} catch (Exception e) {
-			log.error("Failed to convert yaml file {} to object.", fullFileName, e);
+			log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", fullFileName, e);
 		} finally {
 			if (in != null) {
 				try {
@@ -233,7 +234,7 @@ public class YamlToObjectConverter {
 			config = yaml.loadAs(in, className);
 
 		} catch (Exception e) {
-			log.error("Failed to convert yaml file to object", e);
+			log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object", e);
 		} finally {
 			if (in != null) {
 				try {
@@ -253,7 +254,7 @@ public class YamlToObjectConverter {
 		
 		return isValidYaml(decodedFileContents);
 	}
-	
+	@SuppressWarnings("unchecked")
 	public boolean isValidYaml(byte[] fileContents) {
 		try {
 			
@@ -265,7 +266,7 @@ public class YamlToObjectConverter {
 			 }
 			
 		} catch (Exception e) {
-			log.error("Failed to convert yaml file to object - yaml is invalid", e);
+			log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object - yaml is invalid", e);
 			return false;
 		}
 		return true;
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java b/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java
index fada7193ed..e8af079f22 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/exception/AbstractSdncException.java
@@ -20,6 +20,7 @@
 
 package org.openecomp.sdc.exception;
 
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
 import java.util.Arrays;
@@ -58,11 +59,11 @@ public abstract class AbstractSdncException {
 		}
 		int actualParamsNum = (variables != null) ? variables.length : 0;
 		if (actualParamsNum < expectedParamsNum) {
-			log.warn(
+			log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","",
 					"Received less parameters than expected for error with messageId {}, expected: {}, actual: {}. Missing parameters are padded with null values.",
 					messageId, expectedParamsNum, actualParamsNum);
 		} else if (actualParamsNum > expectedParamsNum) {
-			log.warn(
+			log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","",
 					"Received more parameters than expected for error with messageId {}, expected: {}, actual: {}. Extra parameters are ignored.",
 					messageId, expectedParamsNum, actualParamsNum);
 		}
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java
index 9c18861d40..5f80470b9b 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 public class WrapperTest {
 
 	private Wrapper createTestSubject() {
-		return new Wrapper(null);
+		return new Wrapper("test");
 	}
 
 
diff --git a/common-be/pom.xml b/common-be/pom.xml
index 8bae6805de..1b0dcd05b3 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -62,19 +62,5 @@
 		</dependency>
 
 	</dependencies>
-	
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.7</version>
-					<configuration>
-						<skip>true</skip>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+
 </project>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
index 12c68237dc..b55be0b47d 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
@@ -150,6 +150,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>3.0.0</version>
                 <configuration>
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
index 3ec6e45f3e..b803298bba 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
@@ -4,7 +4,7 @@
 	<property scope="system" name="ECOMP-component-name" value="SDC" />
 	<property scope="system" name="ECOMP-subcomponent-name" value="SDC-BE" />
 	<property file="${config.home}/catalog-be/configuration.yaml" />
-	<property scope="context" name="enable-all-log" value="true" />
+	<property scope="context" name="enable-all-log" value="false" />
 
 	<!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
 	<!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
@@ -331,5 +331,5 @@
 		</if>
 	</root>
 
-	<logger name="org.openecomp.sdc" level="DEBUG" />
+	<logger name="org.openecomp.sdc" level="INFO" />
 </configuration>
\ No newline at end of file
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
index 3fb26669cc..e9cbabae74 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
@@ -74,10 +74,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${fabric8.version}</version>
-
                         <configuration>
-                            <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
                             <registry>nexus3.onap.org:10001</registry>
                             <authConfig>
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
index 5101cd0e57..a3da6049cb 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
@@ -51,10 +51,8 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>${fabric8.version}</version>
 
                 <configuration>
-                    <verbose>true</verbose>
                     <apiVersion>1.23</apiVersion>
                     <registry>nexus3.onap.org:10001</registry>
                     <authConfig>
diff --git a/openecomp-ui/yarn.lock b/openecomp-ui/yarn.lock
index 339d84959b..e3dd7fab33 100644
--- a/openecomp-ui/yarn.lock
+++ b/openecomp-ui/yarn.lock
@@ -9286,9 +9286,9 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-sdc-ui@1.6.53:
-  version "1.6.53"
-  resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.53.tgz#acb6faba9a7d5f64702f4a19c4efbc5fae331f63"
+sdc-ui@1.6.57:
+  version "1.6.57"
+  resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.57.tgz#9250faa279163e13f36bb91c835b8fe78f77ebaf"
   dependencies:
     "@angular/common" "~2.4.8"
     "@angular/core" "~2.4.8"
diff --git a/pom.xml b/pom.xml
index 5a370f43fe..80246c16c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,16 +8,7 @@
     <packaging>pom</packaging>
     <name>sdc</name>
     <properties>
-
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-
-        <!-- ==================== -->
-        <!-- Generic properties -->
-        <!-- ==================== -->
-        <build.type>-SNAPSHOT</build.type>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sprint.number>74</sprint.number>
 
         <!-- 3rd parties versions -->
         <lang3.version>3.3.2</lang3.version>
@@ -62,7 +53,7 @@
         <jcabi.version>0.20.1</jcabi.version>
         <aspectjrt.version>1.8.4</aspectjrt.version>
         <aspectj.version>1.7.4</aspectj.version>
-        <jcabi.plugin.version>0.13.2</jcabi.plugin.version>
+        <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
 
         <!-- Logging end -->
         <!-- System Metrics -->
@@ -78,7 +69,7 @@
 
         <!--TESTING-->
         <mockito.version>2.18.3</mockito.version>
-	    <jmockit.version>1.33</jmockit.version>
+        <jmockit.version>1.33</jmockit.version>
         <junit.version>4.12</junit.version>
         <assertj.version>3.10.0</assertj.version>
         <testng.version>6.9.10</testng.version>
@@ -102,16 +93,16 @@
         <nexus.id.snapshot>nexus</nexus.id.snapshot>
 
         <!--nexus-->
+        <npm.registry>https://registry.npmjs.org/</npm.registry>
+        <!-- https://nexus.onap.org/content/repositories/npm/ -->
         <nexus.proxy>https://nexus.onap.org</nexus.proxy>
         <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
         <staging.profile.id>176c31dfe190a</staging.profile.id>
         <!--maven-->
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <!--io.fabric8-->
-        <fabric8.version>0.23.0</fabric8.version>
         <!--docker tags-->
         <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
-        <!--<docker.latest.tag>${project.version}-latest</docker.latest.tag>-->
+
 
     </properties>
 
@@ -179,7 +170,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <configuration>
                     <failOnError>false</failOnError>
                     <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
@@ -205,20 +196,6 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.4</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.wagon</groupId>
-                            <artifactId>wagon-webdav-jackrabbit</artifactId>
-                            <version>2.10</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
@@ -226,12 +203,77 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.4.0</version>
+                    <version>1.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.0.2</version>
+                    <version>3.4.1.1168</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>ru.yaal.maven</groupId>
+                    <artifactId>write-text-files-maven-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>0.26.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.github.eirslett</groupId>
+                    <artifactId>frontend-maven-plugin</artifactId>
+                    <version>1.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.8</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -242,7 +284,6 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <nexusUrl>${nexus.proxy}</nexusUrl>
@@ -255,10 +296,10 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.8</version>
                 <executions>
                     <execution>
                         <id>parse-version</id>
+                        <phase>pre-clean</phase>
                         <goals>
                             <goal>parse-version</goal>
                         </goals>
@@ -289,11 +330,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
+                <version>3.7.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.wagon</groupId>
                         <artifactId>wagon-webdav-jackrabbit</artifactId>
-                        <version>2.10</version>
+                        <version>3.0.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -302,7 +344,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
-                <version>1.4</version>
                 <executions>
                     <execution>
                         <inherited>false</inherited>
@@ -324,55 +365,20 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- license plugin -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>1.10</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
-                    <licenseName>apache_v2</licenseName>
-                    <inceptionYear>2017</inceptionYear>
-                    <organizationName>AT&amp;T Intellectual Property. All rights
-                        reserved.
-                    </organizationName>
-                    <projectName>SDC</projectName>
-                    <canUpdateCopyright>true</canUpdateCopyright>
-                    <canUpdateDescription>true</canUpdateDescription>
-                    <canUpdateLicense>true</canUpdateLicense>
-                    <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                    <verbose>false</verbose>
-                    <includes>
-                        <include>**/*.java</include>
-                        <include>**/*.ts</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/*.d.ts</exclude>
-                    </excludes>
-                    <roots>
-                        <root>src</root>
-                        <root>app</root>
-                        <root>server-mock</root>
-                        <root>typings</root>
-                    </roots>
-                    <extraExtensions>
-                        <ts>java</ts>
-                    </extraExtensions>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <printSummary>false</printSummary>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>first</id>
-                        <goals>
-                            <goal>update-file-header</goal>
-                        </goals>
-                        <!--phase>process-sources</phase -->
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
@@ -384,10 +390,10 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>security-utils</module>
-                <module>common-app-api</module>
                 <module>onboarding</module>
                 <module>services/activity-spec</module>
+                <module>security-utils</module>
+                <module>common-app-api</module>
                 <module>common-be</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index ac28c26f1f..a5d69f1697 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -17,8 +17,8 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>clean.tosca.chef.os.folder</id>
@@ -56,7 +56,6 @@
             <plugin>
                 <groupId>ru.yaal.maven</groupId>
                 <artifactId>write-text-files-maven-plugin</artifactId>
-                <version>1.1</version>
                 <configuration>
                     <charset>UTF-8</charset>
                     <files>
@@ -84,14 +83,6 @@
     </build>
 
     <profiles>
-        <!--<profile>-->
-            <!--<id>docker-staging</id>-->
-            <!--<properties>-->
-                <!--<docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>-->
-                <!--<docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>-->
-            <!--</properties>-->
-        <!--</profile>-->
-
         <profile>
             <id>docker</id>
             <activation>
@@ -100,18 +91,9 @@
             <build>
                 <plugins>
                     <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-
-                    </plugin>
-
-                    <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${fabric8.version}</version>
-
                         <configuration>
-                            <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
                             <registry>nexus3.onap.org:10001</registry>
                             <authConfig>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index f1a6ee4939..bb6d6005d3 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -45,8 +45,12 @@ fi
 
 
 function usage {
-    echo "usage: docker_run.sh [ -r|--release <RELEASE-NAME> ]  [ -e|--environment <ENV-NAME> ] [ -p|--port <Docker-hub-port>] [ -l|--local <Run-without-pull>] [ -t|--runTests <Run-with-sanityDocker>] [ -dcae|--dcae <Run-with-DCAE>][ -h|--help ]"
-    echo "example: sudo bash docker_run.sh -e AUTO -r 1.2-STAGING-latest  -dcae"
+    echo "usage: docker_run.sh [ -r|--release <RELEASE-NAME> ] [ -e|--environment <ENV-NAME> ] [ -p|--port <Docker-hub-port>] [ -l|--local <Run-without-pull>] [ -t|--runTests <Run-with-sanityDocker>] [ -sim|--simulator <Run-with-simulator>] [ -ta <run api tests with the supplied test suit>] [ -tu <run ui tests with the supplied test suit>] [ -ta <run api tests with the supplied test suit>] [ -tu <run ui tests with the supplied test suit>] [ -tad <run api tests with the default test suit>] [ -tu <run ui tests with the default test suit>] [ -dcae|--dcae <Run-with-DCAE>][ -h|--help ]"
+    echo "start dockers built locally example: docker_run.sh -l"
+    echo "start dockers built locally and simulator example: docker_run.sh -l -sim"
+    echo "start dockers, pull from onap nexus according to release and simulator example: docker_run.sh -r 1.3-STAGING-latest -sim"
+    echo "start dockers built locally and run api tests docker example: docker_run.sh -l -tad"
+    echo "start dockers built locally and run only the catalog be example: docker_run.sh -l -d sdc-BE "
 }
 #
 
@@ -180,6 +184,18 @@ function probe_dcae_tools {
 }
 #
 
+# check simulator status
+function probe_sim {
+    if lsof -Pi :8285 -sTCP:LISTEN -t >/dev/null ; then
+        echo "running"
+        sim_stat=true
+    else
+        echo "not running"
+        sim_stat=false
+    fi
+}
+#
+
 
 function monitor_docker {
     DOCKER_NAME=$1
@@ -538,7 +554,7 @@ function sdc-ui-tests {
             if [ ${LOCAL} = false ]; then
                 docker pull ${PREFIX}/sdc-ui-tests:${RELEASE}
             fi
-
+            RUN_SIMULATOR=true;
             sdc-sim
             docker run --detach --name sdc-ui-tests --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${UI_TESTS_JAVA_OPTIONS}" --env SUITE_NAME=${UI_SUITE} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/sdc-ui-tests/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-ui-tests/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5901:5901 --publish 6901:6901 ${PREFIX}/sdc-ui-tests:${RELEASE}
             echo "please wait while SDC-UI-TESTS is starting....."
@@ -551,16 +567,29 @@ function sdc-ui-tests {
 
 # SDC-Simulator
 function sdc-sim {
-    echo "docker run sdc-webSimulator..."
-    if [ ${LOCAL} = false ]; then
-        docker pull ${PREFIX}/sdc-simulator:${RELEASE}
-    fi
+    if [ ${RUN_SIMULATOR} = true ]; then
+        echo "docker run sdc-webSimulator..."
+        if [ ${LOCAL} = false ]; then
+            docker pull ${PREFIX}/sdc-simulator:${RELEASE}
+        fi
 
-    probe_sim
-    if [ sim_stat=false ]; then
-        docker run --detach --name sdc-sim  --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" --env ENVNAME="${DEP_ENV}" ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8285:8080 --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE}
-        echo "please wait while SDC-WEB-SIMULATOR is starting....."
-        monitor_docker sdc-sim
+        probe_sim
+        sim_stat=$?
+        if [ sim_stat=1 ]; then
+            docker run \
+                --detach \
+                --name sdc-sim \
+                --env FE_URL="${FE_URL}" \
+                --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" \
+                --env ENVNAME="${DEP_ENV}" \
+                ${LOCAL_TIME_MOUNT_CMD} \
+                --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs \
+                --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments \
+                --publish 8285:8080 \
+                --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE}
+            echo "please wait while SDC-WEB-SIMULATOR is starting....."
+            monitor_docker sdc-sim
+        fi
     fi
 }
 #
@@ -628,7 +657,15 @@ while [ $# -gt 0 ]; do
           shift 1 ;
           DOCKER=$1;
           shift 1 ;;
-
+    # -sim | --simulator run the simulator
+    -sim | --simulator )
+         RUN_SIMULATOR=true;
+         shift 1 ;;
+    # -sim | --simulator run the simulator
+    -u | --fe_url )
+         shift 1 ;
+         FE_URL=$1;
+         shift 1 ;;
     # -dcae | --dcae - Use this to deploy DCAE upon SDC
     -dcae | --dcae )
          shift 1 ;
@@ -684,6 +721,7 @@ if [ -z "${DOCKER}" ]; then
 	dcae-tools
 	dcae-fe
 	healthCheck
+    sdc-sim
 	sdc-api-tests
 	sdc-ui-tests
 else
diff --git a/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml
index a0551cbc49..5ab1458892 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-api-docs/pom.xml
@@ -24,6 +24,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
diff --git a/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml b/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml
index 43fa19f7e1..1102810db9 100644
--- a/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml
+++ b/services/activity-spec/activity-spec-web/activity-spec-war/pom.xml
@@ -25,6 +25,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <executions>
                     <execution>
@@ -33,6 +34,7 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>${mvn.war.version}</version>
                 <configuration>
diff --git a/services/activity-spec/activity-spec-web/pom.xml b/services/activity-spec/activity-spec-web/pom.xml
index 256e4fb220..c4226b973b 100644
--- a/services/activity-spec/activity-spec-web/pom.xml
+++ b/services/activity-spec/activity-spec-web/pom.xml
@@ -27,6 +27,7 @@
             <build>
                 <plugins>
                   <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
                         <version>3.0.2</version>
                         <executions>
diff --git a/services/activity-spec/pom.xml b/services/activity-spec/pom.xml
index 2b4aa6cd0f..c39b8f265c 100644
--- a/services/activity-spec/pom.xml
+++ b/services/activity-spec/pom.xml
@@ -63,7 +63,6 @@
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${mvn.docker.version}</version>
                     <configuration>
-                        <verbose>false</verbose>
                         <registry>nexus3.onap.org:10001</registry>
                         <authConfig>
                             <pull>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index d6176342ce..ac3cdd731d 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -34,18 +34,7 @@
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
         </dependency>
-        <!--<dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>-->
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
@@ -93,13 +82,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!--	<dependency>
-                <groupId>org.openecomp.sdc</groupId>
-                <artifactId>dmaap-publisher</artifactId>
-                <version>1.0.0</version>
-                <scope>provided</scope>
-            </dependency>-->
-
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>common-app-api</artifactId>
@@ -390,48 +372,18 @@
 
     <build>
         <plugins>
-
-            <!-- ============================================= -->
-            <!-- Get the next build number -->
-            <!-- ============================================= -->
-            <!--<plugin> -->
-            <!--<groupId>org.codehaus.mojo</groupId> -->
-            <!--<artifactId>properties-maven-plugin</artifactId> -->
-            <!--<version>1.0-alpha-1</version> -->
-            <!--<inherited>false</inherited> -->
-
-            <!--<executions> -->
-            <!--<execution> -->
-            <!--<id>tests</id> -->
-            <!--<phase>initialize</phase> -->
-            <!--<goals> -->
-            <!--<goal>read-project-properties</goal> -->
-            <!--</goals> -->
-
-            <!--<configuration> -->
-            <!--<files> -->
-            <!--<file>../target/FullReleaseVersion.properties</file> -->
-            <!--</files> -->
-            <!--</configuration> -->
-            <!--</execution> -->
-            <!--</executions> -->
-            <!--</plugin> -->
-
-
-
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
-                        <id>clean.tosca.chef.os.folder</id>
+                        <id>clean.testsuit.folder</id>
                         <phase>clean</phase>
                         <goals>
                             <goal>clean</goal>
                         </goals>
                         <configuration>
                             <filesets>
-
                                 <!-- Sanity jar -->
                                 <fileset>
                                     <directory>${project.basedir}/sdc-api-tests</directory>
@@ -454,7 +406,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.7</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -497,8 +448,8 @@
         <build>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
                     <executions>
                         <execution>
                             <id>copy-tests-suites</id>
@@ -543,10 +494,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>${fabric8.version}</version>
-
                     <configuration>
-                        <verbose>true</verbose>
                         <apiVersion>1.23</apiVersion>
                         <registry>nexus3.onap.org:10001</registry>
                         <authConfig>
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 8efd502391..3295b3bcea 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -240,53 +240,21 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!--<dependency>-->
-			<!--<groupId>com.att.automation.common</groupId>-->
-			<!--<artifactId>report-portal-integration</artifactId>-->
-			<!--<version>RELEASE</version>-->
-		<!--</dependency>-->
-
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
 			<version>4.1.0</version>
 		</dependency>
 
-
-
-
-
 	</dependencies>
 
 	<build>
 
 		<plugins>
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 				<artifactId>maven-compiler-plugin</artifactId> -->
-<!-- 				<version>3.7.0</version> -->
-<!-- 				<configuration> -->
-<!-- 					<compilerArgument>-g:vars</compilerArgument> -->
-<!-- 					<debug>true</debug> -->
-<!-- 					<debuglevel>lines,vars,source</debuglevel> -->
-<!-- 				</configuration> -->
-<!-- 			</plugin> -->
-
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 				<artifactId>maven-surefire-plugin</artifactId> -->
-<!-- 				<version>2.19.1</version> -->
-<!-- 				<configuration> -->
-<!-- 					<suiteXmlFiles> -->
-<!-- 						<suiteXmlFile>${suiteXmlFile}</suiteXmlFile> -->
-<!-- 					</suiteXmlFiles> -->
-<!-- 					<argLine>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</argLine> -->
-<!-- 				</configuration> -->
-<!-- 			</plugin> -->
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>clean.tosca.chef.os.folder</id>
@@ -318,15 +286,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
 			</plugin>
-
-			<!-- ============================================= -->
-			<!-- Create the JAR file with its dependencies -->
-			<!-- ============================================= -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -350,7 +313,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
 	<profiles>
@@ -362,8 +324,8 @@
 			<build>
 				<plugins>
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>3.0.2</version>
 						<executions>
 							<execution>
 								<id>copy-tests-suites</id>
@@ -427,10 +389,7 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>${fabric8.version}</version>
-
 						<configuration>
-							<verbose>true</verbose>
 							<apiVersion>1.23</apiVersion>
 							<registry>nexus3.onap.org:10001</registry>
 							<authConfig>
@@ -492,18 +451,6 @@
 					</plugin>
 				</plugins>
 			</build>
-	<!--<repositories>-->
-		<!--<repository>-->
 		</profile>
 	</profiles>
-			<!--<id>nexus_att_repository_id</id>-->
-			<!--<url>http://135.76.5.78:8083/nexus/content/groups/public</url>-->
-		<!--</repository>-->
-	<!--</repositories>-->
-	<!--<pluginRepositories>-->
-		<!--<pluginRepository>-->
-			<!--<id>nexus_att_repository_id</id>-->
-			<!--<url>http://135.76.5.78:8083/nexus/content/groups/public</url>-->
-		<!--</pluginRepository>-->
-	<!--</pluginRepositories>-->
 </project>
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 75eab58366..dbdd1d9581 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -87,22 +87,6 @@
 	</dependencies>
 	<build>
 		<finalName>WSSimulator-${project.version}</finalName>
-		<plugins>
-			<!-- ================================================== -->
-			<!-- Set the JDK compiler version. -->
-			<!-- ================================================== -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-
-		</plugins>
 	</build>
 	
 	<repositories>
@@ -166,7 +150,6 @@
 					
 					<plugin>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>3.0.2</version>
 						<executions>
 							<execution>
 								<id>copy-resources-simulator</id>
@@ -212,10 +195,7 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>${fabric8.version}</version>
-
 						<configuration>
-							<verbose>true</verbose>
 							<apiVersion>1.23</apiVersion>
 							<registry>nexus3.onap.org:10001</registry>
 							<authConfig>