X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0a96ad32baf68111bce32d79ed5a57a3d3190886;hb=3a50e4c2dd8bdfca4b4c834316abee075448f27e;hp=324996626500c254dd9c12f75dd342534d233130;hpb=5bae67e63a12d544c5e1e5104c448bae32ceb469;p=aai%2Fdata-router.git

diff --git a/pom.xml b/pom.xml
index 3249966..0a96ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
 ============LICENSE_START=======================================================
 org.onap.aai
 ================================================================================
@@ -35,7 +35,7 @@ limitations under the License.
 
    <properties>
       <java.version>1.8</java.version>
-      <camel-spring-boot.version>2.20.1</camel-spring-boot.version>
+      <camel-spring-boot.version>2.21.1</camel-spring-boot.version>
       <docker.location>${basedir}/target</docker.location>
       <absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
       <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot>
@@ -67,7 +67,8 @@ limitations under the License.
       <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
       <sonar.projectVersion>${project.version}</sonar.projectVersion>
       <logback.version>1.2.3</logback.version>
-      <version.com.google.guava>26.0-jre</version.com.google.guava>
+      <version.com.google.guava>16.0.1</version.com.google.guava>
+      <shemaUnpackVersion>onap</shemaUnpackVersion>
    </properties>
 
    <dependencies>
@@ -191,6 +192,12 @@ limitations under the License.
          <version>1.3.0-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+         <groupId>org.onap.aai.aai-common</groupId>
+         <artifactId>aai-schema-ingest</artifactId>
+         <version>1.3.0-SNAPSHOT</version>
+      </dependency>
+      
       <dependency>
          <groupId>org.json</groupId>
          <artifactId>json</artifactId>
@@ -237,6 +244,72 @@ limitations under the License.
    <build>
       <finalName>${project.artifactId}</finalName>
       <plugins>
+        <!-- jacoco-maven-plugin provides the basic report creation during unit testing, such as code-coverage, sonar, etc. -->
+         <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <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>${sonar.jacoco.reportPath}</destFile>
+                     <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>${sonar.jacoco.reportPath}</dataFile>
+                     <!-- Sets the output directory for the code coverage report. -->
+                     <outputDirectory>${jacoco.path}</outputDirectory>
+                  </configuration>
+               </execution>
+               <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                    is passed as VM argument when Maven the Failsafe plugin is executed. -->
+               <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>${sonar.jacoco.itReportPath}</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>${sonar.jacoco.itReportPath}/</dataFile>
+                     <!-- Sets the output directory for the code coverage report. -->
+                     <outputDirectory>${jacoco.itPath}</outputDirectory>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <!-- Checkstyle plugin - used to report on compliance with -->
          <!-- the Google style guide. -->
          <plugin>
@@ -327,10 +400,10 @@ limitations under the License.
                     <artifactItem>
                       <groupId>org.onap.aai.aai-common</groupId>
                       <artifactId>aai-schema</artifactId>
-                      <version>1.2.2</version>
+                      <version>1.3.0-SNAPSHOT</version>
                       <type>jar</type>
-                      <includes>oxm/</includes>
-                      <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
+                      <includes>/${shemaUnpackVersion}/oxm/</includes>
+                      <outputDirectory>${project.build.directory}/oxm</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                   </configuration>