X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsparky-be.git;a=blobdiff_plain;f=pom.xml;h=b2e53438d3b10dd0a0d1e54dd51bb94ac402af25;hp=01f35b9880ca08377f1861a919f73a1b6c6ac37c;hb=refs%2Fheads%2Fmaster;hpb=645628777792e49ea18f245236953a9e5aa6c6f7

diff --git a/pom.xml b/pom.xml
index 01f35b9..908afa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,604 +1,272 @@
+<?xml version="1.0" encoding="UTF-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">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<artifactId>ajsc-archetype-parent</artifactId>
-		<groupId>com.att.ajsc</groupId>
-		<version>2.0.0</version>
-	</parent>
-	<groupId>org.onap.aai.sparky-be</groupId>
-	<artifactId>sparky-be</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<name>aai-sparky-be</name>
-
-	<properties>
-		<docker.location>${basedir}/target</docker.location>
-		<module.ajsc.namespace.name>inventory-ui-service</module.ajsc.namespace.name>
-		<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-		<ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
-		<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
-
-		<!-- 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>
-
-		<!-- For SOA Cloud Installation -->
-		<installOwnerUser>aaiadmin</installOwnerUser>
-		<installOwnerGroup>aaiadmin</installOwnerGroup>
-		<ownerManagementGroup>com.att.csid.lab</ownerManagementGroup>
-
-		<!-- 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>9517</serverPort>
-		<sslport>8000</sslport>
-
-		<testRouteOffer>workstation</testRouteOffer>
-		<testEnv>DEV</testEnv>
-		<checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
-        
-        <!-- Sonar Configuration -->
-        <sonar.language>java</sonar.language>
-       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-       <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-       <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
-       <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
-       <sonar.projectVersion>${project.version}</sonar.projectVersion>
-	</properties>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-javaagent</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4-rule-agent</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-
-
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.att.aft</groupId>
-			<artifactId>dme2</artifactId>
-			<version>3.1.200</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.20</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.onap.aai</groupId>
-			<artifactId>rest-client</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- <dependency> <groupId>com.att.csp</groupId> <artifactId>gatekeeper</artifactId> 
-			<version>1.0</version> <scope>system</scope> <systemPath>${project.basedir}/local-repository/gatekeeper-1.0.jar</systemPath> 
-			</dependency> <dependency> <groupId>com.att.csp</groupId> <artifactId>PSE_Lite</artifactId> 
-			<version>1.0</version> <scope>system</scope> <systemPath>${project.basedir}/local-repository/PSE_Lite-1.0.jar</systemPath> 
-			</dependency> -->
-
-		<dependency>
-			<groupId>org.eclipse.persistence</groupId>
-			<artifactId>eclipselink</artifactId>
-			<version>2.6.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.7.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20131018</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.7.4</version>
-		</dependency>
-
-		<!-- Common logging framework -->
-		<dependency>
-		  <groupId>org.onap.aai.logging-service</groupId>
-		  <artifactId>common-logging</artifactId>
-		  <version>1.1.0-SNAPSHOT</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.6.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.1.7</version>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>1.1.7</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>log4j</groupId>
-		    <artifactId>log4j</artifactId>
-		    <version>1.2.17</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>com.openpojo</groupId>
-		    <artifactId>openpojo</artifactId>
-		    <version>0.8.6</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-fw</artifactId>
-			<version>1.3.0 </version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>apache-log4j-extras</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-	</dependencies>
-
-	<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>CONFIG_HOME</key>
-											<value>${basedir}/appconfig-local/</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>
-									</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>
+    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>2.0.0</version>
+    </parent>
+    
+    <groupId>org.onap.aai</groupId>
+    <artifactId>sparky-be</artifactId>
+    <version>2.0.5-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>aai-sparky-be</name>
+
+	<modules>
+		<module>sparkybe-onap-service/pom.xml</module>
+		<module>sparkybe-onap-application/pom.xml</module>
+	</modules>
+
+    <properties>
+        <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+	 <portal.sdk.version>2.6.0</portal.sdk.version>
+
+	<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>
+
+	<sonar.scanner.version>3.7.0.1746</sonar.scanner.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>
+    </properties>
+
+	<dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.portal.sdk</groupId>
+                <artifactId>epsdk-fw</artifactId>
+                <version>${portal.sdk.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <!-- we don't need to deploy the top level pom project -->
 	<build>
-		<pluginManagement>
-			<plugins>
-
-				<!-- purposely disable cobertura from parent pom as it is very broken 
-					Java1.8 code. It can't handle lamdas and comes apart with a bunch of errors -->
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>cobertura-maven-plugin</artifactId>
-					<version>2.7</version>
-					<configuration>
-						<quiet>true</quiet>
-					</configuration>
-				</plugin>
-
-
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.codehaus.mojo
-										</groupId>
-										<artifactId>
-											properties-maven-plugin
-										</artifactId>
-										<versionRange>
-											[1.0-alpha-2,)
-										</versionRange>
-										<goals>
-											<goal>
-												write-project-properties
-											</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.0.0</version>
-					<executions>
-						<execution>
-							<id>copy-installed</id>
-							<phase>install</phase>
-							<goals>
-								<goal>copy</goal>
-							</goals>
-							<configuration>
-								<artifactItems>
-									<artifactItem>
-										<groupId>org.onap.aai.sparky-fe</groupId>
-										<artifactId>sparky-fe</artifactId>
-										<version>1.0.0-SNAPSHOT</version>
-										<type>war</type>
-										<outputDirectory>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps/</outputDirectory>
-										<destFileName>aai.war</destFileName>
-									</artifactItem>
-								</artifactItems>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.7</version>
-					<executions>
-						<execution>
-							<id>copy-docker-file</id>
-							<phase>package</phase>
-							<goals>
-								<goal>copy-resources</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/scripts/</directory>
-									</resource>
-								</resources>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-			</plugins>
-
-		</pluginManagement>
+	  <pluginManagement>
+	    <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <inherited>true</inherited>
+                    <configuration>
+						<release>${maven-compiler-plugin.source}</release>
+                        <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-deploy-plugin</artifactId>
+                </plugin>
+		</plugins>
+	      </pluginManagement>
+
+	      <!-- once we connect aai-parent or oparent 3.0+ we can take out this
+		   whole section -->
+	      <plugins>
+	      <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.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>
+	      <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>
 
-		<plugins>
-			            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
-                <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>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
-                <executions>
-                    <execution>
-                        <id>copy-docker-file</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</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/scripts/</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </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>
-            </plugin>
-            <!-- license plugin -->
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>LICENSE</header>
-                    <includes>
-                        <include>src/main/java/**</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${nexusproxy}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.2</version>
-            </plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.7.201606060606</version>
-				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-				</configuration>
-				<executions>
-					<execution>
-				     <id>jacoco-initialize-unit-tests</id>
-				     <goals>
-					   <goal>prepare-agent</goal>
-				     </goals>
-				     <configuration>
-					   <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-					   <!-- <append>true</append> -->
-				     </configuration>
-				   </execution>
-				</executions>
-			</plugin>
 
-		</plugins>
 	</build>
-	<distributionManagement>
+	
+    <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>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven 2 repository 2</name>
+            <url>http://repo2.maven.org/maven2/</url>
+        </repository>
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}/content/repositories/releases/</url>
+            <url>${onap.nexus.url}/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>ECOMP Staging Repository</name>
+            <url>${onap.nexus.url}/content/repositories/staging/</url>
         </repository>
-        <snapshotRepository>
+        <repository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+	
 </project>