Create 1.13.0 maven release
[aai/babel.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 0bd4fef..cb4fea1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
     See the License for the specific language governing permissions and
     limitations under the License.
     ============LICENSE_END=========================================================
-
 -->
+
 <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">
+                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.onap.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>1.2.1</version>
-               <relativePath />
+               <groupId>org.onap.aai.aai-common</groupId>
+               <artifactId>aai-parent</artifactId>
+               <version>1.13.3</version>
        </parent>
 
        <groupId>org.onap.aai</groupId>
        <artifactId>babel</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.13.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <name>aai-babel</name>
 
        <properties>
                <!-- Spring boot version -->
-               <spring.boot.version>1.5.19.RELEASE</spring.boot.version>
 
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-               <java.version>1.8</java.version>
-               <docker.location>${basedir}/target</docker.location>
+
                <aai.schema.source.folder>onap/aai_schema</aai.schema.source.folder>
                <aai.schema.target.folder>${project.build.directory}/aai-schema</aai.schema.target.folder>
 
+               <sonar.jacoco.reportPath />
+               <sonar.jacoco.itReportPath />
+               <sonar.jacoco.reportMissing.force.zero />
+
+               <jacoco.report.directory>${project.build.directory}/code-coverage</jacoco.report.directory>
+               <jacoco.line.coverage.limit>0.90</jacoco.line.coverage.limit>
+               <sonar.jacoco.reportPath />
+               <sonar.jacoco.itReportPath />
+               <sonar.jacoco.reportMissing.force.zero />
+
+               <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+
+               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+               <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
+               <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
+               <!-- java 11 related properties -->
+               <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+               <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+               <maven-compiler-plugin.source>11</maven-compiler-plugin.source>
+               <maven-compiler-plugin.target>11</maven-compiler-plugin.target>
+               <maven-compiler-plugin.test.source>11</maven-compiler-plugin.test.source>
+               <maven-compiler-plugin.test.target>11</maven-compiler-plugin.test.target>
+               <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
+
+               <!-- docker related properties -->
+               <docker.fabric.version>0.28.0</docker.fabric.version>
+               <aai.docker.version>1.0.0</aai.docker.version>
+               <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
+        </aai.build.directory>
+               <aai.docker.namespace>onap</aai.docker.namespace>
+               <aai.base.image>alpine</aai.base.image>
+               <aai.base.image.version>1.9.0</aai.base.image.version>
+
                <!-- Dependency Versions -->
-               <common.logging.version>1.2.2</common.logging.version>
-               <sdc.tosca.version>1.5.0</sdc.tosca.version>
-               <commons.compress.version>1.18</commons.compress.version>
-               <javax.ws.rs.version>2.1</javax.ws.rs.version>
-               <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
+               <sdc.tosca.version>1.6.5</sdc.tosca.version>
+
+               <aai.common.version>1.9.4</aai.common.version>
+               <logback.core.version>1.2.11</logback.core.version>
+               <groovy.version>3.0.13</groovy.version>
+               <spring-cloud.version>2020.0.2</spring-cloud.version>
+
+               <commons.compress.version>1.22</commons.compress.version>
+               <commons.codec.version>1.15</commons.codec.version>
+
+               <javax.ws.rs.version>2.1.1</javax.ws.rs.version>
+               <mvn.jaxb2.version>0.15.1</mvn.jaxb2.version>
                <aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
-               <aai-schema.version>1.0.2</aai-schema.version>
-               <apache.lang3.version>3.7</apache.lang3.version>
-               <aai.rest.client.version>1.2.1</aai.rest.client.version>
-               <sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
+
+               <aai-schema.version>1.12.3</aai-schema.version>
+               <commons.lang3.version>3.12.0</commons.lang3.version>
+               <aai.rest.client.version>1.6.4</aai.rest.client.version>
+
+               <sdc.distribution.client.version>1.4.5</sdc.distribution.client.version>
+               <!-- TODO: use xml-legacy -->
                <xmlunit.version>1.6</xmlunit.version>
-               <logback.version>1.2.3</logback.version>
-               <antrun.version>1.8</antrun.version>
+
+               <antrun.version>3.1.0</antrun.version>
+               <jakarta.activation.version>1.2.2</jakarta.activation.version>
+               <!-- This will be used for the docker images as the default format of maven build has issues -->
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+
        </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <!-- Import dependency management from Spring Boot -->
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-dependencies</artifactId>
-                               <version>${spring.boot.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
+       <profiles>
+               <!-- Docker profile to be used for building docker image and pushing to nexus -->
+               <profile>
+                       <id>docker</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>build-helper-maven-plugin</artifactId>
+                                               <version>3.3.0</version>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>pre-clean</phase>
+                                                               <id>parse-version</id>
+                                                               <goals>
+                                                                       <goal>parse-version</goal>
+                                                               </goals>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.gmavenplus</groupId>
+                                               <artifactId>gmavenplus-plugin</artifactId>
+                                               <version>1.13.1</version>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>pre-clean</phase>
+                                                               <goals>
+                                                                       <goal>execute</goal>
+                                                               </goals>
+                                                       </execution>
+                                               </executions>
+                                               <configuration>
+                                                       <scripts>
+                                                               <script>
+                                                                       def userAaiBaseImage = session.userProperties['aai.base.image'];
+                                                                       def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
+                                                                       if (userAaiCommonVersion != null) {
+                                                                               project.properties['aai.base.image.version'] = userAaiCommonVersion;
+                                                                       }
+                                                                       if (userAaiBaseImage != null) {
+                                                                               project.properties['aai.base.image'] = userAaiBaseImage;
+                                                                       }
+                                                                       log.info 'Base image flavour: ' + project.properties['aai.base.image'];
+                                                                       log.info 'Base image version: ' + project.properties['aai.base.image.version'];
+                                                               </script>
+                                                       </scripts>
+                                               </configuration>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>io.fabric8</groupId>
+                                               <artifactId>docker-maven-plugin</artifactId>
+                                               <version>${docker.fabric.version}</version>
+                                               <configuration>
+                                                       <verbose>true</verbose>
+                                                       <apiVersion>1.23</apiVersion>
+                                                       <images>
+                                                               <image>
+                                                                       <name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l</name>
+                                                                       <build>
+                                                                               <filter>@</filter>
+                                                                               <tags>
+                                                                                       <tag>latest</tag>
+                                                                                       <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                                                                       <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>
+                                                                                       <tag>${image.tag}</tag>
+                                                                               </tags>
+                                                                               <cleanup>try</cleanup>
+                                                                               <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+                                                                               <assembly>
+                                                                                       <inline>
+                                                                                               <fileSets>
+                                                                                                       <fileSet>
+                                                                                                               <directory>${aai.build.directory}</directory>
+                                                                                                               <outputDirectory>/${project.artifactId}</outputDirectory>
+                                                                                                       </fileSet>
+                                                                                               </fileSets>
+                                                                                       </inline>
+                                                                               </assembly>
+                                                                       </build>
+                                                               </image>
+                                                       </images>
+                                               </configuration>
+                                               <executions>
+                                                       <execution>
+                                                               <id>clean-images</id>
+                                                               <phase>pre-clean</phase>
+                                                               <goals>
+                                                                       <goal>remove</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <removeAll>true</removeAll>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>generate-images</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>build</goal>
+                                                               </goals>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>push-images</id>
+                                                               <phase>deploy</phase>
+                                                               <goals>
+                                                                       <goal>push</goal>
+                                                               </goals>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-jetty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-jersey</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-jetty</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-jetty</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-aop</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aai.logging-service</groupId>
+      <artifactId>common-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.core.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>${commons.codec.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>${commons.compress.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons.lang3.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.rs.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>${groovy.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.sdc.sdc-tosca</groupId>
+      <artifactId>sdc-tosca</artifactId>
+      <version>${sdc.tosca.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aai</groupId>
+      <artifactId>rest-client</artifactId>
+    </dependency>
+
+    <!-- Testing -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.sdc.sdc-distribution-client</groupId>
+      <artifactId>sdc-distribution-client</artifactId>
+      <version>${sdc.distribution.client.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.10.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-jetty</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-jersey</artifactId>
-                       <exclusions>
-                         <exclusion>
-                           <groupId>org.springframework.boot</groupId>
-                           <artifactId>spring-boot-starter-tomcat</artifactId>
-                         </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.aai.logging-service</groupId>
-                       <artifactId>common-logging</artifactId>
-                       <version>${common.logging.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-classic</artifactId>
-                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
-               </dependency>
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-core</artifactId>
-                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
-               </dependency>
                <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
+                       <groupId>org.xmlunit</groupId>
+                       <artifactId>xmlunit-legacy</artifactId>
+                       <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-compress</artifactId>
-                       <version>${commons.compress.version}</version>
+                       <groupId>javax.xml.bind</groupId>
+                       <artifactId>jaxb-api</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-                       <version>${apache.lang3.version}</version>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>jaxws-api</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.ws.rs</groupId>
-                       <artifactId>javax.ws.rs-api</artifactId>
-                       <version>${javax.ws.rs.version}</version>
+                       <groupId>com.sun.xml.bind</groupId>
+                       <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.codehaus.groovy</groupId>
-                       <artifactId>groovy-all</artifactId>
+                       <groupId>com.sun.xml.bind</groupId>
+                       <artifactId>jaxb-impl</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.onap.sdc.sdc-tosca</groupId>
-                       <artifactId>sdc-tosca</artifactId>
-                       <version>${sdc.tosca.version}</version>
+                       <groupId>jakarta.activation</groupId>
+                       <artifactId>jakarta.activation-api</artifactId>
+                       <version>${jakarta.activation.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.onap.aai</groupId>
-                       <artifactId>rest-client</artifactId>
-                       <version>${aai.rest.client.version}</version>
+                       <groupId>org.springframework.cloud</groupId>
+                       <artifactId>spring-cloud-starter-sleuth</artifactId>
                </dependency>
-               
-               <!-- Testing -->
                <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
+                               <groupId>org.springframework.cloud</groupId>
+                               <artifactId>spring-cloud-sleuth-zipkin</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.onap.sdc.sdc-distribution-client</groupId>
-                       <artifactId>sdc-distribution-client</artifactId>
-                       <version>${sdc.distribution.client.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>xmlunit</groupId>
-                       <artifactId>xmlunit</artifactId>
-                       <version>${xmlunit.version}</version>
-                       <scope>test</scope>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <version>1.18.32</version>
+                       <scope>provided</scope>
                </dependency>
        </dependencies>
-
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.springframework.cloud</groupId>
+                               <artifactId>spring-cloud-dependencies</artifactId>
+                               <version>${spring-cloud.version}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
        <build>
-               <finalName>babel</finalName>
                <plugins>
                        <plugin>
                                <groupId>org.springframework.boot</groupId>
                                        <jvmArguments>
                                                -DCONFIG_HOME=./appconfig-local
                                                -DAPP_HOME=.
-                                                -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
+                                               -Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
                                                -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
                                        </jvmArguments>
                                </configuration>
                                <groupId>org.codehaus.mojo</groupId>
                                <version>1.5.0</version>
                                <executions>
-                                       <execution><!-- Run our script to get latest xsd version -->
+                                       <execution>
+                                               <!-- Run our script to get latest xsd version -->
                                                <id>Get latest xsd version</id>
                                                <phase>generate-sources</phase>
                                                <goals>
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptors>
+                                               <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>make-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>com.mycila</groupId>
                                <artifactId>license-maven-plugin</artifactId>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <version>${maven-compiler-plugin.version}</version>
+                               <inherited>true</inherited>
                                <configuration>
-                                       <reuseForks>false</reuseForks>
-                                       <forkCount>1</forkCount>
-                                       <environmentVariables>
-                                               <APP_HOME>.</APP_HOME>
-                                               <CONFIG_HOME>src/test/resources</CONFIG_HOME>
-                                       </environmentVariables>
+                                       <source>${maven-compiler-plugin.source}</source>
+                                       <target>${maven-compiler-plugin.target}</target>
+                                       <testSource>${maven-compiler-plugin.test.source}</testSource>
+                                       <testTarget>${maven-compiler-plugin.test.target}</testTarget>
                                </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-resources-plugin</artifactId>
+                               <artifactId>maven-jar-plugin</artifactId>
                                <version>3.0.2</version>
                                <executions>
                                        <execution>
-                                               <id>copy-docker-file</id>
                                                <phase>package</phase>
                                                <goals>
-                                                       <goal>copy-resources</goal>
+                                                       <goal>jar</goal>
                                                </goals>
                                                <configuration>
-                                                       <outputDirectory>target</outputDirectory>
-                                                       <overwrite>true</overwrite>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/docker</directory>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/bin/</directory>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
+                                                       <classifier>client</classifier>
+                                                       <includes>
+                                                               <include>**/babel/service/data/*</include>
+                                                       </includes>
                                                </configuration>
                                        </execution>
                                </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <version>3.0.2</version>
+                               <artifactId>maven-deploy-plugin</artifactId>
+                               <configuration>
+                                       <classifier>client</classifier>
+                               </configuration>
+                       </plugin>
+
+
+                       <!-- once we connect aai-parent or oparent 3.0+ we can take out this
+                 whole section -->
+
+                       <plugin>
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>${jacoco-maven-plugin.version}</version>
+                               <configuration>
+                                       <!-- Note: This exclusion list should match <sonar.exclusions> property
+                     above -->
+                                       <excludes>
+                                               <exclude>**/gen/**</exclude>
+                                               <exclude>**/generated-sources/**</exclude>
+                                               <exclude>**/yang-gen/**</exclude>
+                                               <exclude>**/pax/**</exclude>
+                                               <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude>
+                                       </excludes>
+                               </configuration>
                                <executions>
+                                       <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                     is passed as VM argument when Maven the Surefire plugin is executed. -->
                                        <execution>
-                                               <phase>package</phase>
+                                               <id>pre-unit-test</id>
                                                <goals>
-                                                       <goal>jar</goal>
+                                                       <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <classifier>client</classifier>
-                                                       <includes>
-                                                               <include>**/babel/service/data/*</include>
-                                                       </includes>
+                                                       <!-- Sets the path to the file which contains the execution data
+                                 . -->
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                                       <!-- Sets the name of the property containing the settings for JaCoCo
+                                 runtime agent. -->
+                                                       <propertyName>surefireArgLine</propertyName>
+                                               </configuration>
+                                       </execution>
+                                       <!-- Ensures that the code coverage report for unit tests is created
+                     after unit tests have been run. -->
+                                       <execution>
+                                               <id>post-unit-test</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <!-- Sets the path to the file which contains the execution data
+                                 . -->
+                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                                       <!-- Sets the output directory for the code coverage report. -->
+                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>pre-integration-test</phase>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <!-- Sets the path to the file which contains the execution data
+                                 . -->
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                       <!-- Sets the name of the property containing the settings for JaCoCo
+                                 runtime agent. -->
+                                                       <propertyName>failsafeArgLine</propertyName>
+                                               </configuration>
+                                       </execution>
+                                       <!-- Ensures that the code coverage report for integration tests after
+                     integration tests have been run. -->
+                                       <execution>
+                                               <id>post-integration-test</id>
+                                               <phase>post-integration-test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <!-- Sets the path to the file which contains the execution data
+                                 . -->
+                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                                       <!-- Sets the output directory for the code coverage report. -->
+                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>default-check</id>
+                                               <goals>
+                                                       <goal>check</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                                       <rules>
+                                                               <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                                                       <element>BUNDLE</element>
+                                                                       <limits>
+                                                                               <limit implementation="org.jacoco.report.check.Limit">
+                                                                                       <counter>LINE</counter>
+                                                                                       <value>COVEREDRATIO</value>
+                                                                                       <minimum>${jacoco.line.coverage.limit}</minimum>
+                                                                               </limit>
+                                                                       </limits>
+                                                               </rule>
+                                                       </rules>
                                                </configuration>
                                        </execution>
                                </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>3.0.0-M4</version>
                                <configuration>
-                                       <classifier>client</classifier>
+                                       <!-- Sets the VM argument line used when unit tests are run. -->
+                                       <reuseForks>false</reuseForks>
+                                       <forkCount>1</forkCount>
+                                       <environmentVariables>
+                                               <APP_HOME>.</APP_HOME>
+                                               <CONFIG_HOME>src/test/resources</CONFIG_HOME>
+                                       </environmentVariables>
+                                       <argLine>${surefireArgLine}</argLine>
+                                       <!-- Excludes integration tests when unit tests are run. -->
+                                       <excludes>
+                                               <exclude>**/IT*.java</exclude>
+                                       </excludes>
                                </configuration>
                        </plugin>
                        <plugin>
-                               <groupId>com.spotify</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.4.11</version>
-                               <configuration>
-                                       <verbose>true</verbose>
-                                       <serverId>docker-hub</serverId>
-                                       <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
-                                       <dockerDirectory>${docker.location}</dockerDirectory>
-                                       <imageTags>
-                                               <imageTag>latest</imageTag>
-                                       </imageTags>
-                                       <forceTags>true</forceTags>
-                               </configuration>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-failsafe-plugin</artifactId>
+                               <version>3.0.0-M5</version>
+                               <executions>
+                                       <!-- Ensures that both integration-test and verify goals of the Failsafe
+                     Maven plugin are executed. -->
+                                       <execution>
+                                               <id>integration-tests</id>
+                                               <goals>
+                                                       <goal>integration-test</goal>
+                                                       <goal>verify</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <!-- Sets the VM argument line used when integration tests are run. -->
+                                                       <argLine>${failsafeArgLine}</argLine>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonarsource.scanner.maven</groupId>
+                               <artifactId>sonar-maven-plugin</artifactId>
+                               <version>${sonar.scanner.version}</version>
                        </plugin>
+                       <!-- end removable sonar config, note the additional exclusion for babel above -->
                </plugins>
        </build>
 
-</project>
+</project>
\ No newline at end of file