X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fbabel.git;a=blobdiff_plain;f=pom.xml;h=4ef4a71671bcd72c863c19f730b6621daaa3096f;hp=6c8968303ccc8d6899d127ff039e6e7ad3347aec;hb=6600175eb4b9fed25b08e0d6a868d78439f7c4b4;hpb=5b2bfbb0572909ea745f0e86c86e1479bfb81e22

diff --git a/pom.xml b/pom.xml
index 6c89683..4ef4a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,317 +1,468 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+    Copyright (c) 2017-2019 European Software Marketing Ltd.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>ajsc-archetype-parent</artifactId>
-		<groupId>com.att.ajsc</groupId>
-		<version>2.0.0</version>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>2.1.0</version>
+		<relativePath />
 	</parent>
-	<groupId>org.onap.aai.babel</groupId>
+
+	<groupId>org.onap.aai</groupId>
 	<artifactId>babel</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
 	<name>aai-babel</name>
+	<description>ONAP AAI Babel Microservice</description>
 
 	<properties>
-		<module.ajsc.namespace.name>babel-service</module.ajsc.namespace.name>
-		<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-		<ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
-		<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
+		<!-- Spring boot version -->
+		<spring.boot.version>2.1.12.RELEASE</spring.boot.version>
 
-		<!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> 
-			property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT" 
-			version, THIS will be used as your directory structure. If you do NOT want 
-			this, simply remove the "-SNAPSHOT" from your <version> declaration at the 
-			top of pom.xml -->
-		<distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
-		<runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<aai.schema.source.folder>onap/aai_schema</aai.schema.source.folder>
+		<aai.schema.target.folder>${project.build.directory}/aai-schema</aai.schema.target.folder>
 
-		<!-- For SOA Cloud Installation -->
-		<installOwnerUser>aaiadmin</installOwnerUser>
-		<installOwnerGroup>aaiadmin</installOwnerGroup>
-		<ownerManagementGroup>com.att.csid.lab</ownerManagementGroup>
+		<sonar.jacoco.reportPath />
+		<sonar.jacoco.itReportPath />
+		<sonar.jacoco.reportMissing.force.zero />
+		
+		<jacoco.line.coverage.limit>0.90</jacoco.line.coverage.limit>
+		<jacoco.version>0.8.5</jacoco.version>
+		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.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>
 
-		<!-- Port Selection. A value of 0 will allow for dynamic port selection. 
-			For local testing, you may choose to hardcode this value to something like 
-			8080 -->
-		<serverPort>9515</serverPort>
-		<sslport>9516</sslport>
+		<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
 
-		<testRouteOffer>workstation</testRouteOffer>
-		<testEnv>DEV</testEnv>
-		<checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-		<sitePath>/content/sites/site/org/onap/aai/babel/${project.artifactId}/${project.version}</sitePath>
+        <!-- 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.6.0</aai.base.image.version>
 
 		<!-- Dependency Versions -->
-		<aai.artifact.generator.version>1.1.0</aai.artifact.generator.version>
-		<apache.lang3.version>3.6</apache.lang3.version> 
-		<commons-compress.version>1.14</commons-compress.version>
-		<common.logging.version>1.1.0</common.logging.version>
-		<dom4j.version>1.6.1</dom4j.version>
-		<fasterxml.version>2.8.1</fasterxml.version>
-		<hamcrest.version>1.3</hamcrest.version>
-		<javaassist.version>3.21.0-GA</javaassist.version>
-		<logback.version>1.1.9</logback.version>
-		<mockito.version>1.10.19</mockito.version>
-		<powermock.version>1.6.2</powermock.version>
-		<sdc.distribution.client.version>1.1.32</sdc.distribution.client.version>
-		<snakeyamle.version>1.18</snakeyamle.version>
-		<jacoco.version>0.7.9</jacoco.version>
-		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-		<docker.location>${basedir}/target</docker.location>
+		<common.logging.version>1.2.2</common.logging.version>
+		<sdc.tosca.version>1.5.1</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>
+		<aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
+		<aai-schema.version>1.6.6</aai-schema.version>
+		<aai.rest.client.version>1.2.1</aai.rest.client.version>
+		<sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
+		<xmlunit.version>1.6</xmlunit.version>
+		<logback.version>1.2.3</logback.version>
+		<antrun.version>1.8</antrun.version>
+		<jaxb.version>2.2.11</jaxb.version>
+		<javax.activation.version>1.1.1</javax.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.0.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.groovy.maven</groupId>
+						<artifactId>gmaven-plugin</artifactId>
+						<version>1.0</version>
+						<executions>
+							<execution>
+								<phase>pre-clean</phase>
+								<goals>
+									<goal>execute</goal>
+								</goals>
+								<configuration>
+									<source>
+										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'];
+									</source>
+								</configuration>
+							</execution>
+						</executions>
+					</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>
+										</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>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0.1</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>${dom4j.version}</version>
-			<scope>provided</scope>
+			<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>
-
-		<!-- Common logging framework -->
 		<dependency>
 			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
 			<version>${common.logging.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.1</version>
+			<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>
+			<version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
-
-		<!-- apache commons -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<version>${commons-compress.version}</version>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
+			<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>${apache.lang3.version}</version>
 		</dependency>
-
-		<!-- Artifact generation -->
 		<dependency>
-			<groupId>org.openecomp.sdc.common</groupId>
-			<artifactId>openecomp-sdc-artifact-generator-core</artifactId>
-			<version>${aai.artifact.generator.version}</version>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>${javax.ws.rs.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${fasterxml.version}</version>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
 		</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>
+			<version>${aai.rest.client.version}</version>
+		</dependency>
+		
 		<!-- Testing -->
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
+			<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.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>${powermock.version}</version>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<version>${xmlunit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-javaagent</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4-rule-agent</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<version>${javaassist.version}</version>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
-			<artifactId>sdc-distribution-client</artifactId>
-			<version>${sdc.distribution.client.version}</version>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>${javax.activation.version}</version>
 		</dependency>
-	   <dependency>
-	       <groupId>xmlunit</groupId>
-	       <artifactId>xmlunit</artifactId>
-	       <version>1.6</version>
-	       <scope>test</scope>
-	   </dependency>
 	</dependencies>
 
-	<repositories>
-	    <repository>
-	        <id>ecomp-staging</id>
-	        <name>ECOMP Staging Repository</name>
-	        <url>${onap.nexus.url}/content/repositories/staging/</url>
-	    </repository>
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${onap.nexus.url}/content/repositories/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${onap.nexus.url}/content/repositories/snapshots/</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${onap.nexus.url}${sitePath}</url>
-		</site>
-	</distributionManagement>
-
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${spring.boot.version}</version>
+				<configuration>
+					<jvmArguments>
+						-DCONFIG_HOME=./appconfig-local
+						-DAPP_HOME=.
+						-Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
+						-DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
+					</jvmArguments>
+				</configuration>
 				<executions>
 					<execution>
-						<phase />
+						<goals>
+							<goal>repackage</goal>
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
-
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>report</id>
-						<phase>package</phase>
+						<id>unpack</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>report</goal>
+							<goal>unpack</goal>
 						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>${aai-schema.group.id}</groupId>
+									<artifactId>aai-schema</artifactId>
+									<version>${aai-schema.version}</version>
+									<type>jar</type>
+									<includes>${aai.schema.source.folder}/aai_schema_v**.xsd</includes>
+									<outputDirectory>${project.build.directory}/tmp</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
 					</execution>
 				</executions>
-
-			</plugin>
-
-			<plugin>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-eclipse-compiler</artifactId>
-				<version>2.9.2-01</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${antrun.version}</version>
 				<executions>
 					<execution>
-						<id>copy-docker-file</id>
-						<phase>package</phase>
+						<id>Flatten XSDs</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>copy-resources</goal>
+							<goal>run</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<overwrite>true</overwrite>
-							<resources>
-								<resource>
-									<directory>${basedir}/src/main/docker</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>**/*</include>
-									</includes>
-								</resource>
-								<resource>
-									<directory>${basedir}/src/main/bin/</directory>
-								</resource>
-							</resources>
+							<target>
+								<copy todir="${aai.schema.target.folder}" flatten="true">
+									<fileset dir="${project.build.directory}/tmp">
+										<include name="**/*.xsd" />
+									</fileset>
+								</copy>
+							</target>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
+				<groupId>org.jvnet.jaxb2.maven2</groupId>
+				<artifactId>maven-jaxb2-plugin</artifactId>
+				<version>${mvn.jaxb2.version}</version>
 				<executions>
 					<execution>
-						<phase>package</phase>
+						<phase>process-sources</phase>
 						<goals>
-							<goal>jar</goal>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<schemaDirectory>${aai.schema.target.folder}</schemaDirectory>
+					<generatePackage>org.onap.aai.babel.xml.generator.xsd</generatePackage>
+					<generateDirectory>${project.build.directory}/generated-sources</generateDirectory>
+					<schemaIncludes>
+						<include>aai_schema_latest.xsd</include>
+					</schemaIncludes>
+					<extension>true</extension>
+					<args>
+						<arg>-Xannotate</arg>
+					</args>
+					<plugins>
+						<plugin>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
+							<artifactId>jaxb2-basics-annotate</artifactId>
+							<version>0.6.4</version>
+						</plugin>
+						<!-- Add the dependencies with your annotations as 'plugins' below -->
+						<plugin>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
+							<artifactId>jaxb2-annotate-plugin-test-annox-annotations</artifactId>
+							<version>1.0.0</version>
+						</plugin>
+					</plugins>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>exec-maven-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<version>1.5.0</version>
+				<executions>
+					<execution><!-- Run our script to get latest xsd version -->
+						<id>Get latest xsd version</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>exec</goal>
 						</goals>
 						<configuration>
-							<classifier>client</classifier>
-							<includes>
-								<include>**/babel/service/data/*</include>
-							</includes>
+							<workingDirectory>${basedir}/scripts</workingDirectory>
+							<executable>bash</executable>
+							<commandlineArgs>get-latest-xsd-version.sh ${basedir}</commandlineArgs>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.11</version>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
-					<verbose>true</verbose>
-					<serverId>docker-hub</serverId>
-					<imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
-					<dockerDirectory>${docker.location}</dockerDirectory>
-					<imageTags>
-                  		<imageTag>latest</imageTag>
-					</imageTags>
-					<forceTags>true</forceTags>
+					<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>
-
-			<!-- license plugin -->
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
@@ -321,192 +472,206 @@
 					<includes>
 						<include>src/main/java/**</include>
 						<include>src/test/java/**</include>
+						<include>pom.xml</include>
 					</includes>
+					<skipExistingHeaders>true</skipExistingHeaders>
 				</configuration>
 				<executions>
 					<execution>
 						<goals>
-							<goal>format</goal>
+							<!-- Set goal from "check" to "format" to auto update license headers -->
+							<goal>check</goal>
 						</goals>
-						<phase>process-sources</phase>
+						<phase>validate</phase>
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
+				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<classifier>client</classifier>
+					<reuseForks>false</reuseForks>
+					<forkCount>1</forkCount>
+					<environmentVariables>
+						<APP_HOME>.</APP_HOME>
+						<CONFIG_HOME>src/test/resources</CONFIG_HOME>
+					</environmentVariables>
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.3</version>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>client</classifier>
+							<includes>
+								<include>**/babel/service/data/*</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
-					<reportPlugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-checkstyle-plugin</artifactId>
-							<version>2.17</version>
-							<reportSets>
-								<reportSet>
-									<reports>
-										<report>checkstyle</report>
-									</reports>
-								</reportSet>
-							</reportSets>
-						</plugin>
-					</reportPlugins>
+					<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.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>
+			      <id>pre-unit-test</id>
+			      <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-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-surefire-plugin</artifactId>
+			  <version>3.0.0-M4</version>
+			  <configuration>
+			    <!-- Sets the VM argument line used when unit tests are run. -->
+			    <argLine>${surefireArgLine}</argLine>
+			    <!-- Excludes integration tests when unit tests are run. -->
+			    <excludes>
+			      <exclude>**/IT*.java</exclude>
+			    </excludes>
+			  </configuration>
+			</plugin>
 			<plugin>
-			    <groupId>org.sonatype.plugins</groupId>
-			    <artifactId>nexus-staging-maven-plugin</artifactId>
-			    <version>1.6.7</version>
-			    <extensions>true</extensions>
-			    <configuration>
-			        <nexusUrl>${onap.nexus.url}</nexusUrl>
-			        <stagingProfileId>176c31dfe190a</stagingProfileId>
-			        <serverId>ecomp-staging</serverId>
-			    </configuration>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-failsafe-plugin</artifactId>
+			  <version>3.0.0-M4</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>
-			<!-- Strong recommendation to use forkCount and reuseForks parameters as forkMode is deprecated since v2.14 -->
 			<plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-surefire-plugin</artifactId>
-			    <configuration>
-			        <reuseForks>false</reuseForks>
-			        <forkCount>1</forkCount>
-			    </configuration>
+			  <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>
 
-	<!-- Added to fix build warnings caused by parent pom and bom -->
-
-	<profiles>
-		<profile>
-			<id>runAjsc</id>
-			<build>
-				<defaultGoal>initialize</defaultGoal>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.3.2</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<goals>
-									<goal>java</goal>
-								</goals>
-								<configuration>
-									<includeProjectDependencies>false</includeProjectDependencies>
-									<includePluginDependencies>true</includePluginDependencies>
-									<executable>java</executable>
-									<mainClass>com.att.ajsc.runner.Runner</mainClass>
-									<executableDependency>
-										<groupId>com.att.ajsc</groupId>
-										<artifactId>ajsc-runner</artifactId>
-									</executableDependency>
-									<additionalClasspathElements>
-										<additionalClasspathElement>${basedir}/ajsc-shared-config/etc</additionalClasspathElement>
-									</additionalClasspathElements>
-
-									<environmentVariables>
-										<AJSC_HOME>${runAjscHome}</AJSC_HOME>
-									</environmentVariables>
-
-									<!-- Main AJSC System Properties below (necessary for proper startup) -->
-									<systemProperties>
-										<systemProperty>
-											<key>AJSC_HOME</key>
-											<value>${runAjscHome}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_HOME</key>
-											<value>${runAjscHome}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_CONF_HOME</key>
-											<value>${basedir}/bundleconfig-local</value>
-										</systemProperty>
-										<systemProperty>
-											<key>logback.configurationFile</key>
-											<value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_SHARED_CONFIG</key>
-											<value>${basedir}/ajsc-shared-config</value>
-										</systemProperty>
-										<sysproperty>
-											<key>AJSC_EXTERNAL_LIB_FOLDERS</key>
-											<value>${basedir}/target/commonLibs</value>
-										</sysproperty>
-										<sysproperty>
-											<key>AJSC_EXTERNAL_PROPERTIES_FOLDERS</key>
-											<value>${basedir}/ajsc-shared-config/etc</value>
-										</sysproperty>
-
-										<systemProperty>
-											<key>AJSC_SERVICE_NAMESPACE</key>
-											<value>${module.ajsc.namespace.name}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_SERVICE_VERSION</key>
-											<value>${module.ajsc.namespace.version}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>SOACLOUD_SERVICE_VERSION</key>
-											<value>${project.version}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>server.port</key>
-											<value>${serverPort}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>CONFIG_HOME</key>
-											<value>${basedir}/appconfig-local</value>
-										</systemProperty>
-										<systemProperty>
-											<key>artifactgenerator.config</key>
-											<value>${basedir}/appconfig-local/artifact-generator.properties</value>
-										</systemProperty>
-									</systemProperties>
-
-									<!-- Command Line Arguments to add to the java command. Here, you 
-										can specify the port as well as the Context you want your service to run 
-										in. Use context=/ to run in an unnamed Context (Root Context). The default 
-										configuration of the AJSC is to run under the / Context. Setting the port 
-										here can aid during the development phase of your service. However, you can 
-										leave this argument out entirely, and the AJSC will default to using an Ephemeral 
-										port. -->
-									<arguments>
-										<argument>context=/</argument>
-										<argument>port=${serverPort}</argument>
-										<argument>sslport=${sslport}</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-						<configuration>
-							<executable>java</executable>
-						</configuration>
-						<dependencies>
-							<dependency>
-								<groupId>com.att.ajsc</groupId>
-								<artifactId>ajsc-runner</artifactId>
-								<version>${ajscRuntimeVersion}</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>