X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=pom.xml;h=bd3e6e25ad65cc75cb2ef42a97e5806e85c9fd3f;hp=065a30dd555bff18edb62852760592e118ef447d;hb=f1f34f99b05134035f02854f15131c1132dd4f31;hpb=56b2690669d528b1ebc048f5197bb6e0047df2a1

diff --git a/pom.xml b/pom.xml
index 065a30d..bd3e6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,14 +21,13 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
     </parent>
 
 	<groupId>org.onap.aai.esr-server</groupId>
     <artifactId>aai-esr-server</artifactId>
     <packaging>pom</packaging>
-
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <name>aai-esr-server</name>
     <modules>
         <module>esr-mgr</module>
@@ -42,8 +41,23 @@
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
         <junit.version>4.10</junit.version>
-		<jetty.version>9.4.11.v20180605</jetty.version>
-        <org.apache.ant.version>1.9.4</org.apache.ant.version>
+		<jetty.version>9.4.22.v20191022</jetty.version>		
+        <org.apache.ant.version>1.10.5</org.apache.ant.version>
+
+	<sonar.jacoco.reportPath />
+	<sonar.jacoco.itReportPath />
+	<sonar.jacoco.reportMissing.force.zero />
+
+	<jacoco.line.coverage.limit>0.75</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>
+	
+
     </properties>
 
     <dependencyManagement>
@@ -301,5 +315,154 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
+	<plugins>
+	  <!-- 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.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>
+
     </build>   
 </project>