Skip swagger in fast build profile

Add configuration to skip swagger in 'fast-build' profile

Change-Id: I737e3df89d0b15391616ccbce9da4b3ecdd7ed67
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3525

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index c7fb435..00cbc8b 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,6 +1,6 @@
 <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">
+    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>
@@ -14,7 +14,7 @@
 
     <properties>
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
-        <swagger.version>2.1.1</swagger.version>
+        <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
         <swagger-ui.version>3.25.0</swagger-ui.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <replacer.plugin.version>1.5.3</replacer.plugin.version>
@@ -945,7 +945,9 @@
                                         <include>src/test/resources/**/*.y*ml</include>
                                     </includes>
                                     <excludes>
-                                        <exclude>src/test/resources/artifacts/pnfSoftwareInformation/**</exclude>
+                                        <exclude>
+                                            src/test/resources/artifacts/pnfSoftwareInformation/**
+                                        </exclude>
                                     </excludes>
                                 </validationSet>
                                 <validationSet>
@@ -1017,7 +1019,8 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+                                    <directory>
+                                        sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
                                     </directory>
                                     <followSymlinks>false</followSymlinks>
                                     <includes>
@@ -1032,6 +1035,7 @@
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
+                <version>${swagger-core-mvn-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>sdce-2-sdce-5</id>
@@ -1044,7 +1048,10 @@
                             <outputPath>${project.build.directory}/generated/swagger</outputPath>
                             <outputFileName>swagger-sdce-2-sdce-5</outputFileName>
                             <outputFormat>JSON</outputFormat>
-                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml</configurationFilePath>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
                         </configuration>
                     </execution>
                     <execution>
@@ -1058,7 +1065,10 @@
                             <outputPath>${project.build.directory}/generated/swagger</outputPath>
                             <outputFileName>swagger-sdce-4</outputFileName>
                             <outputFormat>JSON</outputFormat>
-                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml</configurationFilePath>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
                         </configuration>
                     </execution>
                     <execution>
@@ -1072,7 +1082,10 @@
                             <outputPath>${project.build.directory}/generated/swagger</outputPath>
                             <outputFileName>swagger-sdce-6</outputFileName>
                             <outputFormat>JSON</outputFormat>
-                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml</configurationFilePath>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
                         </configuration>
                     </execution>
                     <execution>
@@ -1086,7 +1099,10 @@
                             <outputPath>${project.build.directory}/generated/swagger</outputPath>
                             <outputFileName>swagger-sdce-7</outputFileName>
                             <outputFormat>JSON</outputFormat>
-                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml</configurationFilePath>
+                            <configurationFilePath>
+                                ${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml
+                            </configurationFilePath>
+                            <skip>${swagger.skip}</skip>
                         </configuration>
                     </execution>
                 </executions>
@@ -1162,7 +1178,8 @@
                                     </outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${project.parent.basedir}/catalog-be/target</directory>
+                                            <directory>${project.parent.basedir}/catalog-be/target
+                                            </directory>
                                             <includes>
                                                 <include>normatives.tar.gz</include>
                                             </includes>
@@ -1182,7 +1199,8 @@
                                     </outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${project.parent.basedir}/catalog-be/src/main/resources/
+                                            <directory>
+                                                ${project.parent.basedir}/catalog-be/src/main/resources/
                                             </directory>
                                             <includes>
                                                 <include>scripts/sdcBePy/**</include>
@@ -1220,7 +1238,9 @@
                                             <tag>
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                                             </tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                                            </tag>
                                         </tags>
                                         <assembly>
                                             <descriptor>backend/backend-files.xml</descriptor>
@@ -1234,13 +1254,16 @@
                                     <alias>sdc-backend-init</alias>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/sdc-backend-init</dockerFileDir>
+                                        <dockerFileDir>${project.basedir}/sdc-backend-init
+                                        </dockerFileDir>
                                         <tags>
                                             <tag>latest</tag>
                                             <tag>
                                                 ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                                             </tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                                            </tag>
                                         </tags>
                                     </build>
                                 </image>

diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index 6816552..a24c1cb 100644 (file)
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -1,290 +1,298 @@
 <?xml version="1.0"?>
 <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>
-  <parent>
-    <groupId>org.openecomp.sdc</groupId>
-    <artifactId>sdc-main</artifactId>
+    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>
+    <parent>
+        <groupId>org.openecomp.sdc</groupId>
+        <artifactId>sdc-main</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>cucumber-bdd</artifactId>
+    <name>cucumber-bdd</name>
     <version>1.7.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>cucumber-bdd</artifactId>
-  <name>cucumber-bdd</name>
-  <version>1.7.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.6.1</version>
-        <executions>
-          <execution>
-            <id>clean.dist.folder</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${basedir}/node_modules</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
-                </fileset>
-                <fileset>
-                  <directory>${basedir}/report</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
-                </fileset>
-                <fileset>
-                  <directory>${basedir}/resources/downloads</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
-                </fileset>
-                <fileset>
-                  <directory>${basedir}/docs</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
-                </fileset>
-                <fileset>
-                  <directory>${basedir}</directory>
-                  <includes>
-                    <include>jenkinsConfig.json</include>
-                  </includes>
-                </fileset>
-              </filesets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.github.eirslett</groupId>
-        <artifactId>frontend-maven-plugin</artifactId>
-
-        <configuration>
-          <installDirectory>${project.parent.parent.basedir}</installDirectory>
-        </configuration>
-
-        <executions>
-          <execution>
-            <id>install node and npm</id>
-            <goals>
-              <goal>install-node-and-npm</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <nodeVersion>v10.17.0</nodeVersion>
-              <npmVersion>6.11.3</npmVersion>
-            </configuration>
-          </execution>
-          <execution>
-            <id>npm run install</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <configuration>
-              <arguments>install</arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <directory>${basedir}/docker</directory>
-        <targetPath>${project.build.directory}/docker_assembly</targetPath>
-        <filtering>false</filtering>
-      </resource>
-    </resources>
-  </build>
-  <profiles>
-    <profile>
-      <id>dev</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
+    <packaging>jar</packaging>
+    <build>
         <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>create-reporting-folders</id>
-                <phase>initialize</phase>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.6.1</version>
+                <executions>
+                    <execution>
+                        <id>clean.dist.folder</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${basedir}/node_modules</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </fileset>
+                                <fileset>
+                                    <directory>${basedir}/report</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </fileset>
+                                <fileset>
+                                    <directory>${basedir}/resources/downloads</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </fileset>
+                                <fileset>
+                                    <directory>${basedir}/docs</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </fileset>
+                                <fileset>
+                                    <directory>${basedir}</directory>
+                                    <includes>
+                                        <include>jenkinsConfig.json</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
                 <configuration>
-                  <tasks>
-                    <echo message="Generate reports and downloads folders"/>
-                    <mkdir dir="${basedir}/report"/>
-                    <mkdir dir="${basedir}/resources/downloads"/>
-                  </tasks>
                 </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-
-            <configuration>
-              <workingDirectory>${project.basedir}</workingDirectory>
-              <installDirectory>${project.parent.parent.basedir}</installDirectory>
-            </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
 
-            <executions>
-
-              <execution>
-                <id>npm run install</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
                 <configuration>
-                  <arguments>install</arguments>
+                    <installDirectory>${project.parent.parent.basedir}</installDirectory>
                 </configuration>
-              </execution>
 
-              <execution>
-                <id>npm run cucumber test</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <configuration>
-                  <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
-                  <arguments>run test-and-report</arguments>
-                </configuration>
-                <phase>test</phase>
-              </execution>
+                <executions>
+                    <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <nodeVersion>v10.17.0</nodeVersion>
+                            <npmVersion>6.11.3</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm run install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>${basedir}/docker</directory>
+                <targetPath>${project.build.directory}/docker_assembly</targetPath>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>${maven-antrun-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>create-reporting-folders</id>
+                                <phase>initialize</phase>
+                                <configuration>
+                                    <target>
+                                        <echo message="Generate reports and downloads folders"/>
+                                        <mkdir dir="${basedir}/report"/>
+                                        <mkdir dir="${basedir}/resources/downloads"/>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
 
-              <execution>
-                <id>npm run documentation</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-                <configuration>
-                  <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
-                  <arguments>run cucumber-docs</arguments>
-                </configuration>
-                <phase>install</phase>
-              </execution>
+                        <configuration>
+                            <workingDirectory>${project.basedir}</workingDirectory>
+                            <installDirectory>${project.parent.parent.basedir}</installDirectory>
+                        </configuration>
 
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>docker</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>3.0.2</version>
-            <executions>
-              <execution>
-                <id>copy-resources</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/docker_assembly/cucumber
-                  </outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${basedir}</directory>
-                      <includes>
-                        <include>features/**/*</include>
-                        <include>stepDefinitions/**/*</include>
-                        <include>plugins/**/*</include>
-                        <include>resources/**/*</include>
-                        <include>node_modules/**/*</include>
-                        <include>cucumber-common/**/*</include>
-                        <include>*.js*</include>
-                      </includes>
-                      <filtering>false</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <configuration>
-              <verbose>true</verbose>
-              <apiVersion>1.23</apiVersion>
-              <registry>nexus3.onap.org:10001</registry>
-              <authConfig>
-                <pull>
-                  <username>docker</username>
-                  <password>docker</password>
-                </pull>
-              </authConfig>
-              <images>
-                <!-- Build sanity image -->
-                <image>
-                  <name>onap/cucumber-sdc-api-tests</name>
-                  <alias>cucumber-sdc-api-tests</alias>
-                  <build>
-                    <cleanup>try</cleanup>
-                    <dockerFileDir>${project.build.directory}/docker_assembly</dockerFileDir>
-                    <tags>
-                      <tag>latest</tag>
-                      <tag>
-                        ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
-                      </tag>
-                      <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
-                    </tags>
-                  </build>
-                </image>
-              </images>
-            </configuration>
-            <executions>
-              <execution>
-                <id>clean-images</id>
-                <phase>pre-clean</phase>
-                <goals>
-                  <goal>remove</goal>
-                </goals>
-                <configuration>
-                  <removeAll>true</removeAll>
-                  <image>onap/cucumber-sdc-api-tests</image>
-                </configuration>
-              </execution>
-              <execution>
-                <id>generate-images</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>push-images</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>push</goal>
-                </goals>
-                <configuration>
-                  <image>onap/cucumber-sdc-api-tests</image>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+                        <executions>
+
+                            <execution>
+                                <id>npm run install</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>install</arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>npm run cucumber test</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <npmInheritsProxyConfigFromMaven>false
+                                    </npmInheritsProxyConfigFromMaven>
+                                    <arguments>run test-and-report</arguments>
+                                </configuration>
+                                <phase>test</phase>
+                            </execution>
+
+                            <execution>
+                                <id>npm run documentation</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <npmInheritsProxyConfigFromMaven>false
+                                    </npmInheritsProxyConfigFromMaven>
+                                    <arguments>run cucumber-docs</arguments>
+                                </configuration>
+                                <phase>install</phase>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.0.2</version>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>
+                                        ${project.build.directory}/docker_assembly/cucumber
+                                    </outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${basedir}</directory>
+                                            <includes>
+                                                <include>features/**/*</include>
+                                                <include>stepDefinitions/**/*</include>
+                                                <include>plugins/**/*</include>
+                                                <include>resources/**/*</include>
+                                                <include>node_modules/**/*</include>
+                                                <include>cucumber-common/**/*</include>
+                                                <include>*.js*</include>
+                                            </includes>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <apiVersion>1.23</apiVersion>
+                            <registry>nexus3.onap.org:10001</registry>
+                            <authConfig>
+                                <pull>
+                                    <username>docker</username>
+                                    <password>docker</password>
+                                </pull>
+                            </authConfig>
+                            <images>
+                                <!-- Build sanity image -->
+                                <image>
+                                    <name>onap/cucumber-sdc-api-tests</name>
+                                    <alias>cucumber-sdc-api-tests</alias>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${project.build.directory}/docker_assembly
+                                        </dockerFileDir>
+                                        <tags>
+                                            <tag>latest</tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+                                            </tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                                            </tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>clean-images</id>
+                                <phase>pre-clean</phase>
+                                <goals>
+                                    <goal>remove</goal>
+                                </goals>
+                                <configuration>
+                                    <removeAll>true</removeAll>
+                                    <image>onap/cucumber-sdc-api-tests</image>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                                <configuration>
+                                    <image>onap/cucumber-sdc-api-tests</image>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2e6005b..866e2ee 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -21,8 +21,8 @@ limitations under the License.
 -->
 
 <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">
+    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>sdc-integration-tests</artifactId>
@@ -302,10 +302,13 @@ limitations under the License.
                             <outputDirectory>${it.sdc-be.plugins}</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../catalog-be-plugins/etsi-nfv-nsd-csar-plugin/target</directory>
+                                    <directory>
+                                        ../catalog-be-plugins/etsi-nfv-nsd-csar-plugin/target
+                                    </directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>etsi-nfv-nsd-csar-plugin-${project.version}.jar</include>
+                                        <include>etsi-nfv-nsd-csar-plugin-${project.version}.jar
+                                        </include>
                                     </includes>
                                 </resource>
                             </resources>
@@ -335,8 +338,9 @@ limitations under the License.
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>${maven-antrun-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>set-folder-permission</id>
@@ -346,7 +350,9 @@ limitations under the License.
                                 <mkdir dir="/tmp/sdc-integration-tests"/>
                                 <chmod dir="/tmp/sdc-integration-tests" type="dir" perm="ugo+rwx"/>
                                 <mkdir dir="/tmp/sdc-integration-tests/downloadAutomation"/>
-                                <chmod dir="/tmp/sdc-integration-tests/downloadAutomation" type="dir" perm="ugo+rwx"/>
+                                <chmod dir="/tmp/sdc-integration-tests/downloadAutomation"
+                                    type="dir"
+                                    perm="ugo+rwx"/>
                             </target>
                         </configuration>
                         <goals>
@@ -358,9 +364,11 @@ limitations under the License.
                         <phase>pre-integration-test</phase>
                         <configuration>
                             <target>
-                                <untar src="${project.build.directory}/gecko/geckodriver-v${gecko.driver.version}-linux64.tar.gz"
-                                       compression="gzip" dest="${project.build.directory}/gecko/"/>
-                                <chmod dir="${project.build.directory}/gecko/geckodriver" type="dir" perm="ugo+rwx"/>
+                                <untar
+                                    src="${project.build.directory}/gecko/geckodriver-v${gecko.driver.version}-linux64.tar.gz"
+                                    compression="gzip" dest="${project.build.directory}/gecko/"/>
+                                <chmod dir="${project.build.directory}/gecko/geckodriver" type="dir"
+                                    perm="ugo+rwx"/>
                             </target>
                         </configuration>
                         <goals>
@@ -416,7 +424,8 @@ limitations under the License.
                                 <hostname>sdc-cs</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/root/chef-solo/environments</volume>
+                                        <volume>${it.chef.config}:/root/chef-solo/environments
+                                        </volume>
                                     </bind>
                                 </volumes>
                                 <ulimits>
@@ -468,7 +477,8 @@ limitations under the License.
                                 <hostname>sdc-cs-init</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/home/sdc/chef-solo/environments</volume>
+                                        <volume>${it.chef.config}:/home/sdc/chef-solo/environments
+                                        </volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -501,7 +511,8 @@ limitations under the License.
                                 <hostname>sdc-cs-onboard-init</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/home/sdc/chef-solo/environments</volume>
+                                        <volume>${it.chef.config}:/home/sdc/chef-solo/environments
+                                        </volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -523,19 +534,26 @@ limitations under the License.
                                     <container>sdc-cassandra-onboard-init</container>
                                 </dependsOn>
                                 <env>
-                                    <cassandra_ssl_enabled>${it.cassandra.ssl.enabled}</cassandra_ssl_enabled>
+                                    <cassandra_ssl_enabled>${it.cassandra.ssl.enabled}
+                                    </cassandra_ssl_enabled>
                                     <SDC_CLUSTER_NAME>${it.sdc.cluster.name}</SDC_CLUSTER_NAME>
                                     <SDC_USER>${it.sdc.user}</SDC_USER>
                                     <SDC_PASSWORD>${it.sdc.password}</SDC_PASSWORD>
                                     <ENVNAME>${it.env.name}</ENVNAME>
                                     <SDC_CERT_DIR>onap/cert</SDC_CERT_DIR>
-                                    <JAVA_OPTIONS>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4001 -Xmx1g -Xms1g</JAVA_OPTIONS>
+                                    <JAVA_OPTIONS>
+                                        -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4001
+                                        -Xmx1g -Xms1g
+                                    </JAVA_OPTIONS>
                                 </env>
                                 <hostname>sdc-onboard-BE</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/var/lib/jetty/chef-solo/environments</volume>
-                                        <volume>${project.basedir}/src/test/resources/cert/onboarding-be:/var/lib/jetty/onap/cert
+                                        <volume>
+                                            ${it.chef.config}:/var/lib/jetty/chef-solo/environments
+                                        </volume>
+                                        <volume>
+                                            ${project.basedir}/src/test/resources/cert/onboarding-be:/var/lib/jetty/onap/cert
                                         </volume>
                                         <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
                                     </bind>
@@ -572,19 +590,26 @@ limitations under the License.
                                     <container>sdc-cassandra-init</container>
                                 </dependsOn>
                                 <env>
-                                    <cassandra_ssl_enabled>${it.cassandra.ssl.enabled}</cassandra_ssl_enabled>
+                                    <cassandra_ssl_enabled>${it.cassandra.ssl.enabled}
+                                    </cassandra_ssl_enabled>
                                     <ENVNAME>${it.env.name}</ENVNAME>
-                                    <JAVA_OPTIONS>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4000
-                                        -Xmx1536m -Xms1536m</JAVA_OPTIONS>
+                                    <JAVA_OPTIONS>
+                                        -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4000
+                                        -Xmx1536m -Xms1536m
+                                    </JAVA_OPTIONS>
                                     <SDC_CERT_DIR>onap/cert</SDC_CERT_DIR>
                                     <SDC_NSD_CERT_NAME>nsdCert</SDC_NSD_CERT_NAME>
                                 </env>
                                 <hostname>sdc-BE</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/var/lib/jetty/chef-solo/environments</volume>
+                                        <volume>
+                                            ${it.chef.config}:/var/lib/jetty/chef-solo/environments
+                                        </volume>
                                         <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
-                                        <volume>${project.basedir}/src/test/resources/cert/catalog-be:/var/lib/jetty/onap/cert</volume>
+                                        <volume>
+                                            ${project.basedir}/src/test/resources/cert/catalog-be:/var/lib/jetty/onap/cert
+                                        </volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -624,7 +649,9 @@ limitations under the License.
                                 <hostname>sdc-BE-init</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/home/onap/chef-solo/environments</volume>
+                                        <volume>
+                                            ${it.chef.config}:/home/onap/chef-solo/environments
+                                        </volume>
                                         <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
                                     </bind>
                                 </volumes>
@@ -645,13 +672,17 @@ limitations under the License.
                             <run>
                                 <env>
                                     <ENVNAME>${it.env.name}</ENVNAME>
-                                    <JAVA_OPTIONS>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:6000
-                                     -Xmx256m -Xms256m</JAVA_OPTIONS>
+                                    <JAVA_OPTIONS>
+                                        -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:6000
+                                        -Xmx256m -Xms256m
+                                    </JAVA_OPTIONS>
                                 </env>
                                 <hostname>sdc-FE</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/var/lib/jetty/chef-solo/environments</volume>
+                                        <volume>
+                                            ${it.chef.config}:/var/lib/jetty/chef-solo/environments
+                                        </volume>
                                         <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
                                         <volume>
                                             ${it.chef.config}/plugins-configuration.yaml:/var/lib/jetty/config/catalog-fe/plugins-configuration.yaml
@@ -697,7 +728,8 @@ limitations under the License.
                                 <hostname>sdc-sim</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/root/chef-solo/environments</volume>
+                                        <volume>${it.chef.config}:/root/chef-solo/environments
+                                        </volume>
                                     </bind>
                                 </volumes>
                                 <wait>

diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 190c269..0ab08d0 100644 (file)
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -52,12 +52,10 @@
     <mvn.license.version>1.10</mvn.license.version>
     <mvn.shade.version>2.3</mvn.shade.version>
     <maven.dependency.version>2.8</maven.dependency.version>
-    <mvn.swagger.version>3.1.0</mvn.swagger.version>
     <mvn.war.version>2.1.1</mvn.war.version>
     <maven-core.version>3.5.3</maven-core.version>
     <maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
     <maven-plugin-annotations.version>3.5.1</maven-plugin-annotations.version>
-    <mvn.antrun.version>1.8</mvn.antrun.version>
 
     <!-- Onboarding 3rd party versions -->
     <aspectjrt.version>${aspectj.version}</aspectjrt.version>
@@ -90,7 +88,7 @@
     <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version>
     <slf4j.version>1.7.21</slf4j.version>
     <spring.framework.version>${spring.version}</spring.framework.version>
-    <swagger.version>2.0.8</swagger.version>
+    <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
     <woodstox.version>4.4.1</woodstox.version>
     <zusammen.version>1.0.2</zusammen.version>
     <zusammen-state-store.version>1.0.2</zusammen-state-store.version>

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
index e57029b..bf5696e 100644 (file)
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
@@ -1,6 +1,6 @@
 <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">
+    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>
 
     <groupId>org.openecomp.sdc.onboarding</groupId>
@@ -30,12 +30,12 @@
             <artifactId>openecomp-sdc-notification-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-           <dependency>
+        <dependency>
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>openecomp-sdc-notification-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>org.openecomp.sdc.onboarding</groupId>
             <artifactId>vnf-repository-rest-services</artifactId>
             <version>${project.version}</version>
@@ -231,17 +231,21 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <property name="version" value="${project.version}"/>
                                 <mkdir dir="target/docs"/>
-                                <echo file="target/docs/build-info.json">{"Version": "${project.version}"}</echo>
-                            </tasks>
+                                <echo file="target/docs/build-info.json">{"Version":
+                                    "${project.version}"}
+                                </echo>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>
@@ -252,11 +256,15 @@
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
+                <version>${swagger-core-mvn-plugin.version}</version>
                 <configuration>
                     <outputPath>${project.build.directory}/generated/swagger-ui</outputPath>
                     <outputFileName>swagger-sdce-1</outputFileName>
                     <outputFormat>JSON</outputFormat>
-                    <configurationFilePath>${project.basedir}/src/main/resources/swagger-config.yaml</configurationFilePath>  
+                    <configurationFilePath>
+                        ${project.basedir}/src/main/resources/swagger-config.yaml
+                    </configurationFilePath>
+                    <skip>${swagger.skip}</skip>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index 903dab7..07391a6 100644 (file)
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -1,6 +1,6 @@
 <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/maven-v4_0_0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>api-docs</artifactId>
     <groupId>org.openecomp.sdc.onboarding</groupId>
@@ -14,7 +14,8 @@
 
     <properties>
         <plugin.name>api-docs</plugin.name>
-        <rest.api.dir>${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war</rest.api.dir>
+        <rest.api.dir>${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war
+        </rest.api.dir>
         <api.json.file>api.json</api.json.file>
     </properties>
     <build>
@@ -39,16 +40,20 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>copy</id>
                         <phase>package</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <echo message="Copy api json files"/>
-                                <copy file="${rest.api.dir}/target/generated/swagger-ui/swagger-sdce-1.json" tofile="${basedir}/target/${plugin.name}/${api.json.file}"/>
-                            </tasks>
+                                <copy
+                                    file="${rest.api.dir}/target/generated/swagger-ui/swagger-sdce-1.json"
+                                    tofile="${basedir}/target/${plugin.name}/${api.json.file}"/>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>
@@ -64,7 +69,7 @@
                     <descriptor>assembly/swagger.xml</descriptor>
                     <finalName>${plugin.name}</finalName>
                     <outputDirectory>${basedir}/target/${plugin.name}</outputDirectory>
-                                       <appendAssemblyId>false</appendAssemblyId>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml
index 15f8b71..a9a5f5f 100644 (file)
--- a/openecomp-be/tools/zusammen-tools/pom.xml
+++ b/openecomp-be/tools/zusammen-tools/pom.xml
@@ -15,8 +15,8 @@
   -->
 
 <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">
+    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>openecomp-zusammen-tools</artifactId>
@@ -175,15 +175,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>ant-test</id>
                         <phase>package</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <fixcrlf srcdir="./" eol="unix"
-                                         includes="zusammenMainTool.sh"/>
-                            </tasks>
+                                    includes="zusammenMainTool.sh"/>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>

diff --git a/pom.xml b/pom.xml
index 54612e7..4a6b5ba 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,15 @@ Modifications copyright (c) 2018-2019 Nokia
 ================================================================================
 -->
 <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">
+    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>
 
-  <groupId>org.openecomp.sdc</groupId>
-  <artifactId>sdc-main</artifactId>
-  <version>1.9.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>sdc</name>
+    <groupId>org.openecomp.sdc</groupId>
+    <artifactId>sdc-main</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>sdc</name>
 
     <parent>
         <groupId>org.onap.oparent</groupId>
@@ -65,6 +65,7 @@ Modifications copyright (c) 2018-2019 Nokia
         <io.vavr.version>0.10.3</io.vavr.version>
         <groovy.version>3.0.7</groovy.version>
         <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version>
+        <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
 
         <commons.collections.version>4.1</commons.collections.version>
         <ws.rs.version>2.1</ws.rs.version>
@@ -86,7 +87,8 @@ Modifications copyright (c) 2018-2019 Nokia
         <json-simple.version>1.1</json-simple.version>
 
         <!-- PM Dictionary validation -->
-        <onap.vnfsdk.validation.pmdictionary.version>1.2.15</onap.vnfsdk.validation.pmdictionary.version>
+        <onap.vnfsdk.validation.pmdictionary.version>1.2.15
+        </onap.vnfsdk.validation.pmdictionary.version>
 
         <!-- Logging start -->
         <!-- logback -->
@@ -250,7 +252,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
                 <version>${swagger-core-mvn-plugin.version}</version>
-            </dependency>            
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -417,7 +419,8 @@ Modifications copyright (c) 2018-2019 Nokia
                 <version>2.17</version>
                 <configuration>
                     <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+                    <suppressionsFileExpression>checkstyle.suppressions.file
+                    </suppressionsFileExpression>
                     <skip>${checkstyle.skip}</skip>
                 </configuration>
             </plugin>
@@ -493,12 +496,12 @@ Modifications copyright (c) 2018-2019 Nokia
                         <configuration>
                             <source>
                                 pom.properties['deploy.url'] =
-                                        pom.version.contains('-SNAPSHOT') ?
-                                                project.distributionManagement.snapshotRepository.url :
-                                                project.distributionManagement.repository.url;
+                                    pom.version.contains('-SNAPSHOT') ?
+                                        project.distributionManagement.snapshotRepository.url :
+                                        project.distributionManagement.repository.url;
                                 pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
-                                        project.distributionManagement.snapshotRepository.id :
-                                        project.distributionManagement.repository.id;
+                                    project.distributionManagement.snapshotRepository.id :
+                                    project.distributionManagement.repository.id;
                             </source>
                         </configuration>
                     </execution>
@@ -526,7 +529,8 @@ Modifications copyright (c) 2018-2019 Nokia
                 <configuration>
                     <printSummary>false</printSummary>
                     <systemPropertyVariables>
-                        <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
+                        <jacoco-agent.destfile>${project.build.directory}/jacoco.exec
+                        </jacoco-agent.destfile>
                     </systemPropertyVariables>
                     <forkCount>${surefire.forkCount}</forkCount>
                     <reuseForks>${surefire.reuseForks}</reuseForks>
@@ -546,7 +550,8 @@ Modifications copyright (c) 2018-2019 Nokia
                 </executions>
                 <configuration>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties
+                    <generateGitPropertiesFilename>
+                        ${project.build.outputDirectory}/META-INF/git.properties
                     </generateGitPropertiesFilename>
                     <failOnNoGitDirectory>true</failOnNoGitDirectory>
                     <verbose>false</verbose>
@@ -682,6 +687,8 @@ Modifications copyright (c) 2018-2019 Nokia
                 <skipYamlJsonValidator>true</skipYamlJsonValidator>
                 <checkstyle.skip>true</checkstyle.skip>
                 <jacoco.skip>true</jacoco.skip>
+                <maven.antrun.skip>true</maven.antrun.skip>
+                <swagger.skip>true</swagger.skip>
             </properties>
             <modules>
                 <module>onboarding</module>